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 #801 from FioraAeterna/mergebranchfix 

JIT: correctly set skipNext even if conditional-continue is off
This commit is contained in:
Ryan Houdek 2014-08-14 11:40:56 -05:00
parent 7f3458e957 a4b23d80b7
commit 952eaa2449
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,6 +338,7 @@ void Jit64::cmpXX(UGeckoInstruction inst)
if (merge_branch) if (merge_branch)
{ {
js.downcountAmount++; js.downcountAmount++;
js.skipnext = true;
gpr.Flush(); gpr.Flush();
fpr.Flush(); fpr.Flush();
@ -382,7 +383,6 @@ void Jit64::cmpXX(UGeckoInstruction inst)
{ {
if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE)) if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
{ {
js.skipnext = true;
WriteExit(js.next_compilerPC + 4); WriteExit(js.next_compilerPC + 4);
} }
} }