diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2021-07-23 01:58:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 01:58:59 +0200 |
| commit | 5af56563833b54d5074808dd34af7e00a1b2dad9 (patch) | |
| tree | 0f65ae389bae6d68afcf63ea917d8ba999479729 | |
| parent | 8ad75086209db4eba08e9a06bca132675d95b003 (diff) | |
| parent | 1df3456267c2e501a1252656c3a304b66773abe6 (diff) | |
Merge pull request #9932 from JosJuice/jitarm64-dcbz-backpatch
JitArm64: Fix dcbz backpatch
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp index edb6c3ede8..b45bbfc35a 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp @@ -104,9 +104,10 @@ void JitArm64::EmitBackpatchRoutine(u32 flags, bool fastmem, bool do_farcode, AR else if (flags & BackPatchInfo::FLAG_ZERO_256) { // This literally only stores 32bytes of zeros to the target address - ADD(addr, addr, MEM_REG); - STP(IndexType::Signed, ARM64Reg::ZR, ARM64Reg::ZR, addr, 0); - STP(IndexType::Signed, ARM64Reg::ZR, ARM64Reg::ZR, addr, 16); + ARM64Reg temp = ARM64Reg::X30; + ADD(temp, addr, MEM_REG); + STP(IndexType::Signed, ARM64Reg::ZR, ARM64Reg::ZR, temp, 0); + STP(IndexType::Signed, ARM64Reg::ZR, ARM64Reg::ZR, temp, 16); } else { diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp index 7fcabb5095..c5e3d7f6fa 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp @@ -597,7 +597,7 @@ void JitArm64::dcbz(UGeckoInstruction inst) int a = inst.RA, b = inst.RB; - gpr.Lock(ARM64Reg::W0); + gpr.Lock(ARM64Reg::W0, ARM64Reg::W30); ARM64Reg addr_reg = ARM64Reg::W0; @@ -641,9 +641,6 @@ void JitArm64::dcbz(UGeckoInstruction inst) } } - // We don't care about being /too/ terribly efficient here - // As long as we aren't falling back to interpreter we're winning a lot - BitSet32 gprs_to_push = gpr.GetCallerSavedUsed(); BitSet32 fprs_to_push = fpr.GetCallerSavedUsed(); gprs_to_push[DecodeReg(ARM64Reg::W0)] = 0; @@ -651,7 +648,7 @@ void JitArm64::dcbz(UGeckoInstruction inst) EmitBackpatchRoutine(BackPatchInfo::FLAG_ZERO_256, true, true, ARM64Reg::W0, EncodeRegTo64(addr_reg), gprs_to_push, fprs_to_push); - gpr.Unlock(ARM64Reg::W0); + gpr.Unlock(ARM64Reg::W0, ARM64Reg::W30); } void JitArm64::eieio(UGeckoInstruction inst) |