summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-11-23 19:23:23 +0100
committerGitHub <noreply@github.com>2019-11-23 19:23:23 +0100
commit6e4d46908af55e16afca1aa05aeab47e20ab49f5 (patch)
treece0f6fd75e88b90325ab2673964c2b07234bb3d0 /src/core
parentMerge pull request #3140 from FearlessTobi/port-4953 (diff)
parentKernel: Correct Cancel Synchronization. (diff)
downloadyuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar
yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.gz
yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.bz2
yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.lz
yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.xz
yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.zst
yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/svc.cpp5
-rw-r--r--src/core/hle/kernel/thread.cpp7
-rw-r--r--src/core/hle/kernel/thread.h9
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 ee7531f2d..ab0e82ac2 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -120,8 +120,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;
};