diff options
| author | 2019-01-27 12:55:07 -0500 | |
|---|---|---|
| committer | 2019-01-27 12:55:07 -0500 | |
| commit | a9268286a4f424f365eda720756f48fc90d21989 (patch) | |
| tree | f035f789639430c90bf2a08c9fd44fa813542eb4 /src | |
| parent | Merge pull request #2058 from ReinUsesLisp/trunc-warning (diff) | |
| parent | kernel/svc: Log out uncaught C++ exceptions from svcBreak (diff) | |
| download | yuzu-a9268286a4f424f365eda720756f48fc90d21989.tar.gz yuzu-a9268286a4f424f365eda720756f48fc90d21989.tar.xz yuzu-a9268286a4f424f365eda720756f48fc90d21989.zip | |
Merge pull request #2060 from lioncash/exception
kernel/svc: Log out uncaught C++ exceptions from svcBreak
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 6588bd3b8..7cfecb68c 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -597,6 +597,7 @@ enum class BreakType : u32 { | |||
| 597 | PostNROLoad = 4, | 597 | PostNROLoad = 4, |
| 598 | PreNROUnload = 5, | 598 | PreNROUnload = 5, |
| 599 | PostNROUnload = 6, | 599 | PostNROUnload = 6, |
| 600 | CppException = 7, | ||
| 600 | }; | 601 | }; |
| 601 | 602 | ||
| 602 | struct BreakReason { | 603 | struct BreakReason { |
| @@ -669,6 +670,9 @@ static void Break(u32 reason, u64 info1, u64 info2) { | |||
| 669 | "Signalling debugger, Unloaded an NRO at 0x{:016X} with size 0x{:016X}", info1, | 670 | "Signalling debugger, Unloaded an NRO at 0x{:016X} with size 0x{:016X}", info1, |
| 670 | info2); | 671 | info2); |
| 671 | break; | 672 | break; |
| 673 | case BreakType::CppException: | ||
| 674 | LOG_CRITICAL(Debug_Emulated, "Signalling debugger. Uncaught C++ exception encountered."); | ||
| 675 | break; | ||
| 672 | default: | 676 | default: |
| 673 | LOG_WARNING( | 677 | LOG_WARNING( |
| 674 | Debug_Emulated, | 678 | Debug_Emulated, |