diff options
author | bunnei <bunneidev@gmail.com> | 2018-03-15 00:33:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-15 00:33:27 +0100 |
commit | cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50 (patch) | |
tree | 6330442e1dacc0d850ce09c35dcee7ddd3a2bc9d /src/core/hle/kernel/scheduler.cpp | |
parent | Merge pull request #213 from Hexagon12/dynarmic-default (diff) | |
parent | core: Move process creation out of global state. (diff) | |
download | yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.gz yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.bz2 yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.lz yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.xz yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.zst yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index 235068b22..921f27efb 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "core/core.h" #include "core/core_timing.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/scheduler.h" @@ -67,7 +68,7 @@ void Scheduler::SwitchContext(Thread* new_thread) { // Cancel any outstanding wakeup events for this thread new_thread->CancelWakeupTimer(); - auto previous_process = Kernel::g_current_process; + auto previous_process = Core::CurrentProcess(); current_thread = new_thread; @@ -75,8 +76,8 @@ void Scheduler::SwitchContext(Thread* new_thread) { new_thread->status = THREADSTATUS_RUNNING; if (previous_process != current_thread->owner_process) { - Kernel::g_current_process = current_thread->owner_process; - SetCurrentPageTable(&Kernel::g_current_process->vm_manager.page_table); + Core::CurrentProcess() = current_thread->owner_process; + SetCurrentPageTable(&Core::CurrentProcess()->vm_manager.page_table); } cpu_core->LoadContext(new_thread->context); |