From 324370f1485ae6cf147770e338be0a857a45d885 Mon Sep 17 00:00:00 2001 From: JPikachu Date: Sat, 1 Nov 2025 10:51:33 +0000 Subject: [PATCH] [dynarmic] Fix missing return after exception handling Restores return statement that was removed in commit 21cd44ec04. Without the return, exceptions would fall through causing undefined behavior and null pointer crashes. Fixes possible 'Pokemon Legends: Z-A' 0 fps freeze on startup. --- src/core/arm/dynarmic/arm_dynarmic_64.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 55975f4cdc..aeeeef18e6 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -145,9 +145,11 @@ public: default: if (m_debugger_enabled) { ReturnException(pc, InstructionBreakpoint); + return; } else { m_parent.LogBacktrace(m_process); LOG_CRITICAL(Core_ARM, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", static_cast(exception), pc, m_memory.Read32(pc)); + return; } } }