summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_thread.cpp
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2022-07-11 16:13:13 +0200
committerLiam <byteslice@airmail.cc>2022-07-15 04:47:18 +0200
commita9a83fa726b43a28f4e5a40516efd56fbf99009f (patch)
tree1f9de785b3af0d31ca19aa7d5770437fe17902c1 /src/core/hle/kernel/k_thread.cpp
parentkernel: be more careful about initialization path for HLE threads (diff)
downloadyuzu-a9a83fa726b43a28f4e5a40516efd56fbf99009f.tar
yuzu-a9a83fa726b43a28f4e5a40516efd56fbf99009f.tar.gz
yuzu-a9a83fa726b43a28f4e5a40516efd56fbf99009f.tar.bz2
yuzu-a9a83fa726b43a28f4e5a40516efd56fbf99009f.tar.lz
yuzu-a9a83fa726b43a28f4e5a40516efd56fbf99009f.tar.xz
yuzu-a9a83fa726b43a28f4e5a40516efd56fbf99009f.tar.zst
yuzu-a9a83fa726b43a28f4e5a40516efd56fbf99009f.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_thread.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp
index 985ce448e..174afc80d 100644
--- a/src/core/hle/kernel/k_thread.cpp
+++ b/src/core/hle/kernel/k_thread.cpp
@@ -1106,6 +1106,8 @@ void KThread::IfDummyThreadTryWait() {
return;
}
+ ASSERT(!kernel.IsPhantomModeForSingleCore());
+
// Block until we are no longer waiting.
std::unique_lock lk(dummy_wait_lock);
dummy_wait_cv.wait(
@@ -1211,10 +1213,12 @@ KScopedDisableDispatch::~KScopedDisableDispatch() {
}
if (GetCurrentThread(kernel).GetDisableDispatchCount() <= 1) {
- auto scheduler = kernel.CurrentScheduler();
+ auto* scheduler = kernel.CurrentScheduler();
- if (scheduler) {
+ if (scheduler && !kernel.IsPhantomModeForSingleCore()) {
scheduler->RescheduleCurrentCore();
+ } else {
+ KScheduler::RescheduleCurrentHLEThread(kernel);
}
} else {
GetCurrentThread(kernel).EnableDispatch();