From 450341b397766caa32138882acb52790f4120963 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Sun, 26 Jan 2020 10:28:23 -0400
Subject: ArmInterface: Delegate Exclusive monitor factory to exclusive monitor
interfasce.
---
src/core/hle/kernel/kernel.cpp | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
(limited to 'src/core/hle/kernel/kernel.cpp')
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index b7fd480d10..1986cf65c5 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <atomic>
+#include <functional>
#include <memory>
#include <mutex>
#include <utility>
@@ -10,9 +11,6 @@
#include "common/assert.h"
#include "common/logging/log.h"
#include "core/arm/arm_interface.h"
-#ifdef ARCHITECTURE_x86_64
-#include "core/arm/dynarmic/arm_dynarmic.h"
-#endif
#include "core/arm/exclusive_monitor.h"
#include "core/core.h"
#include "core/core_timing.h"
@@ -137,7 +135,7 @@ struct KernelCore::Impl {
}
void InitializePhysicalCores(KernelCore& kernel) {
- exclusive_monitor = MakeExclusiveMonitor();
+ exclusive_monitor = Core::MakeExclusiveMonitor(system.Memory(), global_scheduler.CpuCoresCount());
for (std::size_t i = 0; i < global_scheduler.CpuCoresCount(); i++) {
cores.emplace_back(system, kernel, i, *exclusive_monitor);
}
@@ -156,7 +154,6 @@ struct KernelCore::Impl {
ASSERT(system_resource_limit->SetLimitValue(ResourceType::Sessions, 900).IsSuccess());
}
-
void InitializeThreads() {
thread_wakeup_event_type =
Core::Timing::CreateEvent("ThreadWakeupCallback", ThreadWakeupCallback);
@@ -184,16 +181,6 @@ struct KernelCore::Impl {
system.Memory().SetCurrentPageTable(*process);
}
- std::unique_ptr<Core::ExclusiveMonitor> MakeExclusiveMonitor() {
- #ifdef ARCHITECTURE_x86_64
- return std::make_unique<Core::DynarmicExclusiveMonitor>(system.Memory(),
- global_scheduler.CpuCoresCount());
- #else
- // TODO(merry): Passthrough exclusive monitor
- return nullptr;
- #endif
- }
-
std::atomic<u32> next_object_id{0};
std::atomic<u64> next_kernel_process_id{Process::InitialKIPIDMin};
std::atomic<u64> next_user_process_id{Process::ProcessIDMin};
--
cgit v1.2.3-70-g09d2