From 253afee3154e5c5d56c77c88715999be2ba64c21 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 2 Dec 2023 17:26:33 +0100 Subject: [PATCH] JitArm64: Fix updating MEM_REG with imm MSR without fastmem Dolphin would crash when running with a fastmem arena but without fastmem. This regression was caused by merging 9192128c50 without adapting it after the merge of 0606433404. --- Source/Core/Core/PowerPC/JitArm64/Jit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp index a2dde863cd..9216b506ae 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp @@ -353,8 +353,8 @@ void JitArm64::EmitStoreMembase(u32 msr) auto& memory = m_system.GetMemory(); MOVP2R(MEM_REG, UReg_MSR(msr).DR ? - (jo.fastmem_arena ? memory.GetLogicalBase() : memory.GetLogicalPageMappingsBase()) : - (jo.fastmem_arena ? memory.GetPhysicalBase() : memory.GetPhysicalPageMappingsBase())); + (jo.fastmem ? memory.GetLogicalBase() : memory.GetLogicalPageMappingsBase()) : + (jo.fastmem ? memory.GetPhysicalBase() : memory.GetPhysicalPageMappingsBase())); STR(IndexType::Unsigned, MEM_REG, PPC_REG, PPCSTATE_OFF(mem_ptr)); }