# HG changeset patch # User lost # Date 1231117057 0 # Node ID da1337724ecdcf313f98382f90f785f2bcaa8f4e # Parent 73423b66e511f29bebd94f7a65931e2ae773faa3 Moved insn_gen8 to simplified expression evaluator diff -r 73423b66e511 -r da1337724ecd src/insn_gen.c --- a/src/insn_gen.c Mon Jan 05 00:57:14 2009 +0000 +++ b/src/insn_gen.c Mon Jan 05 00:57:37 2009 +0000 @@ -131,28 +131,14 @@ OPFUNC(insn_gen8) { - lwasm_expr_stack_t *s; int rval; if (**p == '#') { lwasm_emitop(as, l, instab[opnum].ops[3]); (*p)++; - s = lwasm_evaluate_expr(as, l, *p, NULL); - if (!s) - { - register_error(as, l, 1, "Bad expression"); + if (lwasm_expr_result(as, l, p, EXPR_PASS2CONST | EXPR_BYTE, &rval) < 0) rval = 0; - } - else - { - if (!lwasm_expr_is_constant(s)) - register_error(as, l, 2, "Incomplete reference"); - rval = lwasm_expr_get_value(s); - lwasm_expr_stack_free(s); - } - if (rval < -128 || rval > 255) - register_error(as, l, 2, "Byte overflow"); lwasm_emit(as, l, rval & 0xff); return; }