From dbc79d0aed27bb8995827b0f0400d1e27326c991 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 19 Jan 2015 18:54:49 +0100 Subject: [PATCH] MEDIUM: args: increase arg type to 5 bits and limit arg count to 5 We'll soon need to add new argument types, and we don't use the current limit of 7 arguments, so let's increase the arg type size to 5 bits and reduce the arg count to 5 (3 max are used today). --- include/types/arg.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/types/arg.h b/include/types/arg.h index 17008d97fc..8e089bad39 100644 --- a/include/types/arg.h +++ b/include/types/arg.h @@ -28,14 +28,16 @@ #include #include -/* encoding of each arg type */ -#define ARGT_BITS 4 +/* encoding of each arg type : up to 31 types are supported */ +#define ARGT_BITS 5 #define ARGT_NBTYPES (1 << ARGT_BITS) #define ARGT_MASK (ARGT_NBTYPES - 1) -/* encoding of the arg count */ +/* encoding of the arg count : up to 5 args are possible. 4 bits are left + * unused at the top. + */ #define ARGM_MASK ((1 << ARGM_BITS) - 1) -#define ARGM_BITS 4 +#define ARGM_BITS 3 #define ARGM_NBARGS (32 - ARGM_BITS) / sizeof(int) enum { -- 2.39.5