From 1567824d2da8e9b49b433f3d1d753d8ad84e65f9 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Sun, 1 Mar 2020 12:14:17 -0400
Subject: General: Move ARM_Interface into Threads.
---
src/core/cpu_manager.cpp | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
(limited to 'src/core/cpu_manager.cpp')
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp
index 2aea95a257..2e9dc9dc3d 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -129,18 +129,17 @@ void CpuManager::MultiCoreRunGuestThread() {
void CpuManager::MultiCoreRunGuestLoop() {
auto& kernel = system.Kernel();
auto* thread = kernel.CurrentScheduler().GetCurrentThread();
- auto host_context = thread->GetHostContext();
- host_context->SetRewindPoint(std::function<void(void*)>(GuestRewindFunction), this);
- host_context.reset();
while (true) {
- auto& physical_core = kernel.CurrentPhysicalCore();
+ auto* physical_core = &kernel.CurrentPhysicalCore();
+ auto& arm_interface = thread->ArmInterface();
system.EnterDynarmicProfile();
- while (!physical_core.IsInterrupted()) {
- physical_core.Run();
+ while (!physical_core->IsInterrupted()) {
+ arm_interface.Run();
+ physical_core = &kernel.CurrentPhysicalCore();
}
system.ExitDynarmicProfile();
- physical_core.ClearExclusive();
- auto& scheduler = physical_core.Scheduler();
+ arm_interface.ClearExclusiveState();
+ auto& scheduler = kernel.CurrentScheduler();
scheduler.TryDoContextSwitch();
}
}
@@ -150,7 +149,7 @@ void CpuManager::MultiCoreRunIdleThread() {
while (true) {
auto& physical_core = kernel.CurrentPhysicalCore();
physical_core.Idle();
- auto& scheduler = physical_core.Scheduler();
+ auto& scheduler = kernel.CurrentScheduler();
scheduler.TryDoContextSwitch();
}
}
@@ -229,14 +228,13 @@ void CpuManager::SingleCoreRunGuestThread() {
void CpuManager::SingleCoreRunGuestLoop() {
auto& kernel = system.Kernel();
auto* thread = kernel.CurrentScheduler().GetCurrentThread();
- auto host_context = thread->GetHostContext();
- host_context->SetRewindPoint(std::function<void(void*)>(GuestRewindFunction), this);
- host_context.reset();
while (true) {
- auto& physical_core = kernel.CurrentPhysicalCore();
+ auto* physical_core = &kernel.CurrentPhysicalCore();
+ auto& arm_interface = thread->ArmInterface();
system.EnterDynarmicProfile();
- while (!physical_core.IsInterrupted()) {
- physical_core.Run();
+ while (!physical_core->IsInterrupted()) {
+ arm_interface.Run();
+ physical_core = &kernel.CurrentPhysicalCore();
preemption_count++;
if (preemption_count % max_cycle_runs == 0) {
break;
@@ -246,7 +244,7 @@ void CpuManager::SingleCoreRunGuestLoop() {
thread->SetPhantomMode(true);
system.CoreTiming().Advance();
thread->SetPhantomMode(false);
- physical_core.ClearExclusive();
+ arm_interface.ClearExclusiveState();
PreemptSingleCore();
auto& scheduler = kernel.Scheduler(current_core);
scheduler.TryDoContextSwitch();
--
cgit v1.2.3-70-g09d2