From 431ee1c48a805433ea7b0cd8d611d29ead6fa2b7 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 29 Oct 2022 13:54:41 +0200 Subject: [PATCH] JitArm64: Improve register handling for MMIO loadstores MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because of the previous commit, `regs_in_use` must not include `dest_reg` when calling MMIOLoadToReg. There are also some other registers we can skip including in regs_in_use just for efficiency's sake. The `addr_reg_set = false` statements that I've added in this commit are technically redundant – if `mmio_address` is non-zero then `addr_reg_set` is already false – but it's just a coincidence that that's the case. --- Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp index be39929f21..12c0bfe26c 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp @@ -141,8 +141,12 @@ void JitArm64::SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, u32 flags, s32 o } else if (mmio_address) { + regs_in_use[DecodeReg(ARM64Reg::W0)] = 0; + regs_in_use[DecodeReg(ARM64Reg::W30)] = 0; + regs_in_use[DecodeReg(dest_reg)] = 0; MMIOLoadToReg(Memory::mmio_mapping.get(), this, &m_float_emit, regs_in_use, fprs_in_use, dest_reg, mmio_address, flags); + addr_reg_set = false; } else { @@ -308,8 +312,13 @@ void JitArm64::SafeStoreFromReg(s32 dest, u32 value, s32 regOffset, u32 flags, s } else if (mmio_address) { + regs_in_use[DecodeReg(ARM64Reg::W0)] = 0; + regs_in_use[DecodeReg(ARM64Reg::W1)] = 0; + regs_in_use[DecodeReg(ARM64Reg::W30)] = 0; + regs_in_use[DecodeReg(RS)] = 0; MMIOWriteRegToAddr(Memory::mmio_mapping.get(), this, &m_float_emit, regs_in_use, fprs_in_use, RS, mmio_address, flags); + addr_reg_set = false; } else {