early-access version 3786

src/core/core.cpp

@@ -14,7 +14,6 @@
 #include "common/settings.h"
 #include "common/settings_enums.h"
 #include "common/string_util.h"
-#include "core/arm/exclusive_monitor.h"
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/cpu_manager.h"
@@ -327,7 +326,6 @@ struct System::Impl {
                 static_cast<u32>(SystemResultStatus::ErrorLoader) + static_cast<u32>(load_result));
         }
         AddGlueRegistrationForProcess(*app_loader, *main_process);
-        kernel.InitializeCores();
 
         // Initialize cheat engine
         if (cheat_engine) {
@@ -644,10 +642,6 @@ bool System::IsPoweredOn() const {
     return impl->is_powered_on.load(std::memory_order::relaxed);
 }
 
-void System::PrepareReschedule(const u32 core_index) {
-    impl->kernel.PrepareReschedule(core_index);
-}
-
 Core::GPUDirtyMemoryManager& System::CurrentGPUDirtyMemoryManager() {
     const std::size_t core = impl->kernel.GetCurrentHostThreadID();
     return impl->gpu_dirty_memory_write_manager[core < Core::Hardware::NUM_CPU_CORES
@@ -685,14 +679,6 @@ const TelemetrySession& System::TelemetrySession() const {
     return *impl->telemetry_session;
 }
 
-ARM_Interface& System::CurrentArmInterface() {
-    return impl->kernel.CurrentPhysicalCore().ArmInterface();
-}
-
-const ARM_Interface& System::CurrentArmInterface() const {
-    return impl->kernel.CurrentPhysicalCore().ArmInterface();
-}
-
 Kernel::PhysicalCore& System::CurrentPhysicalCore() {
     return impl->kernel.CurrentPhysicalCore();
 }
@@ -701,6 +687,14 @@ const Kernel::PhysicalCore& System::CurrentPhysicalCore() const {
     return impl->kernel.CurrentPhysicalCore();
 }
 
+Core::ExclusiveMonitor& System::GetCurrentExclusiveMonitor() {
+    return impl->kernel.GetCurrentExclusiveMonitor();
+}
+
+Core::ARM_Interface& System::GetCurrentArmInterface() {
+    return impl->kernel.GetCurrentArmInterface();
+}
+
 /// Gets the global scheduler
 Kernel::GlobalSchedulerContext& System::GlobalSchedulerContext() {
     return impl->kernel.GlobalSchedulerContext();
@@ -727,22 +721,6 @@ const Kernel::KProcess* System::ApplicationProcess() const {
     return impl->kernel.ApplicationProcess();
 }
 
-ARM_Interface& System::ArmInterface(std::size_t core_index) {
-    return impl->kernel.PhysicalCore(core_index).ArmInterface();
-}
-
-const ARM_Interface& System::ArmInterface(std::size_t core_index) const {
-    return impl->kernel.PhysicalCore(core_index).ArmInterface();
-}
-
-ExclusiveMonitor& System::Monitor() {
-    return impl->kernel.GetExclusiveMonitor();
-}
-
-const ExclusiveMonitor& System::Monitor() const {
-    return impl->kernel.GetExclusiveMonitor();
-}
-
 Memory::Memory& System::ApplicationMemory() {
     return impl->memory;
 }