Skip to content
Permalink
Browse files

Merge pull request #1163 from FioraAeterna/fixbranchmerge2

JIT: fix branch merging, take 2
  • Loading branch information...
skidau committed Sep 26, 2014
2 parents 30d77b3 + ba39c35 commit 943383c30ed9e045b362479f9702115819a727bc
Showing with 5 additions and 0 deletions.
  1. +5 −0 Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
@@ -612,6 +612,7 @@ void Jit64::boolX(UGeckoInstruction inst)
gpr.KillImmediate(a, true, true);
}
NOT(32, gpr.R(a));
needs_test = true;
}
else if ((inst.SUBOP10 == 412 /* orcx */) || (inst.SUBOP10 == 284 /* eqvx */))
{
@@ -640,6 +641,7 @@ void Jit64::boolX(UGeckoInstruction inst)
{
AND(32, gpr.R(a), operand);
NOT(32, gpr.R(a));
needs_test = true;
}
else if (inst.SUBOP10 == 60) // andcx
{
@@ -663,6 +665,7 @@ void Jit64::boolX(UGeckoInstruction inst)
{
OR(32, gpr.R(a), operand);
NOT(32, gpr.R(a));
needs_test = true;
}
else if (inst.SUBOP10 == 412) // orcx
{
@@ -707,6 +710,7 @@ void Jit64::boolX(UGeckoInstruction inst)
MOV(32, gpr.R(a), gpr.R(s));
AND(32, gpr.R(a), gpr.R(b));
NOT(32, gpr.R(a));
needs_test = true;
}
else if (inst.SUBOP10 == 60) // andcx
{
@@ -724,6 +728,7 @@ void Jit64::boolX(UGeckoInstruction inst)
MOV(32, gpr.R(a), gpr.R(s));
OR(32, gpr.R(a), gpr.R(b));
NOT(32, gpr.R(a));
needs_test = true;
}
else if (inst.SUBOP10 == 412) // orcx
{

0 comments on commit 943383c

Please sign in to comment.
You can’t perform that action at this time.