ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/i386: pull cc_op update to callers of gen_jmp_rel{,_csize} 

gen_update_cc_op must be called before control flow splits.  Doing it
in gen_jmp_rel{,_csize} may hide bugs, instead assert that cc_op is
clean---even if that means a few more calls to gen_update_cc_op().

With this new invariant, setting cc_op to CC_OP_DYNAMIC is unnecessary
since the caller should have done it.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-04-10 12:29:52 +02:00
parent bbba9594e8
commit dd17322be7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/i386/tcg/translate.c
View File

@ -2853,6 +2853,8 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num)
target_ulong new_pc = s->pc + diff; target_ulong new_pc = s->pc + diff;
target_ulong new_eip = new_pc - s->cs_base; target_ulong new_eip = new_pc - s->cs_base;
assert(!s->cc_op_dirty);
/* In 64-bit mode, operand size is fixed at 64 bits. */ /* In 64-bit mode, operand size is fixed at 64 bits. */
if (!CODE64(s)) { if (!CODE64(s)) {
if (ot == MO_16) { if (ot == MO_16) {
@ -2866,9 +2868,6 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num)
} }
new_eip &= mask; new_eip &= mask;
gen_update_cc_op(s);
set_cc_op(s, CC_OP_DYNAMIC);
if (tb_cflags(s->base.tb) & CF_PCREL) { if (tb_cflags(s->base.tb) & CF_PCREL) {
tcg_gen_addi_tl(cpu_eip, cpu_eip, new_pc - s->pc_save); tcg_gen_addi_tl(cpu_eip, cpu_eip, new_pc - s->pc_save);
/* /*
@ -5146,6 +5145,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
: (int16_t)insn_get(env, s, MO_16)); : (int16_t)insn_get(env, s, MO_16));
gen_push_v(s, eip_next_tl(s)); gen_push_v(s, eip_next_tl(s));
gen_bnd_jmp(s); gen_bnd_jmp(s);
gen_update_cc_op(s);
gen_jmp_rel(s, dflag, diff, 0); gen_jmp_rel(s, dflag, diff, 0);
} }
break; break;
@ -5169,6 +5169,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
? (int32_t)insn_get(env, s, MO_32) ? (int32_t)insn_get(env, s, MO_32)
: (int16_t)insn_get(env, s, MO_16)); : (int16_t)insn_get(env, s, MO_16));
gen_bnd_jmp(s); gen_bnd_jmp(s);
gen_update_cc_op(s);
gen_jmp_rel(s, dflag, diff, 0); gen_jmp_rel(s, dflag, diff, 0);
} }
break; break;
@ -5189,6 +5190,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
case 0xeb: /* jmp Jb */ case 0xeb: /* jmp Jb */
{ {
int diff = (int8_t)insn_get(env, s, MO_8); int diff = (int8_t)insn_get(env, s, MO_8);
gen_update_cc_op(s);
gen_jmp_rel(s, dflag, diff, 0); gen_jmp_rel(s, dflag, diff, 0);
} }
break; break;