diff options
author | Liam <byteslice@airmail.cc> | 2022-06-21 02:39:16 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2022-06-22 02:01:43 +0200 |
commit | 1fd194141a5643e3d274108a4a886ba8173270bd (patch) | |
tree | 0f2c564bee9afd0660cc6471cd3d8d41908397a8 /src/core/arm/arm_interface.cpp | |
parent | Merge pull request #8432 from liamwhite/watchpoint (diff) | |
download | yuzu-1fd194141a5643e3d274108a4a886ba8173270bd.tar yuzu-1fd194141a5643e3d274108a4a886ba8173270bd.tar.gz yuzu-1fd194141a5643e3d274108a4a886ba8173270bd.tar.bz2 yuzu-1fd194141a5643e3d274108a4a886ba8173270bd.tar.lz yuzu-1fd194141a5643e3d274108a4a886ba8173270bd.tar.xz yuzu-1fd194141a5643e3d274108a4a886ba8173270bd.tar.zst yuzu-1fd194141a5643e3d274108a4a886ba8173270bd.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/arm_interface.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index 6425e131f..56d7d7b3c 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -119,16 +119,23 @@ void ARM_Interface::Run() { } system.ExitDynarmicProfile(); - // Notify the debugger and go to sleep if a breakpoint was hit. - if (Has(hr, breakpoint)) { + // Notify the debugger and go to sleep if a breakpoint was hit, + // or if the thread is unable to continue for any reason. + if (Has(hr, breakpoint) || Has(hr, no_execute)) { RewindBreakpointInstruction(); - system.GetDebugger().NotifyThreadStopped(current_thread); - current_thread->RequestSuspend(SuspendType::Debug); + if (system.DebuggerEnabled()) { + system.GetDebugger().NotifyThreadStopped(current_thread); + } + current_thread->RequestSuspend(Kernel::SuspendType::Debug); break; } + + // Notify the debugger and go to sleep if a watchpoint was hit. if (Has(hr, watchpoint)) { RewindBreakpointInstruction(); - system.GetDebugger().NotifyThreadWatchpoint(current_thread, *HaltedWatchpoint()); + if (system.DebuggerEnabled()) { + system.GetDebugger().NotifyThreadWatchpoint(current_thread, *HaltedWatchpoint()); + } current_thread->RequestSuspend(SuspendType::Debug); break; } |