From 4b50a38cf6f1a557e62e6d83c39103507b433b7c Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 30 Nov 2023 20:11:02 +0100 Subject: [PATCH] JitArm64: Fix JitAsm without entry points map This must have broken in a rebase of one of my recently merged PRs. Dolphin still worked correctly with this bug, for two reasons: 1. Most AArch64 users are not on Windows, and therefore normally do have the entry points map. 2. When the bug was triggered, Dolphin would fall back to the slower path rather than crashing. --- Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp index ef51bb6b35..cb08714a87 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp @@ -133,7 +133,7 @@ void JitArm64::GenerateAsm() // b.effectiveAddress != addr || b.msrBits != msr static_assert(offsetof(JitBlockData, msrBits) + 4 == offsetof(JitBlockData, effectiveAddress)); - LDP(IndexType::Signed, msr, pc, block, offsetof(JitBlockData, effectiveAddress)); + LDP(IndexType::Signed, msr, pc, block, offsetof(JitBlockData, msrBits)); LDR(IndexType::Unsigned, msr2, PPC_REG, PPCSTATE_OFF(msr)); CMP(pc, DISPATCHER_PC); FixupBranch pc_mismatch = B(CC_NEQ);