From: Emilio G. Cota Date: Mon, 27 Jun 2016 19:02:04 +0000 (-0400) Subject: target-i386: emulate XCHG using atomic helper X-Git-Tag: qemu-xen-4.9.0-rc1~118^2~11 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ea97ebe89f7a879ea9aba90140e40c29b5cbd653;p=qemu-xen.git target-i386: emulate XCHG using atomic helper Signed-off-by: Emilio G. Cota Message-Id: <1467054136-10430-19-git-send-email-cota@braap.org> Signed-off-by: Richard Henderson --- diff --git a/target-i386/translate.c b/target-i386/translate.c index b3cb4c5f64..cfa3956543 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -5564,12 +5564,8 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, gen_lea_modrm(env, s, modrm); gen_op_mov_v_reg(ot, cpu_T0, reg); /* for xchg, lock is implicit */ - if (!(prefixes & PREFIX_LOCK)) - gen_helper_lock(); - 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_gen_atomic_xchg_tl(cpu_T1, cpu_A0, cpu_T0, + s->mem_index, ot | MO_LE); gen_op_mov_reg_v(ot, reg, cpu_T1); } break;