VERY experimental Nintendo Switch 2 emulator
C++
kernel: remove unecessary process member from handle table
Liamac1e9463908b
diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.hindex 4e6dcd66bb..1bf68e6b04 100644--- a/src/core/hle/kernel/k_handle_table.h+++ b/src/core/hle/kernel/k_handle_table.h@@ -30,7 +30,7 @@ public:public:explicit KHandleTable(KernelCore& kernel) : m_kernel(kernel) {}- Result Initialize(KProcess* owner, s32 size) {+ Result Initialize(s32 size) {// Check that the table size is valid.R_UNLESS(size <= static_cast<s32>(MaxTableSize), ResultOutOfMemory);@@ -44,7 +44,6 @@ public:m_next_linear_id = MinLinearId;m_count = 0;m_free_head_index = -1;- m_owner = owner;// Free all entries.for (s32 i = 0; i < static_cast<s32>(m_table_size); ++i) {@@ -91,8 +90,7 @@ public:// Handle pseudo-handles.if constexpr (std::derived_from<KProcess, T>) {if (handle == Svc::PseudoHandle::CurrentProcess) {- // TODO: this should be the current process- auto* const cur_process = m_owner;+ auto* const cur_process = GetCurrentProcessPointer(m_kernel);ASSERT(cur_process != nullptr);return cur_process;}@@ -302,7 +300,6 @@ private:private:KernelCore& m_kernel;- KProcess* m_owner{};std::array<EntryInfo, MaxTableSize> m_entry_infos{};std::array<KAutoObject*, MaxTableSize> m_objects{};mutable KSpinLock m_lock;diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.hindex b5c6867a18..53c0e33162 100644--- a/src/core/hle/kernel/k_process.h+++ b/src/core/hle/kernel/k_process.h@@ -552,7 +552,7 @@ private:Result InitializeHandleTable(s32 size) {// Try to initialize the handle table.- R_TRY(m_handle_table.Initialize(this, size));+ R_TRY(m_handle_table.Initialize(size));// We succeeded, so note that we did.m_is_handle_table_initialized = true;