deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

(Hopefully) Properly check if the thread is blocked when stepping

Browse source
This commit is contained in:
svc64 2023-10-07 15:11:51 +03:00
parent 144aa2f5b1
commit f934d23de4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs
View file

@ -1442,12 +1442,16 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
{ {
lock (_activityOperationLock) lock (_activityOperationLock)
{ {
KernelContext.CriticalSection.Enter();
bool blocked = MutexOwner != null || WaitingInArbitration || WaitingSync;
if (_debugState != (int)DebugState.Stopped if (_debugState != (int)DebugState.Stopped
|| (_forcePauseFlags & ThreadSchedState.ThreadPauseFlag) == 0 || (_forcePauseFlags & ThreadSchedState.ThreadPauseFlag) == 0
|| MutexOwner != null) || blocked)
{ {
KernelContext.CriticalSection.Leave();
return false; return false;
} }
KernelContext.CriticalSection.Leave();
Context.RequestDebugStep(); Context.RequestDebugStep();
Resume(ThreadSchedState.ThreadPauseFlag); Resume(ThreadSchedState.ThreadPauseFlag);