yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-22 11:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-i386: Rewrite leave

Browse source 
Unify the code across stack pointer widths. Fix the note about
not updating ESP before the potential exception.

Backports commit 2045f04c3ae030bda650f84035f114bbd84909a9 from qemu
This commit is contained in:
Richard Henderson 2018-02-20 10:15:05 -05:00 committed by Lioncash
parent 7dd4fcc621
commit 0004dfcba3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
qemu/target-i386/translate.c
View file

@ -2664,6 +2664,24 @@ static void gen_enter(DisasContext *s, int esp_addend, int level)
gen_op_mov_reg_v(tcg_ctx, a_ot, R_ESP, *cpu_T[1]);
}
static void gen_leave(DisasContext *s)
{
TCGMemOp d_ot = mo_pushpop(s, s->dflag);
TCGMemOp a_ot = mo_stacksize(s);
TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv cpu_A0 = *(TCGv *)tcg_ctx->cpu_A0;
TCGv **cpu_T = (TCGv **)tcg_ctx->cpu_T;
TCGv **cpu_regs = (TCGv **)tcg_ctx->cpu_regs;
gen_lea_v_seg(s, a_ot, *cpu_regs[R_EBP], R_SS, -1);
gen_op_ld_v(s, d_ot, *cpu_T[0], cpu_A0);
tcg_gen_addi_tl(tcg_ctx, *cpu_T[1], *cpu_regs[R_EBP], 1 << d_ot);
gen_op_mov_reg_v(tcg_ctx, d_ot, R_EBP, *cpu_T[0]);
gen_op_mov_reg_v(tcg_ctx, a_ot, R_ESP, *cpu_T[1]);
}
static void gen_exception(DisasContext *s, int trapno, target_ulong cur_eip)
{
TCGContext *tcg_ctx = s->uc->tcg_ctx;
@ -5736,20 +5754,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
}
break;
case 0xc9: /* leave */
/* XXX: exception not precise (ESP is updated before potential exception) */
if (CODE64(s)) {
gen_op_mov_v_reg(tcg_ctx, MO_64, *cpu_T[0], R_EBP);
gen_op_mov_reg_v(tcg_ctx, MO_64, R_ESP, *cpu_T[0]);
} else if (s->ss32) {
gen_op_mov_v_reg(tcg_ctx, MO_32, *cpu_T[0], R_EBP);
gen_op_mov_reg_v(tcg_ctx, MO_32, R_ESP, *cpu_T[0]);
} else {
gen_op_mov_v_reg(tcg_ctx, MO_16, *cpu_T[0], R_EBP);
gen_op_mov_reg_v(tcg_ctx, MO_16, R_ESP, *cpu_T[0]);
}
ot = gen_pop_T0(s);
gen_op_mov_reg_v(tcg_ctx, ot, R_EBP, *cpu_T[0]);
gen_pop_update(s, ot);
gen_leave(s);
break;
case 0x06: /* push es */
case 0x0e: /* push cs */