SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386: Use gen_jmp_rel for gen_jcc

Browse Source 
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221001140935.465607-20-richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Richard Henderson 2022-10-01 07:09:28 -07:00 committed by Paolo Bonzini
parent 2255da493a
commit 54b191de67
1 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2409,32 +2409,14 @@ static void gen_goto_tb(DisasContext *s, int tb_num, target_ulong eip)
} }
} }
static inline void gen_jcc(DisasContext *s, int b, static void gen_jcc(DisasContext *s, int b, int diff)
target_ulong val, target_ulong next_eip)
{ {
TCGLabel *l1, *l2; TCGLabel *l1 = gen_new_label();
if (s->jmp_opt) {
l1 = gen_new_label();
gen_jcc1(s, b, l1); gen_jcc1(s, b, l1);
gen_jmp_rel_csize(s, 0, 1);
gen_goto_tb(s, 0, next_eip);
gen_set_label(l1); gen_set_label(l1);
gen_goto_tb(s, 1, val); gen_jmp_rel(s, s->dflag, diff, 0);
} else {
l1 = gen_new_label();
l2 = gen_new_label();
gen_jcc1(s, b, l1);
gen_jmp_im(s, next_eip);
tcg_gen_br(l2);
gen_set_label(l1);
gen_jmp_im(s, val);
gen_set_label(l2);
gen_eob(s);
}
} }
static void gen_cmovcc1(CPUX86State *env, DisasContext *s, MemOp ot, int b, static void gen_cmovcc1(CPUX86State *env, DisasContext *s, MemOp ot, int b,
@ -4780,7 +4762,6 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
int shift; int shift;
MemOp ot, aflag, dflag; MemOp ot, aflag, dflag;
int modrm, reg, rm, mod, op, opreg, val; int modrm, reg, rm, mod, op, opreg, val;
target_ulong next_eip, tval;
bool orig_cc_op_dirty = s->cc_op_dirty; bool orig_cc_op_dirty = s->cc_op_dirty;
CCOp orig_cc_op = s->cc_op; CCOp orig_cc_op = s->cc_op;
@ -6933,22 +6914,20 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
} }
break; break;
case 0x70 ... 0x7f: /* jcc Jb */ case 0x70 ... 0x7f: /* jcc Jb */
tval = (int8_t)insn_get(env, s, MO_8); {
goto do_jcc; int diff = (int8_t)insn_get(env, s, MO_8);
case 0x180 ... 0x18f: /* jcc Jv */
if (dflag != MO_16) {
tval = (int32_t)insn_get(env, s, MO_32);
} else {
tval = (int16_t)insn_get(env, s, MO_16);
}
do_jcc:
next_eip = s->pc - s->cs_base;
tval += next_eip;
if (dflag == MO_16) {
tval &= 0xffff;
}
gen_bnd_jmp(s); gen_bnd_jmp(s);
gen_jcc(s, b, tval, next_eip); gen_jcc(s, b, diff);
}
break;
case 0x180 ... 0x18f: /* jcc Jv */
{
int diff = (dflag != MO_16
? (int32_t)insn_get(env, s, MO_32)
: (int16_t)insn_get(env, s, MO_16));
gen_bnd_jmp(s);
gen_jcc(s, b, diff);
}
break; break;
case 0x190 ... 0x19f: /* setcc Gv */ case 0x190 ... 0x19f: /* setcc Gv */