Merge pull request #2847 from dolphin-emu/revert-2841-andn

Revert "Jit64: use BMI1's ANDN for andcx"
This commit is contained in:
flacs 2015-08-14 18:15:38 +02:00
commit 62c2991260
1 changed files with 4 additions and 17 deletions

View File

@ -676,12 +676,7 @@ void Jit64::boolX(UGeckoInstruction inst)
} }
else if (inst.SUBOP10 == 60) // andcx else if (inst.SUBOP10 == 60) // andcx
{ {
if (cpu_info.bBMI1 && (gpr.R(b).IsSimpleReg() || a == s)) if (a == b)
{
gpr.BindToRegister(b, true, false);
ANDN(32, gpr.RX(a), gpr.RX(b), gpr.R(s));
}
else if (a == b)
{ {
NOT(32, gpr.R(a)); NOT(32, gpr.R(a));
AND(32, gpr.R(a), operand); AND(32, gpr.R(a), operand);
@ -749,19 +744,11 @@ void Jit64::boolX(UGeckoInstruction inst)
needs_test = true; needs_test = true;
} }
else if (inst.SUBOP10 == 60) // andcx else if (inst.SUBOP10 == 60) // andcx
{
if (cpu_info.bBMI1)
{
gpr.BindToRegister(b, true, false);
ANDN(32, gpr.RX(a), gpr.RX(b), gpr.R(s));
}
else
{ {
MOV(32, gpr.R(a), gpr.R(b)); MOV(32, gpr.R(a), gpr.R(b));
NOT(32, gpr.R(a)); NOT(32, gpr.R(a));
AND(32, gpr.R(a), gpr.R(s)); AND(32, gpr.R(a), gpr.R(s));
} }
}
else if (inst.SUBOP10 == 444) // orx else if (inst.SUBOP10 == 444) // orx
{ {
MOV(32, gpr.R(a), gpr.R(s)); MOV(32, gpr.R(a), gpr.R(s));