From 38cdb6744da092a6d748bf105eb3614cad117261 Mon Sep 17 00:00:00 2001
From: David Marcec <dmarcecguzman@gmail.com>
Date: Tue, 23 Oct 2018 15:17:13 +1100
Subject: Added assertion failed, reworked logging levels

---
 src/core/hle/kernel/svc.cpp | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/core/hle/kernel')

diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 2cf0326e6..61b9cfdc1 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -374,8 +374,9 @@ static ResultCode ArbitrateUnlock(VAddr mutex_addr) {
     return Mutex::Release(mutex_addr);
 }
 
-enum BreakType : u32 {
+enum class BreakType : u32 {
     Panic = 0,
+    AssertionFailed = 1,
     PreNROLoad = 3,
     PostNROLoad = 4,
     PreNROUnload = 5,
@@ -396,34 +397,41 @@ static void Break(u32 reason, u64 info1, u64 info2) {
 
     switch (break_reason.break_type) {
     case BreakType::Panic:
-        LOG_ERROR(Debug_Emulated, "Signalling debugger, PANIC! info1=0x{:016X}, info2=0x{:016X}",
-                  info1, info2);
+        LOG_CRITICAL(Debug_Emulated, "Signalling debugger, PANIC! info1=0x{:016X}, info2=0x{:016X}",
+                     info1, info2);
+        break;
+    case BreakType::AssertionFailed:
+        LOG_CRITICAL(Debug_Emulated,
+                     "Signalling debugger, Assertion failed! 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);
+        LOG_WARNING(
+            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);
+        LOG_WARNING(Debug_Emulated,
+                    "Signalling debugger, Loaded an NRO at 0x{:016X} with size 0x{:016X}", info1,
+                    info2);
         break;
     case BreakType::PreNROUnload:
-        LOG_ERROR(
+        LOG_WARNING(
             Debug_Emulated,
             "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);
+        LOG_WARNING(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);
+        LOG_WARNING(
+            Debug_Emulated,
+            "Signalling debugger, Unknown break reason {}, info1=0x{:016X}, info2=0x{:016X}",
+            static_cast<u32>(break_reason.break_type.Value()), info1, info2);
         break;
     }
 
-- 
cgit v1.2.3