ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-i386: emulate LOCK'ed BTX ops using atomic helpers 

[rth: Avoid redundant qemu_ld in locked case.  Fix previously unnoticed
incorrect zero-extension of address in register-offset case.]

Signed-off-by: Emilio G. Cota <cota@braap.org>
Message-Id: <1467054136-10430-18-git-send-email-cota@braap.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Emilio G. Cota 2016-06-27 15:02:03 -04:00 committed by Richard Henderson
parent f53b01817f
commit cfe819d309
1 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
target-i386/translate.c
View File

@ -6655,7 +6655,9 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
if (mod != 3) { if (mod != 3) {
s->rip_offset = 1; s->rip_offset = 1;
gen_lea_modrm(env, s, modrm); gen_lea_modrm(env, s, modrm);
gen_op_ld_v(s, ot, cpu_T0, cpu_A0); if (!(s->prefix & PREFIX_LOCK)) {
gen_op_ld_v(s, ot, cpu_T0, cpu_A0);
}
} else { } else {
gen_op_mov_v_reg(ot, cpu_T0, rm); gen_op_mov_v_reg(ot, cpu_T0, rm);
} }
@ -6685,44 +6687,69 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
rm = (modrm & 7) | REX_B(s); rm = (modrm & 7) | REX_B(s);
gen_op_mov_v_reg(MO_32, cpu_T1, reg); gen_op_mov_v_reg(MO_32, cpu_T1, reg);
if (mod != 3) { if (mod != 3) {
gen_lea_modrm(env, s, modrm); AddressParts a = gen_lea_modrm_0(env, s, modrm);
/* specific case: we need to add a displacement */ /* specific case: we need to add a displacement */
gen_exts(ot, cpu_T1); gen_exts(ot, cpu_T1);
tcg_gen_sari_tl(cpu_tmp0, cpu_T1, 3 + ot); tcg_gen_sari_tl(cpu_tmp0, cpu_T1, 3 + ot);
tcg_gen_shli_tl(cpu_tmp0, cpu_tmp0, ot); tcg_gen_shli_tl(cpu_tmp0, cpu_tmp0, ot);
tcg_gen_add_tl(cpu_A0, cpu_A0, cpu_tmp0); tcg_gen_add_tl(cpu_A0, gen_lea_modrm_1(a), cpu_tmp0);
gen_op_ld_v(s, ot, cpu_T0, cpu_A0); gen_lea_v_seg(s, s->aflag, cpu_A0, a.def_seg, s->override);
if (!(s->prefix & PREFIX_LOCK)) {
gen_op_ld_v(s, ot, cpu_T0, cpu_A0);
}
} else { } else {
gen_op_mov_v_reg(ot, cpu_T0, rm); gen_op_mov_v_reg(ot, cpu_T0, rm);
} }
bt_op: bt_op:
tcg_gen_andi_tl(cpu_T1, cpu_T1, (1 << (3 + ot)) - 1); tcg_gen_andi_tl(cpu_T1, cpu_T1, (1 << (3 + ot)) - 1);
tcg_gen_shr_tl(cpu_tmp4, cpu_T0, cpu_T1); tcg_gen_movi_tl(cpu_tmp0, 1);
switch(op) { tcg_gen_shl_tl(cpu_tmp0, cpu_tmp0, cpu_T1);
case 0: if (s->prefix & PREFIX_LOCK) {
break; switch (op) {
case 1: case 0: /* bt */
tcg_gen_movi_tl(cpu_tmp0, 1); /* Needs no atomic ops; we surpressed the normal
tcg_gen_shl_tl(cpu_tmp0, cpu_tmp0, cpu_T1); memory load for LOCK above so do it now. */
tcg_gen_or_tl(cpu_T0, cpu_T0, cpu_tmp0); gen_op_ld_v(s, ot, cpu_T0, cpu_A0);
break; break;
case 2: case 1: /* bts */
tcg_gen_movi_tl(cpu_tmp0, 1); tcg_gen_atomic_fetch_or_tl(cpu_T0, cpu_A0, cpu_tmp0,
tcg_gen_shl_tl(cpu_tmp0, cpu_tmp0, cpu_T1); s->mem_index, ot | MO_LE);
tcg_gen_andc_tl(cpu_T0, cpu_T0, cpu_tmp0); break;
break; case 2: /* btr */
default: tcg_gen_not_tl(cpu_tmp0, cpu_tmp0);
case 3: tcg_gen_atomic_fetch_and_tl(cpu_T0, cpu_A0, cpu_tmp0,
tcg_gen_movi_tl(cpu_tmp0, 1); s->mem_index, ot | MO_LE);
tcg_gen_shl_tl(cpu_tmp0, cpu_tmp0, cpu_T1); break;
tcg_gen_xor_tl(cpu_T0, cpu_T0, cpu_tmp0); default:
break; case 3: /* btc */
} tcg_gen_atomic_fetch_xor_tl(cpu_T0, cpu_A0, cpu_tmp0,
if (op != 0) { s->mem_index, ot | MO_LE);
if (mod != 3) { break;
gen_op_st_v(s, ot, cpu_T0, cpu_A0); }
} else { tcg_gen_shr_tl(cpu_tmp4, cpu_T0, cpu_T1);
gen_op_mov_reg_v(ot, rm, cpu_T0); } else {
tcg_gen_shr_tl(cpu_tmp4, cpu_T0, cpu_T1);
switch (op) {
case 0: /* bt */
/* Data already loaded; nothing to do. */
break;
case 1: /* bts */
tcg_gen_or_tl(cpu_T0, cpu_T0, cpu_tmp0);
break;
case 2: /* btr */
tcg_gen_andc_tl(cpu_T0, cpu_T0, cpu_tmp0);
break;
default:
case 3: /* btc */
tcg_gen_xor_tl(cpu_T0, cpu_T0, cpu_tmp0);
break;
}
if (op != 0) {
if (mod != 3) {
gen_op_st_v(s, ot, cpu_T0, cpu_A0);
} else {
gen_op_mov_reg_v(ot, rm, cpu_T0);
}
} }
} }