CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Scheduler: Correct Reload/Unload

master
Fernando Sahmkow 2020-03-10 13:24:52 +07:00
parent 5974e3ea33
commit 9bde28d7b1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/hle/kernel/kernel.cpp
Unescape Escape View File

@ -149,6 +149,7 @@ struct KernelCore::Impl {
for (std::size_t i = 0; i < cores.size(); i++) { for (std::size_t i = 0; i < cores.size(); i++) {
cores[i].Shutdown(); cores[i].Shutdown();
schedulers[i].reset();
} }
cores.clear(); cores.clear();

7
src/core/hle/kernel/scheduler.cpp
Unescape Escape View File

@ -625,8 +625,8 @@ void Scheduler::Unload() {
thread->SetContinuousOnSVC(false); thread->SetContinuousOnSVC(false);
thread->last_running_ticks = system.CoreTiming().GetCPUTicks(); thread->last_running_ticks = system.CoreTiming().GetCPUTicks();
thread->SetIsRunning(false); thread->SetIsRunning(false);
if (!thread->IsHLEThread()) { if (!thread->IsHLEThread() && !thread->HasExited()) {
auto& cpu_core = system.ArmInterface(core_id); Core::ARM_Interface& cpu_core = thread->ArmInterface();
cpu_core.SaveContext(thread->GetContext32()); cpu_core.SaveContext(thread->GetContext32());
cpu_core.SaveContext(thread->GetContext64()); cpu_core.SaveContext(thread->GetContext64());
// Save the TPIDR_EL0 system register in case it was modified. // Save the TPIDR_EL0 system register in case it was modified.
@ -653,11 +653,12 @@ void Scheduler::Reload() {
system.Kernel().MakeCurrentProcess(thread_owner_process); system.Kernel().MakeCurrentProcess(thread_owner_process);
} }
if (!thread->IsHLEThread()) { if (!thread->IsHLEThread()) {
auto& cpu_core = system.ArmInterface(core_id); Core::ARM_Interface& cpu_core = thread->ArmInterface();
cpu_core.LoadContext(thread->GetContext32()); cpu_core.LoadContext(thread->GetContext32());
cpu_core.LoadContext(thread->GetContext64()); cpu_core.LoadContext(thread->GetContext64());
cpu_core.SetTlsAddress(thread->GetTLSAddress()); cpu_core.SetTlsAddress(thread->GetTLSAddress());
cpu_core.SetTPIDR_EL0(thread->GetTPIDR_EL0()); cpu_core.SetTPIDR_EL0(thread->GetTPIDR_EL0());
cpu_core.ChangeProcessorId(this->core_id);
cpu_core.ClearExclusiveState(); cpu_core.ClearExclusiveState();
} }
} }