Bail out on a delay slot in VFPU on arm also.

Otherwise we loop infinitely. Workaround for hrydgard#1926. Should fix hrydgard#1679.
unknownbrackets · Jun 3, 2013 · a640ac4 · a640ac4
1 parent af940df
commit a640ac4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Core/MIPS/ARM/ArmCompBranch.cpp b/Core/MIPS/ARM/ArmCompBranch.cpp
@@ -265,6 +265,10 @@ void Jit::Comp_FPUBranch(u32 op)
 // If likely is set, discard the branch slot if NOT taken.
 void Jit::BranchVFPUFlag(u32 op, ArmGen::CCFlags cc, bool likely)
 {
+	if (js.inDelaySlot) {
+		ERROR_LOG_REPORT(JIT, "Branch in VFPU delay slot at %08x", js.compilerPC);
+		return;
+	}
 	int offset = (signed short)(op & 0xFFFF) << 2;
 	u32 targetAddr = js.compilerPC + offset + 4;