VERY experimental Nintendo Switch 2 emulator
C++
kernel: be more careful about initialization path for HLE threads
Liame2be660909c9
diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cppindex 230ca3b953..d9ba8e4092 100644--- a/src/core/hle/kernel/k_scheduler.cpp+++ b/src/core/hle/kernel/k_scheduler.cpp@@ -70,6 +70,7 @@ void KScheduler::EnableScheduling(KernelCore& kernel, u64 cores_needing_scheduliGetCurrentThread(kernel).IfDummyThreadTryWait();}GetCurrentThread(kernel).EnableDispatch();+ ASSERT(GetCurrentThread(kernel).GetState() != ThreadState::Waiting);return;}diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cppindex 3640d1d13b..985ce448e6 100644--- a/src/core/hle/kernel/k_thread.cpp+++ b/src/core/hle/kernel/k_thread.cpp@@ -258,7 +258,13 @@ Result KThread::InitializeThread(KThread* thread, KThreadFunction func, uintptr_}Result KThread::InitializeDummyThread(KThread* thread) {- return thread->Initialize({}, {}, {}, DummyThreadPriority, 3, {}, ThreadType::Dummy);+ // Initialize the thread.+ R_TRY(thread->Initialize({}, {}, {}, DummyThreadPriority, 3, {}, ThreadType::Dummy));++ // Initialize emulation parameters.+ thread->stack_parameters.disable_count = 0;++ return ResultSuccess;}Result KThread::InitializeMainThread(Core::System& system, KThread* thread, s32 virt_core) {