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

Merge pull request #12820 from JosJuice/jit64-simplity-test-bit 

Jit64: Clean up the test_bit variable
This commit is contained in:
JosJuice 2024-06-08 10:10:29 +02:00 committed by GitHub
parent 81b6bfaa1e e88e641bc0
commit 6c5ceaa06d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -16,6 +16,7 @@
#include "Common/x64Emitter.h" #include "Common/x64Emitter.h"
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/PowerPC/ConditionRegister.h"
#include "Core/PowerPC/Interpreter/ExceptionUtils.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h"
#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter.h"
#include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h"
@ -453,32 +454,31 @@ void Jit64::DoMergedBranchCondition()
js.downcountAmount++; js.downcountAmount++;
js.skipInstructions = 1; js.skipInstructions = 1;
const UGeckoInstruction& next = js.op[1].inst; const UGeckoInstruction& next = js.op[1].inst;
int test_bit = 8 >> (next.BI & 3); int test_bit = 3 - (next.BI & 3);
bool condition = !!(next.BO & BO_BRANCH_IF_TRUE); bool condition = !!(next.BO & BO_BRANCH_IF_TRUE);
const u32 nextPC = js.op[1].address; const u32 nextPC = js.op[1].address;
ASSERT(gpr.IsAllUnlocked()); ASSERT(gpr.IsAllUnlocked());
FixupBranch pDontBranch; FixupBranch pDontBranch;
if (test_bit & 8) switch (test_bit)
{ {
case PowerPC::CR_LT_BIT:
// Test < 0, so jump over if >= 0. // Test < 0, so jump over if >= 0.
pDontBranch = J_CC(condition ? CC_GE : CC_L, Jump::Near); pDontBranch = J_CC(condition ? CC_GE : CC_L, Jump::Near);
} break;
else if (test_bit & 4) case PowerPC::CR_GT_BIT:
{
// Test > 0, so jump over if <= 0. // Test > 0, so jump over if <= 0.
pDontBranch = J_CC(condition ? CC_LE : CC_G, Jump::Near); pDontBranch = J_CC(condition ? CC_LE : CC_G, Jump::Near);
} break;
else if (test_bit & 2) case PowerPC::CR_EQ_BIT:
{
// Test = 0, so jump over if != 0. // Test = 0, so jump over if != 0.
pDontBranch = J_CC(condition ? CC_NE : CC_E, Jump::Near); pDontBranch = J_CC(condition ? CC_NE : CC_E, Jump::Near);
} break;
else case PowerPC::CR_SO_BIT:
{
// SO bit, do not branch (we don't emulate SO for cmp). // SO bit, do not branch (we don't emulate SO for cmp).
pDontBranch = J(Jump::Near); pDontBranch = J(Jump::Near);
break;
} }
{ {
@ -516,21 +516,28 @@ void Jit64::DoMergedBranchImmediate(s64 val)
js.downcountAmount++; js.downcountAmount++;
js.skipInstructions = 1; js.skipInstructions = 1;
const UGeckoInstruction& next = js.op[1].inst; const UGeckoInstruction& next = js.op[1].inst;
int test_bit = 8 >> (next.BI & 3); int test_bit = 3 - (next.BI & 3);
bool condition = !!(next.BO & BO_BRANCH_IF_TRUE); bool condition = !!(next.BO & BO_BRANCH_IF_TRUE);
const u32 nextPC = js.op[1].address; const u32 nextPC = js.op[1].address;
ASSERT(gpr.IsAllUnlocked()); ASSERT(gpr.IsAllUnlocked());
bool branch; bool branch = false;
if (test_bit & 8) switch (test_bit)
{
case PowerPC::CR_LT_BIT:
branch = condition ? val < 0 : val >= 0; branch = condition ? val < 0 : val >= 0;
else if (test_bit & 4) break;
case PowerPC::CR_GT_BIT:
branch = condition ? val > 0 : val <= 0; branch = condition ? val > 0 : val <= 0;
else if (test_bit & 2) break;
case PowerPC::CR_EQ_BIT:
branch = condition ? val == 0 : val != 0; branch = condition ? val == 0 : val != 0;
else // SO bit, do not branch (we don't emulate SO for cmp). break;
branch = false; case PowerPC::CR_SO_BIT:
// SO bit, do not branch (we don't emulate SO for cmp).
break;
}
if (branch) if (branch)
{ {