Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Filter refactoring: Moved the interpret macros inside the block

Browse source
This commit is contained in:
Jan Maria Matejka 2018-12-17 12:48:33 +01:00 committed by Maria Matejka
parent 02dcbf343d
commit aca8263926
1 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
filter/filter.c
View file

@ -597,32 +597,6 @@ val_format_str(struct filter_state *fs, struct f_val v) {
static struct tbf rl_runtime_err = TBF_DEFAULT_LOG_LIMITS; static struct tbf rl_runtime_err = TBF_DEFAULT_LOG_LIMITS;
#define runtime(fmt, ...) do { \
if (!(fs->flags & FF_SILENT)) \
log_rl(&rl_runtime_err, L_ERR "filters, line %d: " fmt, what->lineno, ##__VA_ARGS__); \
res.type = T_RETURN; \
res.val.i = F_ERROR; \
return res; \
} while(0)
#define ARG_ANY(n) INTERPRET(v##n, what->a##n.p)
#define ARG(n,t) ARG_ANY(n) \
if (v##n.type != t) \
runtime("Argument %d of instruction %s must be of type %02x, got %02x", \
n, f_instruction_name(what->fi_code), t, v##n.type);
#define INTERPRET(val, what_) \
val = interpret(fs, what_); \
if (val.type & T_RETURN) \
return val;
#define ACCESS_RTE \
do { if (!fs->rte) runtime("No route to access"); } while (0)
#define ACCESS_EATTRS \
do { if (!fs->eattrs) f_cache_eattrs(fs); } while (0)
#define BITFIELD_MASK(what) \ #define BITFIELD_MASK(what) \
(1u << (what->a2.i >> 24)) (1u << (what->a2.i >> 24))
@ -656,6 +630,32 @@ interpret(struct filter_state *fs, struct f_inst *what)
for ( ; what; what = what->next) { for ( ; what; what = what->next) {
res.type = T_VOID; res.type = T_VOID;
switch(what->fi_code) { switch(what->fi_code) {
#define runtime(fmt, ...) do { \
if (!(fs->flags & FF_SILENT)) \
log_rl(&rl_runtime_err, L_ERR "filters, line %d: " fmt, what->lineno, ##__VA_ARGS__); \
res.type = T_RETURN; \
res.val.i = F_ERROR; \
return res; \
} while(0)
#define ARG_ANY(n) INTERPRET(v##n, what->a##n.p)
#define ARG(n,t) ARG_ANY(n) \
if (v##n.type != t) \
runtime("Argument %d of instruction %s must be of type %02x, got %02x", \
n, f_instruction_name(what->fi_code), t, v##n.type);
#define INTERPRET(val, what_) \
val = interpret(fs, what_); \
if (val.type & T_RETURN) \
return val;
#define ACCESS_RTE \
do { if (!fs->rte) runtime("No route to access"); } while (0)
#define ACCESS_EATTRS \
do { if (!fs->eattrs) f_cache_eattrs(fs); } while (0)
/* Binary operators */ /* Binary operators */
case FI_ADD: case FI_ADD:
ARG(1,T_INT); ARG(1,T_INT);
@ -1582,12 +1582,17 @@ interpret(struct filter_state *fs, struct f_inst *what)
default: default:
bug( "Unknown instruction %d (%c)", what->fi_code, what->fi_code & 0xff); bug( "Unknown instruction %d (%c)", what->fi_code, what->fi_code & 0xff);
#undef runtime
#undef ARG_ANY
#undef ARG
#undef INTERPRET
#undef ACCESS_RTE
#undef ACCESS_EATTRS
}} }}
return res; return res;
} }
#undef ARG
#undef ARG_ANY
#define ARG(n) \ #define ARG(n) \
if (!i_same(f1->a##n.p, f2->a##n.p)) \ if (!i_same(f1->a##n.p, f2->a##n.p)) \