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

Jit_Integer: DoMergedBranchCondition

This commit is contained in:
MerryMage 2018-10-15 21:01:26 +01:00
parent 0d3393b306
commit 256e234949
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,8 +448,8 @@ void Jit64::DoMergedBranchCondition()
bool condition = !!(next.BO & BO_BRANCH_IF_TRUE);
const u32 nextPC = js.op[1].address;
gpr.UnlockAll();
gpr.UnlockAllX();
ASSERT(gpr.IsAllUnlocked());
FixupBranch pDontBranch;
if (test_bit & 8)
pDontBranch = J_CC(condition ? CC_GE : CC_L, true); // Test < 0, so jump over if >= 0.
@ -460,10 +460,15 @@ void Jit64::DoMergedBranchCondition()
else // SO bit, do not branch (we don't emulate SO for cmp).
pDontBranch = J(true);
gpr.Flush(RegCache::FlushMode::MaintainState);
fpr.Flush(RegCache::FlushMode::MaintainState);
{
RCForkGuard gpr_guard = gpr.Fork();
RCForkGuard fpr_guard = fpr.Fork();
DoMergedBranch();
gpr.Flush();
fpr.Flush();
DoMergedBranch();
}
SetJumpTarget(pDontBranch);