From ca9c174450a9bc5313784a087c9cefd361a3ab9f Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Thu, 5 Aug 2010 10:01:27 +0000
Subject: [PATCH] Stability fix for JIT load/stores

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6058 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
index fa3daaf0f3..27db390c27 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
@@ -54,13 +54,11 @@ void Jit64::lbzx(UGeckoInstruction inst)
 
 	MEMCHECK_START
 
-	gpr.Lock(d);
 	gpr.KillImmediate(d, false, true);
 	MOV(32, gpr.R(d), R(EAX));
 
 	MEMCHECK_END
 
-	gpr.UnlockAll();
 	gpr.UnlockAllX();
 }
 
@@ -82,13 +80,11 @@ void Jit64::lhax(UGeckoInstruction inst)
 
 	MEMCHECK_START
 
-	gpr.Lock(d);
 	gpr.KillImmediate(d, false, true);
 	MOV(32, gpr.R(d), R(EAX));
 
 	MEMCHECK_END
 
-	gpr.UnlockAll();
 	gpr.UnlockAllX();
 }
 
@@ -109,13 +105,11 @@ void Jit64::lwzx(UGeckoInstruction inst)
 
 	MEMCHECK_START
 
-	gpr.Lock(d);
 	gpr.KillImmediate(d, false, true);
 	MOV(32, gpr.R(d), R(EAX));
 
 	MEMCHECK_END
 
-	gpr.UnlockAll();
 	gpr.UnlockAllX();
 }
 
@@ -217,12 +211,13 @@ void Jit64::lXz(UGeckoInstruction inst)
 	else
 	{
 		gpr.FlushLockX(ABI_PARAM1);
+		gpr.Lock(a);
+		gpr.BindToRegister(a, true, false);
 		MOV(32, R(ABI_PARAM1), gpr.R(a));
 		SafeLoadRegToEAX(ABI_PARAM1, accessSize, offset);
 		
 		MEMCHECK_START
 
-		gpr.Lock(d);
 		gpr.KillImmediate(d, false, true);
 		MOV(32, gpr.R(d), R(EAX));
 		
@@ -248,13 +243,11 @@ void Jit64::lha(UGeckoInstruction inst)
 
 	MEMCHECK_START
 
-	gpr.Lock(d);
 	gpr.KillImmediate(d, false, true);
 	MOV(32, gpr.R(d), R(EAX));
 
 	MEMCHECK_END
 
-	gpr.UnlockAll();
 	gpr.UnlockAllX();
 }
 
@@ -277,13 +270,11 @@ void Jit64::lwzux(UGeckoInstruction inst)
 
 	MEMCHECK_START
 
-	gpr.Lock(d);
 	gpr.KillImmediate(d, false, true);
 	MOV(32, gpr.R(d), R(EAX));
 
 	MEMCHECK_END
 
-	gpr.UnlockAll();
 	gpr.UnlockAllX();
 }
 
@@ -409,8 +400,6 @@ void Jit64::stX(UGeckoInstruction inst)
 
 		gpr.FlushLockX(ECX, EDX);
 		gpr.Lock(s, a);
-		if (update && offset)
-			gpr.BindToRegister(a, true, true);
 		MOV(32, R(EDX), gpr.R(a));
 		MOV(32, R(ECX), gpr.R(s));
 		SafeWriteRegToReg(ECX, EDX, accessSize, offset);
@@ -419,6 +408,7 @@ void Jit64::stX(UGeckoInstruction inst)
 		{
 			MEMCHECK_START
 			
+			gpr.KillImmediate(a, true, true);
 			ADD(32, gpr.R(a), Imm32((u32)offset));
 
 			MEMCHECK_END