diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 40 |
1 files changed, 24 insertions, 16 deletions
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) { | |||
| 374 | return Mutex::Release(mutex_addr); | 374 | return Mutex::Release(mutex_addr); |
| 375 | } | 375 | } |
| 376 | 376 | ||
| 377 | enum BreakType : u32 { | 377 | enum class BreakType : u32 { |
| 378 | Panic = 0, | 378 | Panic = 0, |
| 379 | AssertionFailed = 1, | ||
| 379 | PreNROLoad = 3, | 380 | PreNROLoad = 3, |
| 380 | PostNROLoad = 4, | 381 | PostNROLoad = 4, |
| 381 | PreNROUnload = 5, | 382 | PreNROUnload = 5, |
| @@ -396,34 +397,41 @@ static void Break(u32 reason, u64 info1, u64 info2) { | |||
| 396 | 397 | ||
| 397 | switch (break_reason.break_type) { | 398 | switch (break_reason.break_type) { |
| 398 | case BreakType::Panic: | 399 | case BreakType::Panic: |
| 399 | LOG_ERROR(Debug_Emulated, "Signalling debugger, PANIC! info1=0x{:016X}, info2=0x{:016X}", | 400 | LOG_CRITICAL(Debug_Emulated, "Signalling debugger, PANIC! info1=0x{:016X}, info2=0x{:016X}", |
| 400 | info1, info2); | 401 | info1, info2); |
| 402 | break; | ||
| 403 | case BreakType::AssertionFailed: | ||
| 404 | LOG_CRITICAL(Debug_Emulated, | ||
| 405 | "Signalling debugger, Assertion failed! info1=0x{:016X}, info2=0x{:016X}", | ||
| 406 | info1, info2); | ||
| 401 | break; | 407 | break; |
| 402 | case BreakType::PreNROLoad: | 408 | case BreakType::PreNROLoad: |
| 403 | LOG_ERROR(Debug_Emulated, | 409 | LOG_WARNING( |
| 404 | "Signalling debugger, Attempting to load an NRO at 0x{:016X} with size 0x{:016X}", | 410 | Debug_Emulated, |
| 405 | info1, info2); | 411 | "Signalling debugger, Attempting to load an NRO at 0x{:016X} with size 0x{:016X}", |
| 412 | info1, info2); | ||
| 406 | break; | 413 | break; |
| 407 | case BreakType::PostNROLoad: | 414 | case BreakType::PostNROLoad: |
| 408 | LOG_ERROR(Debug_Emulated, | 415 | LOG_WARNING(Debug_Emulated, |
| 409 | "Signalling debugger, Loaded an NRO at 0x{:016X} with size 0x{:016X}", info1, | 416 | "Signalling debugger, Loaded an NRO at 0x{:016X} with size 0x{:016X}", info1, |
| 410 | info2); | 417 | info2); |
| 411 | break; | 418 | break; |
| 412 | case BreakType::PreNROUnload: | 419 | case BreakType::PreNROUnload: |
| 413 | LOG_ERROR( | 420 | LOG_WARNING( |
| 414 | Debug_Emulated, | 421 | Debug_Emulated, |
| 415 | "Signalling debugger, Attempting to unload an NRO at 0x{:016X} with size 0x{:016X}", | 422 | "Signalling debugger, Attempting to unload an NRO at 0x{:016X} with size 0x{:016X}", |
| 416 | info1, info2); | 423 | info1, info2); |
| 417 | break; | 424 | break; |
| 418 | case BreakType::PostNROUnload: | 425 | case BreakType::PostNROUnload: |
| 419 | LOG_ERROR(Debug_Emulated, | 426 | LOG_WARNING(Debug_Emulated, |
| 420 | "Signalling debugger, Unloaded an NRO at 0x{:016X} with size 0x{:016X}", info1, | 427 | "Signalling debugger, Unloaded an NRO at 0x{:016X} with size 0x{:016X}", info1, |
| 421 | info2); | 428 | info2); |
| 422 | break; | 429 | break; |
| 423 | default: | 430 | default: |
| 424 | LOG_ERROR(Debug_Emulated, | 431 | LOG_WARNING( |
| 425 | "Signalling debugger, Unknown break reason {}, info1=0x{:016X}, info2=0x{:016X}", | 432 | Debug_Emulated, |
| 426 | static_cast<u32>(break_reason.break_type), info1, info2); | 433 | "Signalling debugger, Unknown break reason {}, info1=0x{:016X}, info2=0x{:016X}", |
| 434 | static_cast<u32>(break_reason.break_type.Value()), info1, info2); | ||
| 427 | break; | 435 | break; |
| 428 | } | 436 | } |
| 429 | 437 | ||