Call expr_expand_equ() on effective address from bytecode_parser_finalize().

svn path=/trunk/yasm/; revision=285
23 years ago · 6ac7d95579
parent 6a7504341f
commit 6ac7d95579
2 changed files with 4 additions and 2 deletions
--- a/libyasm/bytecode.c
+++ b/libyasm/bytecode.c
@ -675,7 +675,8 @@ bytecode_parser_finalize_insn(bytecode *bc)
    if (ea) {
 	if ((ea->disp) && ((!ea->valid_sib && ea->need_sib) ||
 			   (!ea->valid_modrm && ea->need_modrm))) {
-	    /* First simplify expression to minimize check cost */
+	    /* First expand equ's and simplify expression */
+	    expr_expand_equ(ea->disp);
 	    expr_simplify(ea->disp);

 	    /* Check validity of effective address and calc R/M bits of
--- a/src/bytecode.c
+++ b/src/bytecode.c
@ -675,7 +675,8 @@ bytecode_parser_finalize_insn(bytecode *bc)
    if (ea) {
 	if ((ea->disp) && ((!ea->valid_sib && ea->need_sib) ||
 			   (!ea->valid_modrm && ea->need_modrm))) {
-	    /* First simplify expression to minimize check cost */
+	    /* First expand equ's and simplify expression */
+	    expr_expand_equ(ea->disp);
 	    expr_simplify(ea->disp);

 	    /* Check validity of effective address and calc R/M bits of