summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-06-22 20:21:53 +0200
committerGitHub <noreply@github.com>2020-06-22 20:21:53 +0200
commit25174afa7922fab55e36acd1a2eb1a55daff7f27 (patch)
tree186a3b8bdf440e936577a9d31d8715573772ac7e
parentMerge pull request #4110 from ReinUsesLisp/direct-upload-sets (diff)
parentarm_dynarmic_64: Log the instruction when an exception is raised (diff)
downloadyuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.tar
yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.tar.gz
yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.tar.bz2
yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.tar.lz
yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.tar.xz
yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.tar.zst
yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.zip
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp2
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_64.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index 19d798dc7..4c8663d03 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -62,7 +62,7 @@ public:
case Dynarmic::A32::Exception::Breakpoint:
break;
}
- LOG_CRITICAL(HW_GPU, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})",
+ LOG_CRITICAL(Core_ARM, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})",
static_cast<std::size_t>(exception), pc, MemoryReadCode(pc));
UNIMPLEMENTED();
}
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index 337b97be9..5f5e36d94 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -98,8 +98,8 @@ public:
}
[[fallthrough]];
default:
- ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:X})",
- static_cast<std::size_t>(exception), pc);
+ ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})",
+ static_cast<std::size_t>(exception), pc, MemoryReadCode(pc));
}
}