Jit_LoadStorePaired: psq_lXX

This commit is contained in:
MerryMage 2018-10-15 21:01:52 +01:00
parent 0b29b5cb83
commit d87436c57d
1 changed files with 9 additions and 15 deletions

View File

@ -131,17 +131,17 @@ void Jit64::psq_lXX(UGeckoInstruction inst)
bool gqrIsConstant = it != js.constantGqr.end(); bool gqrIsConstant = it != js.constantGqr.end();
u32 gqrValue = gqrIsConstant ? it->second >> 16 : 0; u32 gqrValue = gqrIsConstant ? it->second >> 16 : 0;
gpr.Lock(a, b); RCX64Reg scratch_guard = gpr.Scratch(RSCRATCH_EXTRA);
RCX64Reg Ra = gpr.Bind(a, update ? RCMode::ReadWrite : RCMode::Read);
RCOpArg Rb = indexed ? gpr.Use(b, RCMode::Read) : RCOpArg::Imm32((u32)offset);
RCX64Reg Rs = fpr.Bind(s, RCMode::Write);
RegCache::Realize(scratch_guard, Ra, Rb, Rs);
gpr.FlushLockX(RSCRATCH_EXTRA); MOV_sum(32, RSCRATCH_EXTRA, Ra, Rb);
gpr.BindToRegister(a, true, update);
fpr.BindToRegister(s, false, true);
MOV_sum(32, RSCRATCH_EXTRA, gpr.R(a), indexed ? gpr.R(b) : Imm32((u32)offset));
// In memcheck mode, don't update the address until the exception check // In memcheck mode, don't update the address until the exception check
if (update && !jo.memcheck) if (update && !jo.memcheck)
MOV(32, gpr.R(a), R(RSCRATCH_EXTRA)); MOV(32, Ra, R(RSCRATCH_EXTRA));
if (gqrIsConstant) if (gqrIsConstant)
{ {
@ -165,15 +165,9 @@ void Jit64::psq_lXX(UGeckoInstruction inst)
CALLptr(MatR(RSCRATCH)); CALLptr(MatR(RSCRATCH));
} }
CVTPS2PD(fpr.RX(s), R(XMM0)); CVTPS2PD(Rs, R(XMM0));
if (update && jo.memcheck) if (update && jo.memcheck)
{ {
if (indexed) ADD(32, Ra, Rb);
ADD(32, gpr.R(a), gpr.R(b));
else
ADD(32, gpr.R(a), Imm32((u32)offset));
} }
gpr.UnlockAll();
gpr.UnlockAllX();
} }