From 9d9b7dedacf3d902d2071def5fefcfd5ea654126 Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Tue, 27 Feb 2018 23:40:13 -0500 Subject: [PATCH] target-i386: emulate XCHG using atomic helper Backports commit ea97ebe89f7a879ea9aba90140e40c29b5cbd653 from qemu --- qemu/target-i386/translate.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/qemu/target-i386/translate.c b/qemu/target-i386/translate.c index b261d0f3..41f0c138 100644 --- a/qemu/target-i386/translate.c +++ b/qemu/target-i386/translate.c @@ -6224,12 +6224,8 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, gen_lea_modrm(env, s, modrm); gen_op_mov_v_reg(tcg_ctx, ot, cpu_T0, reg); /* for xchg, lock is implicit */ - if (!(prefixes & PREFIX_LOCK)) - gen_helper_lock(tcg_ctx, cpu_env); - gen_op_ld_v(s, ot, cpu_T1, cpu_A0); - gen_op_st_v(s, ot, cpu_T0, cpu_A0); - if (!(prefixes & PREFIX_LOCK)) - gen_helper_unlock(tcg_ctx, cpu_env); + tcg_gen_atomic_xchg_tl(tcg_ctx, cpu_T1, cpu_A0, cpu_T0, + s->mem_index, ot | MO_LE); gen_op_mov_reg_v(tcg_ctx, ot, reg, cpu_T1); } break;