summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/thread.cpp
diff options
context:
space:
mode:
authorMichael Scire <SciresM@gmail.com>2018-06-21 09:40:29 +0200
committerMichael Scire <SciresM@gmail.com>2018-06-21 09:40:29 +0200
commit9d71ce88cee58d2e171ec5ed82daf075112fb422 (patch)
tree3e8dfaf638c2e63124295d2c8ed1b20c6060c847 /src/core/hle/kernel/thread.cpp
parentKernel/Arbiters: Add stubs for 4.x SignalToAddress/WaitForAddres SVCs. (diff)
downloadyuzu-9d71ce88cee58d2e171ec5ed82daf075112fb422.tar
yuzu-9d71ce88cee58d2e171ec5ed82daf075112fb422.tar.gz
yuzu-9d71ce88cee58d2e171ec5ed82daf075112fb422.tar.bz2
yuzu-9d71ce88cee58d2e171ec5ed82daf075112fb422.tar.lz
yuzu-9d71ce88cee58d2e171ec5ed82daf075112fb422.tar.xz
yuzu-9d71ce88cee58d2e171ec5ed82daf075112fb422.tar.zst
yuzu-9d71ce88cee58d2e171ec5ed82daf075112fb422.zip
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r--src/core/hle/kernel/thread.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index cffa7ca83..2f333ec34 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -140,6 +140,11 @@ static void ThreadWakeupCallback(u64 thread_handle, int cycles_late) {
}
}
+ if (thread->arb_wait_address != 0) {
+ ASSERT(thread->status == THREADSTATUS_WAIT_ARB);
+ thread->arb_wait_address = 0;
+ }
+
if (resume)
thread->ResumeFromWait();
}
@@ -179,6 +184,7 @@ void Thread::ResumeFromWait() {
case THREADSTATUS_WAIT_SLEEP:
case THREADSTATUS_WAIT_IPC:
case THREADSTATUS_WAIT_MUTEX:
+ case THREADSTATUS_WAIT_ARB:
break;
case THREADSTATUS_READY: