Merge pull request #799 from FioraAeterna/mergebranchfix

JIT: correctly set skipNext even if conditional-continue is off
dolphin-emu · Aug 14, 2014 · e6fa582 · e6fa582
2 parents 7b6b9b0 + 75cc891
commit e6fa582
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
@@ -421,6 +421,7 @@ void Jit64::cmpXX(UGeckoInstruction inst)
 		if (merge_branch)
 		{
 			js.downcountAmount++;
+			js.skipnext = true;
 			int test_bit = 8 >> (js.next_inst.BI & 3);
 			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))
 			{
-				js.skipnext = true;
 				WriteExit(js.next_compilerPC + 4);
 			}
 		}