summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-10-09 02:10:30 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2018-10-09 02:10:30 +0200
commitc50f66a8eb85abd979508bec8b53cd12394bfd4d (patch)
tree63bb16c8493c3499802f174758f58e40ae0face5
parentMerge pull request #1456 from ogniK5377/aoc-u-fixups (diff)
downloadyuzu-c50f66a8eb85abd979508bec8b53cd12394bfd4d.tar
yuzu-c50f66a8eb85abd979508bec8b53cd12394bfd4d.tar.gz
yuzu-c50f66a8eb85abd979508bec8b53cd12394bfd4d.tar.bz2
yuzu-c50f66a8eb85abd979508bec8b53cd12394bfd4d.tar.lz
yuzu-c50f66a8eb85abd979508bec8b53cd12394bfd4d.tar.xz
yuzu-c50f66a8eb85abd979508bec8b53cd12394bfd4d.tar.zst
yuzu-c50f66a8eb85abd979508bec8b53cd12394bfd4d.zip
-rw-r--r--src/core/hle/kernel/svc.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 6c4af7e47..7b594ed16 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -303,11 +303,18 @@ static ResultCode ArbitrateUnlock(VAddr mutex_addr) {
/// Break program execution
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