Revert "kernel/handle_table: Remove usages of the global system instance"

src/core/hle/kernel/handle_table.cpp

@@ -8,9 +8,7 @@
 #include "core/core.h"
 #include "core/hle/kernel/errors.h"
 #include "core/hle/kernel/handle_table.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/process.h"
-#include "core/hle/kernel/scheduler.h"
 #include "core/hle/kernel/thread.h"
 
 namespace Kernel {
@@ -24,7 +22,7 @@ constexpr u16 GetGeneration(Handle handle) {
 }
 } // Anonymous namespace
 
-HandleTable::HandleTable(KernelCore& kernel) : kernel{kernel} {
+HandleTable::HandleTable() {
     Clear();
 }
 
@@ -105,9 +103,9 @@ bool HandleTable::IsValid(Handle handle) const {
 
 std::shared_ptr<Object> HandleTable::GetGeneric(Handle handle) const {
     if (handle == CurrentThread) {
-        return SharedFrom(kernel.CurrentScheduler().GetCurrentThread());
+        return SharedFrom(GetCurrentThread());
     } else if (handle == CurrentProcess) {
-        return SharedFrom(kernel.CurrentProcess());
+        return SharedFrom(Core::System::GetInstance().CurrentProcess());
     }
 
     if (!IsValid(handle)) {

src/core/hle/kernel/handle_table.h

@@ -14,8 +14,6 @@
 
 namespace Kernel {
 
-class KernelCore;
-
 enum KernelHandle : Handle {
     InvalidHandle = 0,
     CurrentThread = 0xFFFF8000,
@@ -50,7 +48,7 @@ public:
     /// This is the maximum limit of handles allowed per process in Horizon
     static constexpr std::size_t MAX_COUNT = 1024;
 
-    explicit HandleTable(KernelCore& kernel);
+    HandleTable();
     ~HandleTable();
 
     /**
@@ -136,9 +134,6 @@ private:
 
     /// Head of the free slots linked list.
     u16 next_free_slot = 0;
-
-    /// Underlying kernel instance that this handle table operates under.
-    KernelCore& kernel;
 };
 
 } // namespace Kernel

src/core/hle/kernel/kernel.cpp

@@ -50,8 +50,7 @@ namespace Kernel {
 
 struct KernelCore::Impl {
     explicit Impl(Core::System& system, KernelCore& kernel)
-        : global_scheduler{kernel}, synchronization{system}, time_manager{system},
-          global_handle_table{kernel}, system{system} {}
+        : global_scheduler{kernel}, synchronization{system}, time_manager{system}, system{system} {}
 
     void SetMulticore(bool is_multicore) {
         this->is_multicore = is_multicore;
@@ -308,7 +307,7 @@ struct KernelCore::Impl {
 
     // This is the kernel's handle table or supervisor handle table which
     // stores all the objects in place.
-    HandleTable global_handle_table;
+    Kernel::HandleTable global_handle_table;
 
     /// Map of named ports managed by the kernel, which can be retrieved using
     /// the ConnectToPort SVC.

src/core/hle/kernel/process.cpp

@@ -408,7 +408,7 @@ void Process::LoadModule(CodeSet code_set, VAddr base_addr) {
 Process::Process(Core::System& system)
     : SynchronizationObject{system.Kernel()}, page_table{std::make_unique<Memory::PageTable>(
                                                   system)},
-      handle_table{system.Kernel()}, address_arbiter{system}, mutex{system}, system{system} {}
+      address_arbiter{system}, mutex{system}, system{system} {}
 
 Process::~Process() = default;
 

src/core/hle/kernel/process.h

@@ -382,6 +382,12 @@ private:
     /// List of threads waiting for a condition variable
     std::unordered_map<VAddr, std::list<std::shared_ptr<Thread>>> cond_var_threads;
 
+    /// System context
+    Core::System& system;
+
+    /// Name of this process
+    std::string name;
+
     /// Address of the top of the main thread's stack
     VAddr main_thread_stack_top{};
 
@@ -393,12 +399,6 @@ private:
 
     /// Process total image size
     std::size_t image_size{};
-
-    /// Name of this process
-    std::string name;
-
-    /// System context
-    Core::System& system;
 };
 
 } // namespace Kernel

src/core/hle/kernel/thread.cpp

@@ -13,8 +13,16 @@
 #include "common/logging/log.h"
 #include "common/thread_queue_list.h"
 #include "core/arm/arm_interface.h"
+#ifdef ARCHITECTURE_x86_64
+#include "core/arm/dynarmic/arm_dynarmic_32.h"
+#include "core/arm/dynarmic/arm_dynarmic_64.h"
+#endif
+#include "core/arm/cpu_interrupt_handler.h"
+#include "core/arm/exclusive_monitor.h"
 #include "core/arm/unicorn/arm_unicorn.h"
 #include "core/core.h"
+#include "core/core_timing.h"
+#include "core/core_timing_util.h"
 #include "core/cpu_manager.h"
 #include "core/hardware_properties.h"
 #include "core/hle/kernel/errors.h"
@@ -28,11 +36,6 @@
 #include "core/hle/result.h"
 #include "core/memory.h"
 
-#ifdef ARCHITECTURE_x86_64
-#include "core/arm/dynarmic/arm_dynarmic_32.h"
-#include "core/arm/dynarmic/arm_dynarmic_64.h"
-#endif
-
 namespace Kernel {
 
 bool Thread::ShouldWait(const Thread* thread) const {
@@ -537,4 +540,13 @@ ResultCode Thread::SetCoreAndAffinityMask(s32 new_core, u64 new_affinity_mask) {
     return RESULT_SUCCESS;
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Gets the current thread
+ */
+Thread* GetCurrentThread() {
+    return Core::System::GetInstance().CurrentScheduler().GetCurrentThread();
+}
+
 } // namespace Kernel

src/core/hle/kernel/thread.h

@@ -680,4 +680,9 @@ private:
     std::string name;
 };
 
+/**
+ * Gets the current thread
+ */
+Thread* GetCurrentThread();
+
 } // namespace Kernel