[ARM] Disable loadstorepaired instructions when fastmem is disabled.

dolphin-emu · Sep 13, 2013 · 1680f27 · 1680f27
1 parent ef1d336
commit 1680f27
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp
@@ -25,8 +25,7 @@ void JitArm::psq_l(UGeckoInstruction inst)
 	// R12 contains scale
 	// R11 contains type
 	// R10 is the ADDR
-
-	if (js.memcheck) { Default(inst); return; }
+	if (js.memcheck || !Core::g_CoreStartupParameter.bFastmem) { Default(inst); return; }
 
 	LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I]));
 	UBFX(R12, R11, 16, 3); // Type
@@ -66,8 +65,8 @@ void JitArm::psq_st(UGeckoInstruction inst)
 	// R12 contains scale
 	// R11 contains type
 	// R10 is the ADDR
-	if (js.memcheck) { Default(inst); return; }
-	
+	if (js.memcheck || !Core::g_CoreStartupParameter.bFastmem) { Default(inst); return; }
+
 	LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I]));
 	UBFX(R12, R11, 0, 3); // Type
 	LSL(R12, R12, 2);