summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-12-07 00:54:59 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2014-12-07 00:54:59 -0600
commitb9c6ee93b6f90e73b0c8dff14e5f2fb1aa50e239 (patch)
treef244e21488b9b5931ce4746d7072b841bedc3e3b /Source
parent0e1d98a43f7225879c0270fbba0c41cbf6a6c5c5 (diff)
parent68972da1e5c8717cffa924c272a1544617dcf0f5 (diff)
Merge pull request #1661 from FioraAeterna/fixloadstorebind
JIT: fix possible panicalert in loadstore
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
index c8fd0555c1..bf6f76beda 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
@@ -167,7 +167,8 @@ void Jit64::lXXx(UGeckoInstruction inst)
{
if (inst.OPCD == 31)
{
- gpr.Lock(b);
+ if (!gpr.R(b).IsImm())
+ gpr.BindToRegister(b, true, false);
opAddress = gpr.R(b);
}
else