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

tcg/i386: Amend bad merge

Browse source
This commit is contained in:
Lioncash 2018-03-12 05:55:15 -04:00
parent a16ee979fc
commit b28c64ed34
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
qemu/tcg/i386/tcg-target.inc.c
View file

@ -2023,11 +2023,10 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg datalo, TCGReg datahi,
base, index, 0, ofs); base, index, 0, ofs);
tcg_out_rolw_8(s, datalo); tcg_out_rolw_8(s, datalo);
} }
tcg_out_modrm(s, OPC_MOVSWL + P_REXW, datalo, datalo);
} else {
tcg_out_modrm_sib_offset(s, OPC_MOVSWL + P_REXW + seg, tcg_out_modrm_sib_offset(s, OPC_MOVSWL + P_REXW + seg,
datalo, base, index, 0, ofs); datalo, base, index, 0, ofs);
} else {
tcg_out_modrm_offset(s, OPC_MOVSWL + P_REXW + seg,
datalo, base, ofs);
} }
break; break;
case MO_UL: case MO_UL:
@ -3388,22 +3387,17 @@ void tcg_expand_vec_op(TCGContext *s, TCGOpcode opc, TCGType type, unsigned vece
NEED_BIAS = 4 NEED_BIAS = 4
}; };
static const uint8_t fixups[16] = { static const uint8_t fixups[16] = {
-1, [0 ... 15] = -1,
-1, [TCG_COND_EQ] = 0,
NEED_SWAP, [TCG_COND_NE] = NEED_INV,
0, [TCG_COND_GT] = 0,
NEED_BIAS | NEED_SWAP, [TCG_COND_LT] = NEED_SWAP,
NEED_BIAS | NEED_SWAP | NEED_INV, [TCG_COND_LE] = NEED_INV,
-1, [TCG_COND_GE] = NEED_SWAP | NEED_INV,
-1, [TCG_COND_GTU] = NEED_BIAS,
0, [TCG_COND_LTU] = NEED_BIAS | NEED_SWAP,
NEED_INV, [TCG_COND_LEU] = NEED_BIAS | NEED_INV,
NEED_INV, [TCG_COND_GEU] = NEED_BIAS | NEED_SWAP | NEED_INV,
0,
NEED_BIAS | NEED_INV,
NEED_BIAS,
-1,
-1,
}; };
TCGCond cond; TCGCond cond;