[[m4_dnl The one case in The Big Switch inside interpreter
case INST_NAME():
#define whati (&(what->i_]]INST_NAME()[[))
- m4_ifelse(m4_eval(INST_INVAL() > 0), 1, [[if (fstk->vcnt < INST_INVAL()) runtime("Stack underflow"); fstk->vcnt -= INST_INVAL(); ]])
+ m4_ifelse(m4_eval(INST_INVAL() > 0), 1, [[if (fstk->vcnt < INST_INVAL()) runtime("Stack underflow");
+ fstk->vcnt -= INST_INVAL();]])
m4_undivert(108)m4_dnl
#undef whati
break;
return what;
}
-static int
-f_const_promotion(struct f_inst *arg, enum f_type want)
+int
+f_const_promotion_(struct f_inst *arg, enum f_type want, int update)
{
if (arg->fi_code != FI_CONSTANT)
return 0;
struct f_val *c = &arg->i_FI_CONSTANT.val;
if ((c->type == T_IP) && ipa_is_ip4(c->val.ip) && (want == T_QUAD)) {
- *c = (struct f_val) {
- .type = T_QUAD,
- .val.i = ipa_to_u32(c->val.ip),
- };
+ if (update)
+ *c = (struct f_val) {
+ .type = T_QUAD,
+ .val.i = ipa_to_u32(c->val.ip),
+ };
return 1;
}
else if ((c->type == T_SET) && (!c->val.t) && (want == T_PREFIX_SET)) {
- *c = f_const_empty_prefix_set;
+ if (update)
+ *c = f_const_empty_prefix_set;
return 1;
}
static inline const char *f_instruction_name(enum f_instruction_code fi)
{ return f_instruction_name_(fi) + 3; }
+
+int f_const_promotion_(struct f_inst *arg, enum f_type want, int update);
+
+static inline int f_const_promotion(struct f_inst *arg, enum f_type want)
+{ return f_const_promotion_(arg, want, 1); }
+
+static inline int f_try_const_promotion(struct f_inst *arg, enum f_type want)
+{ return f_const_promotion_(arg, want, 0); }
+
+
struct f_arg {
struct symbol *arg;
struct f_arg *next;
int i, arg_num = (int) dsc->arg_num;
for (i = 1; args && (i < arg_num); args = args->next, i++)
- if (dsc->args_type[i] && (args->type != dsc->args_type[i]))
+ if (dsc->args_type[i] && (args->type != dsc->args_type[i]) &&
+ !f_try_const_promotion(args, dsc->args_type[i]))
return 0;
return !args && !(i < arg_num);
int i, arg_num = (int) dsc->arg_num;
for (i = 1; args && (i < arg_num); args = args->next, i++)
- if (dsc->args_type[i] && (args->type != dsc->args_type[i]))
+ if (dsc->args_type[i] && (args->type != dsc->args_type[i]) &&
+ !f_try_const_promotion(args, dsc->args_type[i]))
break;
*pos = i;