target-i386: emulate LOCK'ed NOT using atomic helper

Backports commit 2a5fe8ae145ef7a3ab480922116d27efcc97b85d from qemu
This commit is contained in:
Emilio G. Cota 2018-02-27 23:00:32 -05:00 committed by Lioncash
parent 05c94546d5
commit fedeb0f93e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -5324,10 +5324,15 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
rm = (modrm & 7) | REX_B(s); rm = (modrm & 7) | REX_B(s);
op = (modrm >> 3) & 7; op = (modrm >> 3) & 7;
if (mod != 3) { if (mod != 3) {
if (op == 0) if (op == 0) {
s->rip_offset = insn_const_size(ot); s->rip_offset = insn_const_size(ot);
}
gen_lea_modrm(env, s, modrm); gen_lea_modrm(env, s, modrm);
/* For those below that handle locked memory, don't load here. */
if (!(s->prefix & PREFIX_LOCK)
|| op != 2) {
gen_op_ld_v(s, ot, cpu_T0, cpu_A0); gen_op_ld_v(s, ot, cpu_T0, cpu_A0);
}
} else { } else {
gen_op_mov_v_reg(tcg_ctx, ot, cpu_T0, rm); gen_op_mov_v_reg(tcg_ctx, ot, cpu_T0, rm);
} }
@ -5340,12 +5345,21 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
set_cc_op(s, CC_OP_LOGICB + ot); set_cc_op(s, CC_OP_LOGICB + ot);
break; break;
case 2: /* not */ case 2: /* not */
if (s->prefix & PREFIX_LOCK) {
if (mod == 3) {
goto illegal_op;
}
tcg_gen_movi_tl(tcg_ctx, cpu_T0, ~0);
tcg_gen_atomic_xor_fetch_tl(tcg_ctx, cpu_T0, cpu_A0, cpu_T0,
s->mem_index, ot | MO_LE);
} else {
tcg_gen_not_tl(tcg_ctx, cpu_T0, cpu_T0); tcg_gen_not_tl(tcg_ctx, cpu_T0, cpu_T0);
if (mod != 3) { if (mod != 3) {
gen_op_st_v(s, ot, cpu_T0, cpu_A0); gen_op_st_v(s, ot, cpu_T0, cpu_A0);
} else { } else {
gen_op_mov_reg_v(tcg_ctx, ot, rm, cpu_T0); gen_op_mov_reg_v(tcg_ctx, ot, rm, cpu_T0);
} }
}
break; break;
case 3: /* neg */ case 3: /* neg */
tcg_gen_neg_tl(tcg_ctx, cpu_T0, cpu_T0); tcg_gen_neg_tl(tcg_ctx, cpu_T0, cpu_T0);