diff options
author | Subv <subv2112@gmail.com> | 2018-07-21 02:57:45 +0200 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-07-21 02:57:45 +0200 |
commit | d84eb9dac64f314adcef2c374de245012f658b1d (patch) | |
tree | 56720a5bce5d1a285dda01c16bfcb1dd57e53054 /src/core/hle/kernel/scheduler.cpp | |
parent | Merge pull request #730 from lioncash/string (diff) | |
download | yuzu-d84eb9dac64f314adcef2c374de245012f658b1d.tar yuzu-d84eb9dac64f314adcef2c374de245012f658b1d.tar.gz yuzu-d84eb9dac64f314adcef2c374de245012f658b1d.tar.bz2 yuzu-d84eb9dac64f314adcef2c374de245012f658b1d.tar.lz yuzu-d84eb9dac64f314adcef2c374de245012f658b1d.tar.xz yuzu-d84eb9dac64f314adcef2c374de245012f658b1d.tar.zst yuzu-d84eb9dac64f314adcef2c374de245012f658b1d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index 1f4abfbe8..82829f6bb 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp @@ -56,6 +56,8 @@ void Scheduler::SwitchContext(Thread* new_thread) { if (previous_thread) { previous_thread->last_running_ticks = CoreTiming::GetTicks(); cpu_core->SaveContext(previous_thread->context); + // Save the TPIDR_EL0 system register in case it was modified. + previous_thread->tpidr_el0 = cpu_core->GetTPIDR_EL0(); if (previous_thread->status == THREADSTATUS_RUNNING) { // This is only the case when a reschedule is triggered without the current thread @@ -87,6 +89,7 @@ void Scheduler::SwitchContext(Thread* new_thread) { cpu_core->LoadContext(new_thread->context); cpu_core->SetTlsAddress(new_thread->GetTLSAddress()); + cpu_core->SetTPIDR_EL0(new_thread->GetTPIDR_EL0()); cpu_core->ClearExclusiveState(); } else { current_thread = nullptr; |