From 1817e30effca25c12a83ef89e8db7b1212855cfa Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sun, 26 Aug 2018 00:38:23 +0100 Subject: [PATCH] arm_dynarmic: Print current instruction when ExceptionRaised --- src/core/arm/dynarmic/arm_dynarmic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index c1bde8cbf..a3dbefd67 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -125,8 +125,8 @@ public: } void ExceptionRaised(VAddr pc, Dynarmic::A32::Exception exception) override { - ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:X})", - static_cast(exception), pc); + ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", + static_cast(exception), pc, MemoryReadCode(pc)); } void AddTicks(std::uint64_t ticks) override {