From ec3d6da7b5ffb462d4ad646a9161852d86d58312 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 29 Nov 2014 02:44:17 +0000
Subject: [PATCH] [ARM32] Remove conditional execution from store instructions.

---
 Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp
index 1f50c7fb49..95623d7639 100644
--- a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp
+++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp
@@ -227,7 +227,7 @@ void JitArm::stX(UGeckoInstruction inst)
 		// Check for DSI exception prior to writing back address
 		LDR(rA, R9, PPCSTATE_OFF(Exceptions));
 		TST(rA, EXCEPTION_DSI);
-		SetCC(CC_EQ);
+		FixupBranch has_exception = B_CC(CC_NEQ);
 		if (regOffset == -1)
 		{
 			MOVI2R(rA, offset);
@@ -237,7 +237,7 @@ void JitArm::stX(UGeckoInstruction inst)
 		{
 			ADD(RA, RA, RB);
 		}
-		SetCC();
+		SetJumpTarget(has_exception);
 		gpr.Unlock(rA);
 	}
 }