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

Filter: FID_MEMBER debug string is a C constant string

Browse source
This commit is contained in:
Maria Matejka 2019-07-15 15:17:04 +02:00
parent c0999a149c
commit f634adc7dc
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
filter/decl.m4
View file

@ -87,7 +87,7 @@ if ($3) return 0;
]]) ]])
m4_ifelse($4,,,[[ m4_ifelse($4,,,[[
FID_DUMP_BODY()m4_dnl FID_DUMP_BODY()m4_dnl
debug("%s$4\n", INDENT, $5); debug("%s" $4 "\n", INDENT, $5);
]]) ]])
FID_INTERPRET_EXEC()m4_dnl FID_INTERPRET_EXEC()m4_dnl
const $1 $2 = whati->$2 const $1 $2 = whati->$2
@ -208,8 +208,8 @@ m4_define(RESULT_VAL, `FID_HIC(, [[do { res = $1; fstk->vcnt++; } while (0)]],
m4_define(RESULT_VOID, `RESULT_VAL([[ (struct f_val) { .type = T_VOID } ]])') m4_define(RESULT_VOID, `RESULT_VAL([[ (struct f_val) { .type = T_VOID } ]])')
# Some common filter instruction members # Some common filter instruction members
m4_define(SYMBOL, `FID_MEMBER(struct symbol *, sym, [[strcmp(f1->sym->name, f2->sym->name) || (f1->sym->class != f2->sym->class)]], symbol %s, item->sym->name)') m4_define(SYMBOL, `FID_MEMBER(struct symbol *, sym, [[strcmp(f1->sym->name, f2->sym->name) || (f1->sym->class != f2->sym->class)]], "symbol %s", item->sym->name)')
m4_define(RTC, `FID_MEMBER(struct rtable_config *, rtc, [[strcmp(f1->rtc->name, f2->rtc->name)]], route table %s, item->rtc->name)') m4_define(RTC, `FID_MEMBER(struct rtable_config *, rtc, [[strcmp(f1->rtc->name, f2->rtc->name)]], "route table %s", item->rtc->name)')
m4_define(STATIC_ATTR, `FID_MEMBER(struct f_static_attr, sa, f1->sa.sa_code != f2->sa.sa_code,,)') m4_define(STATIC_ATTR, `FID_MEMBER(struct f_static_attr, sa, f1->sa.sa_code != f2->sa.sa_code,,)')
m4_define(DYNAMIC_ATTR, `FID_MEMBER(struct f_dynamic_attr, da, f1->da.ea_code != f2->da.ea_code,,)') m4_define(DYNAMIC_ATTR, `FID_MEMBER(struct f_dynamic_attr, da, f1->da.ea_code != f2->da.ea_code,,)')
m4_define(ACCESS_RTE, `FID_HIC(,[[do { if (!fs->rte) runtime("No route to access"); } while (0)]],NEVER_CONSTANT())') m4_define(ACCESS_RTE, `FID_HIC(,[[do { if (!fs->rte) runtime("No route to access"); } while (0)]],NEVER_CONSTANT())')

10
filter/f-inst.c
View file

@ -253,7 +253,7 @@
ARG_ANY(1); ARG_ANY(1);
ARG(2, T_INT); ARG(2, T_INT);
FID_MEMBER(enum ec_subtype, ecs, f1->ecs != f2->ecs, ec subtype %s, ec_subtype_str(item->ecs)); FID_MEMBER(enum ec_subtype, ecs, f1->ecs != f2->ecs, "ec subtype %s", ec_subtype_str(item->ecs));
int check, ipv4_used; int check, ipv4_used;
u32 key, val; u32 key, val;
@ -431,7 +431,7 @@
struct f_val, struct f_val,
val, val,
[[ !val_same(&(f1->val), &(f2->val)) ]], [[ !val_same(&(f1->val), &(f2->val)) ]],
value %s, "value %s",
val_dump(&(item->val)) val_dump(&(item->val))
); );
@ -457,7 +457,7 @@
INST(FI_DIE, 0, 0) { INST(FI_DIE, 0, 0) {
NEVER_CONSTANT; NEVER_CONSTANT;
FID_MEMBER(enum filter_return, fret, f1->fret != f2->fret, %s, filter_return_str(item->fret)); FID_MEMBER(enum filter_return, fret, f1->fret != f2->fret, "%s", filter_return_str(item->fret));
if (fs->buf.start < fs->buf.pos) if (fs->buf.start < fs->buf.pos)
log_commit(*L_INFO, &fs->buf); log_commit(*L_INFO, &fs->buf);
@ -909,7 +909,7 @@
INST(FI_SWITCH, 1, 0) { INST(FI_SWITCH, 1, 0) {
ARG_ANY(1); ARG_ANY(1);
FID_MEMBER(struct f_tree *, tree, [[!same_tree(f1->tree, f2->tree)]], tree %p, item->tree); FID_MEMBER(struct f_tree *, tree, [[!same_tree(f1->tree, f2->tree)]], "tree %p", item->tree);
const struct f_tree *t = find_tree(tree, &v1); const struct f_tree *t = find_tree(tree, &v1);
if (!t) { if (!t) {
@ -1161,7 +1161,7 @@
NEVER_CONSTANT; NEVER_CONSTANT;
ARG(1, T_BOOL); ARG(1, T_BOOL);
FID_MEMBER(char *, s, [[strcmp(f1->s, f2->s)]], string %s, item->s); FID_MEMBER(char *, s, [[strcmp(f1->s, f2->s)]], "string %s", item->s);
ASSERT(s); ASSERT(s);