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 #10275 from AdmiralCurtiss/twX-5-byte-jmp 

Jit64: Use farcode for exception exit in twX.
This commit is contained in:
JMC47 2021-12-18 15:07:50 -05:00 committed by GitHub
parent 08d907dec8 48560135b3
commit d8e347c8e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2559,9 +2559,11 @@ void Jit64::twX(UGeckoInstruction inst)
fixups.push_back(f); fixups.push_back(f);
} }
} }
FixupBranch dont_trap = J();
if (!fixups.empty())
{ {
SwitchToFarCode();
RCForkGuard gpr_guard = gpr.Fork(); RCForkGuard gpr_guard = gpr.Fork();
RCForkGuard fpr_guard = fpr.Fork(); RCForkGuard fpr_guard = fpr.Fork();
@ -2577,9 +2579,9 @@ void Jit64::twX(UGeckoInstruction inst)
fpr.Flush(); fpr.Flush();
WriteExceptionExit(); WriteExceptionExit();
}
SetJumpTarget(dont_trap); SwitchToNearCode();
}
if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE)) if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
{ {