Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

General: Add better safety for JIT use.

Browse source
This commit is contained in:
Fernando Sahmkow 2020-02-27 19:12:41 -04:00
parent bd36eaf15d
commit 04e0f8776c
5 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/kernel/scheduler.cpp
View file

@ -581,6 +581,7 @@ void Scheduler::SwitchContextStep2() {
if (new_thread) {
new_thread->context_guard.lock();
cpu_core.Lock();
ASSERT_MSG(new_thread->GetProcessorID() == s32(this->core_id),
"Thread must be assigned to this core.");
ASSERT_MSG(new_thread->GetStatus() == ThreadStatus::Ready,
@ -601,6 +602,7 @@ void Scheduler::SwitchContextStep2() {
cpu_core.LoadContext(new_thread->GetContext64());
cpu_core.SetTlsAddress(new_thread->GetTLSAddress());
cpu_core.SetTPIDR_EL0(new_thread->GetTPIDR_EL0());
cpu_core.ClearExclusiveState();
}
} else {
current_thread = nullptr;
@ -639,6 +641,7 @@ void Scheduler::SwitchContext() {
}
previous_thread->SetIsRunning(false);
previous_thread->context_guard.unlock();
cpu_core.Unlock();
}
std::shared_ptr<Common::Fiber> old_context;

6
src/core/hle/kernel/svc.cpp
View file

@ -10,6 +10,7 @@
#include "common/alignment.h"
#include "common/assert.h"
#include "common/fiber.h"
#include "common/logging/log.h"
#include "common/microprofile.h"
#include "common/string_util.h"
@ -2468,7 +2469,10 @@ void Call(Core::System& system, u32 immediate) {
}
auto& physical_core_2 = system.CurrentPhysicalCore();
if (physical_core.CoreIndex() != physical_core_2.CoreIndex()) {
physical_core.Stop();
LOG_CRITICAL(Kernel_SVC, "Rewinding");
auto* thread = physical_core_2.Scheduler().GetCurrentThread();
auto* host_context = thread->GetHostContext().get();
host_context->Rewind();
}
}