VERY experimental Nintendo Switch 2 emulator
C++
k_handle_table: Remove cast to void* in GetObjectForIpc
Lioncash71d5db9354c3
diff --git a/src/core/hle/kernel/k_handle_table.cpp b/src/core/hle/kernel/k_handle_table.cppindex 1c7a766c89..3535ddc0ca 100644--- a/src/core/hle/kernel/k_handle_table.cpp+++ b/src/core/hle/kernel/k_handle_table.cpp@@ -2,6 +2,7 @@// SPDX-License-Identifier: GPL-2.0-or-later#include "core/hle/kernel/k_handle_table.h"+#include "core/hle/kernel/k_process.h"namespace Kernel {@@ -82,6 +83,22 @@ Result KHandleTable::Add(Handle* out_handle, KAutoObject* obj) {R_SUCCEED();}+KScopedAutoObject<KAutoObject> KHandleTable::GetObjectForIpc(Handle handle,+ KThread* cur_thread) const {+ // Handle pseudo-handles.+ ASSERT(cur_thread != nullptr);+ if (handle == Svc::PseudoHandle::CurrentProcess) {+ auto* const cur_process = cur_thread->GetOwnerProcess();+ ASSERT(cur_process != nullptr);+ return cur_process;+ }+ if (handle == Svc::PseudoHandle::CurrentThread) {+ return cur_thread;+ }++ return GetObjectForIpcWithoutPseudoHandle(handle);+}+Result KHandleTable::Reserve(Handle* out_handle) {KScopedDisableDispatch dd{m_kernel};KScopedSpinLock lk(m_lock);diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.hindex 65cae3b275..37a24e7d94 100644--- a/src/core/hle/kernel/k_handle_table.h+++ b/src/core/hle/kernel/k_handle_table.h@@ -113,21 +113,7 @@ public:return this->GetObjectImpl(handle);}- KScopedAutoObject<KAutoObject> GetObjectForIpc(Handle handle, KThread* cur_thread) const {- // Handle pseudo-handles.- ASSERT(cur_thread != nullptr);- if (handle == Svc::PseudoHandle::CurrentProcess) {- auto* const cur_process =- static_cast<KAutoObject*>(static_cast<void*>(cur_thread->GetOwnerProcess()));- ASSERT(cur_process != nullptr);- return cur_process;- }- if (handle == Svc::PseudoHandle::CurrentThread) {- return static_cast<KAutoObject*>(cur_thread);- }-- return GetObjectForIpcWithoutPseudoHandle(handle);- }+ KScopedAutoObject<KAutoObject> GetObjectForIpc(Handle handle, KThread* cur_thread) const;KScopedAutoObject<KAutoObject> GetObjectByIndex(Handle* out_handle, size_t index) const {KScopedDisableDispatch dd{m_kernel};