summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-10-23 06:03:59 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2018-10-23 06:03:59 +0200
commit8042731da9e66edf7bf8b9f3861ec8a3100f336f (patch)
treefc81bc529753cda9ffe8cfa19137c14a6089e019 /src
parentMerge pull request #1543 from lioncash/target (diff)
downloadyuzu-8042731da9e66edf7bf8b9f3861ec8a3100f336f.tar
yuzu-8042731da9e66edf7bf8b9f3861ec8a3100f336f.tar.gz
yuzu-8042731da9e66edf7bf8b9f3861ec8a3100f336f.tar.bz2
yuzu-8042731da9e66edf7bf8b9f3861ec8a3100f336f.tar.lz
yuzu-8042731da9e66edf7bf8b9f3861ec8a3100f336f.tar.xz
yuzu-8042731da9e66edf7bf8b9f3861ec8a3100f336f.tar.zst
yuzu-8042731da9e66edf7bf8b9f3861ec8a3100f336f.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/svc.cpp46
1 files changed, 42 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 690b84930..2cf0326e6 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -374,9 +374,18 @@ static ResultCode ArbitrateUnlock(VAddr mutex_addr) {
return Mutex::Release(mutex_addr);
}
+enum BreakType : u32 {
+ Panic = 0,
+ PreNROLoad = 3,
+ PostNROLoad = 4,
+ PreNROUnload = 5,
+ PostNROUnload = 6,
+};
+
struct BreakReason {
union {
u32 raw;
+ BitField<0, 30, BreakType> break_type;
BitField<31, 1, u32> signal_debugger;
};
};
@@ -384,12 +393,41 @@ struct BreakReason {
/// Break program execution
static void Break(u32 reason, u64 info1, u64 info2) {
BreakReason break_reason{reason};
- if (break_reason.signal_debugger) {
+
+ switch (break_reason.break_type) {
+ case BreakType::Panic:
+ LOG_ERROR(Debug_Emulated, "Signalling debugger, PANIC! info1=0x{:016X}, info2=0x{:016X}",
+ info1, info2);
+ break;
+ case BreakType::PreNROLoad:
+ LOG_ERROR(Debug_Emulated,
+ "Signalling debugger, Attempting to load an NRO at 0x{:016X} with size 0x{:016X}",
+ info1, info2);
+ break;
+ case BreakType::PostNROLoad:
+ LOG_ERROR(Debug_Emulated,
+ "Signalling debugger, Loaded an NRO at 0x{:016X} with size 0x{:016X}", info1,
+ info2);
+ break;
+ case BreakType::PreNROUnload:
LOG_ERROR(
Debug_Emulated,
- "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}",
- reason, info1, info2);
- } else {
+ "Signalling debugger, Attempting to unload an NRO at 0x{:016X} with size 0x{:016X}",
+ info1, info2);
+ break;
+ case BreakType::PostNROUnload:
+ LOG_ERROR(Debug_Emulated,
+ "Signalling debugger, Unloaded an NRO at 0x{:016X} with size 0x{:016X}", info1,
+ info2);
+ break;
+ default:
+ LOG_ERROR(Debug_Emulated,
+ "Signalling debugger, Unknown break reason {}, info1=0x{:016X}, info2=0x{:016X}",
+ static_cast<u32>(break_reason.break_type), info1, info2);
+ break;
+ }
+
+ if (!break_reason.signal_debugger) {
LOG_CRITICAL(
Debug_Emulated,
"Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}",