diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-11-16 16:05:39 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-11-16 17:41:51 +0100 |
commit | 7d16b2d2ddd170a24cc09f258fbf2e56f34b009d (patch) | |
tree | a76350979c9df80abaeb271173b09f0fcf488070 /src/core/hle | |
parent | Merge pull request #3113 from lioncash/semi (diff) | |
download | yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.gz yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.bz2 yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.lz yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.xz yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.zst yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 5 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 7 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.h | 9 |
3 files changed, 19 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index c63a9ba8b..b2cef3be9 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -505,6 +505,11 @@ static ResultCode WaitSynchronization(Core::System& system, Handle* index, VAddr return RESULT_TIMEOUT; } + if (thread->IsSyncCancelled()) { + thread->SetSyncCancelled(false); + return ERR_SYNCHRONIZATION_CANCELED; + } + for (auto& object : objects) { object->AddWaitingThread(thread); } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 962530d2d..538e47992 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -132,8 +132,11 @@ void Thread::ResumeFromWait() { } void Thread::CancelWait() { - ASSERT(GetStatus() == ThreadStatus::WaitSynch); - ClearWaitObjects(); + if (GetSchedulingStatus() != ThreadSchedStatus::Paused) { + is_sync_cancelled = true; + return; + } + is_sync_cancelled = false; SetWaitSynchronizationResult(ERR_SYNCHRONIZATION_CANCELED); ResumeFromWait(); } diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index c9870873d..25a6ed234 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -440,6 +440,14 @@ public: is_running = value; } + bool IsSyncCancelled() const { + return is_sync_cancelled; + } + + void SetSyncCancelled(bool value) { + is_sync_cancelled = value; + } + private: explicit Thread(KernelCore& kernel); ~Thread() override; @@ -524,6 +532,7 @@ private: u32 scheduling_state = 0; bool is_running = false; + bool is_sync_cancelled = false; std::string name; }; |