Просмотр исходного кода

svcBreak, Signalling to the debugger should not kill execution

When loading NROs, svcBreak is called to signal to the debugger that a new "module" is loaded. As no debugger is technically attached we shouldn't be killing the programs execution.
David Marcec 7 лет назад
Родитель
Сommit
c50f66a8eb
1 измененных файлов с 12 добавлено и 5 удалено
  1. 12 5
      src/core/hle/kernel/svc.cpp

+ 12 - 5
src/core/hle/kernel/svc.cpp

@@ -303,11 +303,18 @@ static ResultCode ArbitrateUnlock(VAddr mutex_addr) {
 
 
 /// Break program execution
 /// Break program execution
 static void Break(u64 reason, u64 info1, u64 info2) {
 static void Break(u64 reason, u64 info1, u64 info2) {
-    LOG_CRITICAL(
-        Debug_Emulated,
-        "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}",
-        reason, info1, info2);
-    ASSERT(false);
+    if ((reason & (1 << 31)) == 0) {
+        LOG_CRITICAL(
+            Debug_Emulated,
+            "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}",
+            reason, info1, info2);
+    } else {
+        LOG_ERROR(
+            Debug_Emulated,
+            "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}",
+            reason, info1, info2);
+        ASSERT(false);
+    }
 }
 }
 
 
 /// Used to output a message on a debug hardware unit - does nothing on a retail unit
 /// Used to output a message on a debug hardware unit - does nothing on a retail unit