diff options
author | Liam <byteslice@airmail.cc> | 2023-09-14 20:34:05 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-09-14 22:44:15 +0200 |
commit | 3ef9673360089b1729ff174eefad9195d8eaf97f (patch) | |
tree | 796d1f7b918f0db4c8a2024388dbb4c51c831464 /src/core/hle/kernel/svc | |
parent | Merge pull request #11496 from liamwhite/ngc (diff) | |
download | yuzu-3ef9673360089b1729ff174eefad9195d8eaf97f.tar yuzu-3ef9673360089b1729ff174eefad9195d8eaf97f.tar.gz yuzu-3ef9673360089b1729ff174eefad9195d8eaf97f.tar.bz2 yuzu-3ef9673360089b1729ff174eefad9195d8eaf97f.tar.lz yuzu-3ef9673360089b1729ff174eefad9195d8eaf97f.tar.xz yuzu-3ef9673360089b1729ff174eefad9195d8eaf97f.tar.zst yuzu-3ef9673360089b1729ff174eefad9195d8eaf97f.zip |
Diffstat (limited to 'src/core/hle/kernel/svc')
-rw-r--r-- | src/core/hle/kernel/svc/svc_debug_string.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/svc/svc_exception.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc/svc_debug_string.cpp b/src/core/hle/kernel/svc/svc_debug_string.cpp index 4c14ce668..00b65429b 100644 --- a/src/core/hle/kernel/svc/svc_debug_string.cpp +++ b/src/core/hle/kernel/svc/svc_debug_string.cpp @@ -14,7 +14,7 @@ Result OutputDebugString(Core::System& system, u64 address, u64 len) { std::string str(len, '\0'); GetCurrentMemory(system.Kernel()).ReadBlock(address, str.data(), str.size()); - LOG_DEBUG(Debug_Emulated, "{}", str); + LOG_INFO(Debug_Emulated, "{}", str); R_SUCCEED(); } diff --git a/src/core/hle/kernel/svc/svc_exception.cpp b/src/core/hle/kernel/svc/svc_exception.cpp index 580cf2f75..c581c086b 100644 --- a/src/core/hle/kernel/svc/svc_exception.cpp +++ b/src/core/hle/kernel/svc/svc_exception.cpp @@ -3,6 +3,7 @@ #include "core/core.h" #include "core/debugger/debugger.h" +#include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/svc.h" #include "core/hle/kernel/svc_types.h" @@ -107,7 +108,10 @@ void Break(Core::System& system, BreakReason reason, u64 info1, u64 info2) { system.ArmInterface(static_cast<std::size_t>(thread_processor_id)).LogBacktrace(); } - if (system.DebuggerEnabled()) { + const bool is_hbl = GetCurrentProcess(system.Kernel()).IsHbl(); + const bool should_break = is_hbl || !notification_only; + + if (system.DebuggerEnabled() && should_break) { auto* thread = system.Kernel().GetCurrentEmuThread(); system.GetDebugger().NotifyThreadStopped(thread); thread->RequestSuspend(Kernel::SuspendType::Debug); |