VERY experimental Nintendo Switch 2 emulator
C++
kernel: fix some uses of disable_count
Liam6d5cc6b2a2ab
diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cppindex cd863e7156..61a4fb4641 100644--- a/src/core/hle/kernel/k_process.cpp+++ b/src/core/hle/kernel/k_process.cpp@@ -57,18 +57,13 @@ void SetupMainThread(Core::System& system, KProcess& owner_process, u32 prioritythread->GetContext64().cpu_registers[0] = 0;thread->GetContext32().cpu_registers[1] = thread_handle;thread->GetContext64().cpu_registers[1] = thread_handle;- thread->DisableDispatch();- auto& kernel = system.Kernel();- // Threads by default are dormant, wake up the main thread so it runs when the scheduler fires- {- KScopedSchedulerLock lock{kernel};- thread->SetState(ThreadState::Runnable);-- if (system.DebuggerEnabled()) {- thread->RequestSuspend(SuspendType::Debug);- }+ if (system.DebuggerEnabled()) {+ thread->RequestSuspend(SuspendType::Debug);}++ // Run our thread.+ void(thread->Run());}} // Anonymous namespacediff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cppindex 2d4e8637b3..7e03b26f8e 100644--- a/src/core/hle/kernel/k_scheduler.cpp+++ b/src/core/hle/kernel/k_scheduler.cpp@@ -829,6 +829,7 @@ void KScheduler::Initialize() {idle_thread = KThread::Create(system.Kernel());ASSERT(KThread::InitializeIdleThread(system, idle_thread, core_id).IsSuccess());idle_thread->SetName(fmt::format("IdleThread:{}", core_id));+ idle_thread->EnableDispatch();}KScopedSchedulerLock::KScopedSchedulerLock(KernelCore& kernel)diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cppindex 8d48a79014..2687891502 100644--- a/src/core/hle/kernel/k_thread.cpp+++ b/src/core/hle/kernel/k_thread.cpp@@ -225,7 +225,7 @@ ResultCode KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_s// Setup the stack parameters.StackParameters& sp = GetStackParameters();sp.cur_thread = this;- sp.disable_count = 0;+ sp.disable_count = 1;SetInExceptionHandler();// Set thread ID.@@ -1014,8 +1014,6 @@ ResultCode KThread::Run() {// Set our state and finish.SetState(ThreadState::Runnable);- DisableDispatch();-return ResultSuccess;}}diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cppindex 73593c7a0d..66c8f4455e 100644--- a/src/core/hle/kernel/kernel.cpp+++ b/src/core/hle/kernel/kernel.cpp@@ -254,7 +254,6 @@ struct KernelCore::Impl {core_id).IsSuccess());shutdown_threads[core_id]->SetName(fmt::format("SuspendThread:{}", core_id));- shutdown_threads[core_id]->DisableDispatch();}}