piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stability fix for JIT load/stores

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6058 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
skidau 2010-08-05 10:01:27 +00:00
parent 040a6e1eb3
commit ca9c174450
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
View File

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