diff options
| author |  bunnei | 2018-10-12 12:08:08 -0400 |
|---|---|---|
| committer |  GitHub | 2018-10-12 12:08:08 -0400 |
| commit | 2946d4bdbe8d2432a0991e750adb9ef5a04cee09 (patch) | |
| tree | 8d43f916215bb0e25c5cdd5061c5f1dbc1361673 /src/core/hle/kernel/svc.cpp | |
| parent | Merge pull request #1478 from ogniK5377/remap-invalidhandle-remap (diff) | |
| parent | Changed all casts in svc_wrap.h to be static_cast instead (diff) | |
| download | yuzu-2946d4bdbe8d2432a0991e750adb9ef5a04cee09.tar.gz yuzu-2946d4bdbe8d2432a0991e750adb9ef5a04cee09.tar.xz yuzu-2946d4bdbe8d2432a0991e750adb9ef5a04cee09.zip | |
Merge pull request #1467 from ogniK5377/svcbreak-type-fix
Fixed incorrect types for svcBreak
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 3e4dd61dc..863ecfa74 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -370,15 +370,15 @@ static ResultCode ArbitrateUnlock(VAddr mutex_addr) { | |||
| 370 | 370 | ||
| 371 | struct BreakReason { | 371 | struct BreakReason { |
| 372 | union { | 372 | union { |
| 373 | u64 raw; | 373 | u32 raw; |
| 374 | BitField<31, 1, u64> dont_kill_application; | 374 | BitField<31, 1, u32> signal_debugger; |
| 375 | }; | 375 | }; |
| 376 | }; | 376 | }; |
| 377 | 377 | ||
| 378 | /// Break program execution | 378 | /// Break program execution |
| 379 | static void Break(u64 reason, u64 info1, u64 info2) { | 379 | static void Break(u32 reason, u64 info1, u64 info2) { |
| 380 | BreakReason break_reason{reason}; | 380 | BreakReason break_reason{reason}; |
| 381 | if (break_reason.dont_kill_application) { | 381 | if (break_reason.signal_debugger) { |
| 382 | LOG_ERROR( | 382 | LOG_ERROR( |
| 383 | Debug_Emulated, | 383 | Debug_Emulated, |
| 384 | "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}", | 384 | "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}", |