From 1ed6be12b93e368b0b7b078f5cc68c39783243ae Mon Sep 17 00:00:00 2001 From: Fiora Date: Sat, 30 Aug 2014 04:17:48 -0700 Subject: [PATCH] JIT: revert lmw optimizations This seems to break Star Wars Rogue Leader and I have no idea why, so for the meantime I'm just going to revert it since it's not very important. --- Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp index 9c3e5bd876..e7f0508c67 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp @@ -457,17 +457,17 @@ void Jit64::lmw(UGeckoInstruction inst) JITDISABLE(bJITLoadStoreOff); // TODO: This doesn't handle rollback on DSI correctly + gpr.FlushLockX(ECX); + MOV(32, R(ECX), Imm32((u32)(s32)inst.SIMM_16)); if (inst.RA) - { - gpr.Lock(inst.RA); - gpr.BindToRegister(inst.RA, true, false); - } + ADD(32, R(ECX), gpr.R(inst.RA)); for (int i = inst.RD; i < 32; i++) { + SafeLoadToReg(EAX, R(ECX), 32, (i - inst.RD) * 4, CallerSavedRegistersInUse(), false); gpr.BindToRegister(i, false, true); - SafeLoadToReg(gpr.RX(i), inst.RA ? gpr.R(inst.RA) : Imm32(0), 32, (i - inst.RD) * 4 + (s32)inst.SIMM_16, CallerSavedRegistersInUse(), false); + MOV(32, gpr.R(i), R(EAX)); } - gpr.UnlockAll(); + gpr.UnlockAllX(); } void Jit64::stmw(UGeckoInstruction inst)