summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormerry <git@mary.rs>2022-04-05 21:40:20 +0200
committermerry <git@mary.rs>2022-04-05 21:40:20 +0200
commit7f11710e0a1d9301624ed53c226445485539498c (patch)
tree31b05a353725278520962efe7cbee0e7173f2f61
parentMerge pull request #8156 from yuzu-emu/revert-8154-unneeded-read-block (diff)
downloadyuzu-7f11710e0a1d9301624ed53c226445485539498c.tar
yuzu-7f11710e0a1d9301624ed53c226445485539498c.tar.gz
yuzu-7f11710e0a1d9301624ed53c226445485539498c.tar.bz2
yuzu-7f11710e0a1d9301624ed53c226445485539498c.tar.lz
yuzu-7f11710e0a1d9301624ed53c226445485539498c.tar.xz
yuzu-7f11710e0a1d9301624ed53c226445485539498c.tar.zst
yuzu-7f11710e0a1d9301624ed53c226445485539498c.zip
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp2
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_64.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index d4cbd0c20..054572445 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -70,11 +70,13 @@ public:
}
void InterpreterFallback(u32 pc, std::size_t num_instructions) override {
+ parent.LogBacktrace();
UNIMPLEMENTED_MSG("This should never happen, pc = {:08X}, code = {:08X}", pc,
MemoryReadCode(pc));
}
void ExceptionRaised(u32 pc, Dynarmic::A32::Exception exception) override {
+ parent.LogBacktrace();
LOG_CRITICAL(Core_ARM,
"ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X}, thumb = {})",
exception, pc, MemoryReadCode(pc), parent.IsInThumbMode());
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index 6d5a1ecfd..7ff8f9495 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -81,6 +81,7 @@ public:
}
void InterpreterFallback(u64 pc, std::size_t num_instructions) override {
+ parent.LogBacktrace();
LOG_ERROR(Core_ARM,
"Unimplemented instruction @ 0x{:X} for {} instructions (instr = {:08X})", pc,
num_instructions, MemoryReadCode(pc));
@@ -118,6 +119,7 @@ public:
return;
case Dynarmic::A64::Exception::Breakpoint:
default:
+ parent.LogBacktrace();
ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})",
static_cast<std::size_t>(exception), pc, MemoryReadCode(pc));
}