diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2017-09-24 23:42:42 +0200 |
---|---|---|
committer | MerryMage <MerryMage@users.noreply.github.com> | 2017-09-24 23:42:42 +0200 |
commit | c02bbb7030efd072511bd0051a44d9e503016f74 (patch) | |
tree | cf830eadae6493ee83b7de8b44c10c89d668b5ca /src/core/hle | |
parent | Merge pull request #2921 from jroweboy/batch-fix-2 (diff) | |
download | yuzu-c02bbb7030efd072511bd0051a44d9e503016f74.tar yuzu-c02bbb7030efd072511bd0051a44d9e503016f74.tar.gz yuzu-c02bbb7030efd072511bd0051a44d9e503016f74.tar.bz2 yuzu-c02bbb7030efd072511bd0051a44d9e503016f74.tar.lz yuzu-c02bbb7030efd072511bd0051a44d9e503016f74.tar.xz yuzu-c02bbb7030efd072511bd0051a44d9e503016f74.tar.zst yuzu-c02bbb7030efd072511bd0051a44d9e503016f74.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 324415a36..61378211f 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -178,16 +178,13 @@ static void SwitchContext(Thread* new_thread) { ready_queue.remove(new_thread->current_priority, new_thread); new_thread->status = THREADSTATUS_RUNNING; - Core::CPU().LoadContext(new_thread->context); - Core::CPU().SetCP15Register(CP15_THREAD_URO, new_thread->GetTLSAddress()); - if (previous_process != current_thread->owner_process) { Kernel::g_current_process = current_thread->owner_process; - Memory::current_page_table = &Kernel::g_current_process->vm_manager.page_table; - // We have switched processes and thus, page tables, clear the instruction cache so we - // don't keep stale data from the previous process. - Core::CPU().ClearInstructionCache(); + SetCurrentPageTable(&Kernel::g_current_process->vm_manager.page_table); } + + Core::CPU().LoadContext(new_thread->context); + Core::CPU().SetCP15Register(CP15_THREAD_URO, new_thread->GetTLSAddress()); } else { current_thread = nullptr; // Note: We do not reset the current process and current page table when idling because |