mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-12 03:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #799 from FioraAeterna/mergebranchfix

Browse Source 
JIT: correctly set skipNext even if conditional-continue is off
This commit is contained in:
Ryan Houdek 2014-08-14 10:12:19 -05:00
commit e6fa582753
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

@ -421,6 +421,7 @@ void Jit64::cmpXX(UGeckoInstruction inst)
if (merge_branch) if (merge_branch)
{ {
js.downcountAmount++; js.downcountAmount++;
js.skipnext = true;
int test_bit = 8 >> (js.next_inst.BI & 3); int test_bit = 8 >> (js.next_inst.BI & 3);
bool condition = !!(js.next_inst.BO & BO_BRANCH_IF_TRUE); bool condition = !!(js.next_inst.BO & BO_BRANCH_IF_TRUE);
@ -479,7 +480,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);
} }
} }