VERY experimental Nintendo Switch 2 emulator
C++
kernel: use GetCurrentProcess
Liam832e1e2ca43a
diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cppindex 2ec623a588..9a540987bd 100644--- a/src/core/hle/kernel/k_client_port.cpp+++ b/src/core/hle/kernel/k_client_port.cpp@@ -60,6 +60,7 @@ bool KClientPort::IsSignaled() const {Result KClientPort::CreateSession(KClientSession** out) {// Reserve a new session from the resource limit.+ //! FIXME: we are reserving this from the wrong resource limit!KScopedResourceReservation session_reservation(kernel.CurrentProcess()->GetResourceLimit(),LimitableResource::SessionCountMax);R_UNLESS(session_reservation.Succeeded(), ResultLimitReached);diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cppindex 884eba001a..6c44a9e998 100644--- a/src/core/hle/kernel/k_code_memory.cpp+++ b/src/core/hle/kernel/k_code_memory.cpp@@ -21,7 +21,7 @@ KCodeMemory::KCodeMemory(KernelCore& kernel_)Result KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr, size_t size) {// Set members.- m_owner = kernel.CurrentProcess();+ m_owner = GetCurrentProcessPointer(kernel);// Get the owner page table.auto& page_table = m_owner->PageTable();@@ -74,7 +74,7 @@ Result KCodeMemory::Map(VAddr address, size_t size) {R_UNLESS(!m_is_mapped, ResultInvalidState);// Map the memory.- R_TRY(kernel.CurrentProcess()->PageTable().MapPageGroup(+ R_TRY(GetCurrentProcess(kernel).PageTable().MapPageGroup(address, *m_page_group, KMemoryState::CodeOut, KMemoryPermission::UserReadWrite));// Mark ourselves as mapped.@@ -91,8 +91,8 @@ Result KCodeMemory::Unmap(VAddr address, size_t size) {KScopedLightLock lk(m_lock);// Unmap the memory.- R_TRY(kernel.CurrentProcess()->PageTable().UnmapPageGroup(address, *m_page_group,- KMemoryState::CodeOut));+ R_TRY(GetCurrentProcess(kernel).PageTable().UnmapPageGroup(address, *m_page_group,+ KMemoryState::CodeOut));// Mark ourselves as unmapped.m_is_mapped = false;diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cppindex 0c6b20db3b..3f0be1c3fa 100644--- a/src/core/hle/kernel/k_condition_variable.cpp+++ b/src/core/hle/kernel/k_condition_variable.cpp@@ -164,8 +164,8 @@ Result KConditionVariable::WaitForAddress(Handle handle, VAddr addr, u32 value)R_SUCCEED_IF(test_tag != (handle | Svc::HandleWaitMask));// Get the lock owner thread.- owner_thread = kernel.CurrentProcess()- ->GetHandleTable()+ owner_thread = GetCurrentProcess(kernel)+ .GetHandleTable().GetObjectWithoutPseudoHandle<KThread>(handle).ReleasePointerUnsafe();R_UNLESS(owner_thread != nullptr, ResultInvalidHandle);@@ -213,8 +213,8 @@ void KConditionVariable::SignalImpl(KThread* thread) {thread->EndWait(ResultSuccess);} else {// Get the previous owner.- KThread* owner_thread = kernel.CurrentProcess()- ->GetHandleTable()+ KThread* owner_thread = GetCurrentProcess(kernel)+ .GetHandleTable().GetObjectWithoutPseudoHandle<KThread>(static_cast<Handle>(prev_tag & ~Svc::HandleWaitMask)).ReleasePointerUnsafe();diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.hindex 37a24e7d94..1bf68e6b04 100644--- a/src/core/hle/kernel/k_handle_table.h+++ b/src/core/hle/kernel/k_handle_table.h@@ -90,7 +90,7 @@ public:// Handle pseudo-handles.if constexpr (std::derived_from<KProcess, T>) {if (handle == Svc::PseudoHandle::CurrentProcess) {- auto* const cur_process = m_kernel.CurrentProcess();+ auto* const cur_process = GetCurrentProcessPointer(m_kernel);ASSERT(cur_process != nullptr);return cur_process;}diff --git a/src/core/hle/kernel/k_interrupt_manager.cpp b/src/core/hle/kernel/k_interrupt_manager.cppindex 4a6b60d268..fe6a20168c 100644--- a/src/core/hle/kernel/k_interrupt_manager.cpp+++ b/src/core/hle/kernel/k_interrupt_manager.cpp@@ -16,7 +16,7 @@ void HandleInterrupt(KernelCore& kernel, s32 core_id) {auto& current_thread = GetCurrentThread(kernel);- if (auto* process = kernel.CurrentProcess(); process) {+ if (auto* process = GetCurrentProcessPointer(kernel); process) {// If the user disable count is set, we may need to pin the current thread.if (current_thread.GetUserDisableCount() && !process->GetPinnedThread(core_id)) {KScopedSchedulerLock sl{kernel};diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cppindex d6676904ba..d6c214237e 100644--- a/src/core/hle/kernel/k_scheduler.cpp+++ b/src/core/hle/kernel/k_scheduler.cpp@@ -328,7 +328,7 @@ u64 KScheduler::UpdateHighestPriorityThreadsImpl(KernelCore& kernel) {}void KScheduler::SwitchThread(KThread* next_thread) {- KProcess* const cur_process = kernel.CurrentProcess();+ KProcess* const cur_process = GetCurrentProcessPointer(kernel);KThread* const cur_thread = GetCurrentThreadPointer(kernel);// We never want to schedule a null thread, so use the idle thread if we don't have a next.@@ -689,11 +689,11 @@ void KScheduler::RotateScheduledQueue(KernelCore& kernel, s32 core_id, s32 priorvoid KScheduler::YieldWithoutCoreMigration(KernelCore& kernel) {// Validate preconditions.ASSERT(CanSchedule(kernel));- ASSERT(kernel.CurrentProcess() != nullptr);+ ASSERT(GetCurrentProcessPointer(kernel) != nullptr);// Get the current thread and process.KThread& cur_thread = GetCurrentThread(kernel);- KProcess& cur_process = *kernel.CurrentProcess();+ KProcess& cur_process = GetCurrentProcess(kernel);// If the thread's yield count matches, there's nothing for us to do.if (cur_thread.GetYieldScheduleCount() == cur_process.GetScheduledCount()) {@@ -728,11 +728,11 @@ void KScheduler::YieldWithoutCoreMigration(KernelCore& kernel) {void KScheduler::YieldWithCoreMigration(KernelCore& kernel) {// Validate preconditions.ASSERT(CanSchedule(kernel));- ASSERT(kernel.CurrentProcess() != nullptr);+ ASSERT(GetCurrentProcessPointer(kernel) != nullptr);// Get the current thread and process.KThread& cur_thread = GetCurrentThread(kernel);- KProcess& cur_process = *kernel.CurrentProcess();+ KProcess& cur_process = GetCurrentProcess(kernel);// If the thread's yield count matches, there's nothing for us to do.if (cur_thread.GetYieldScheduleCount() == cur_process.GetScheduledCount()) {@@ -816,11 +816,11 @@ void KScheduler::YieldWithCoreMigration(KernelCore& kernel) {void KScheduler::YieldToAnyThread(KernelCore& kernel) {// Validate preconditions.ASSERT(CanSchedule(kernel));- ASSERT(kernel.CurrentProcess() != nullptr);+ ASSERT(GetCurrentProcessPointer(kernel) != nullptr);// Get the current thread and process.KThread& cur_thread = GetCurrentThread(kernel);- KProcess& cur_process = *kernel.CurrentProcess();+ KProcess& cur_process = GetCurrentProcess(kernel);// If the thread's yield count matches, there's nothing for us to do.if (cur_thread.GetYieldScheduleCount() == cur_process.GetScheduledCount()) {diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cppindex b6f6fe9d98..819f39f126 100644--- a/src/core/hle/kernel/k_session.cpp+++ b/src/core/hle/kernel/k_session.cpp@@ -33,6 +33,7 @@ void KSession::Initialize(KClientPort* port_, const std::string& name_) {name = name_;// Set our owner process.+ //! FIXME: this is the wrong process!process = kernel.CurrentProcess();process->Open();diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cppindex 84ff3c64b2..2d3da9d669 100644--- a/src/core/hle/kernel/k_thread.cpp+++ b/src/core/hle/kernel/k_thread.cpp@@ -1266,6 +1266,14 @@ KThread& GetCurrentThread(KernelCore& kernel) {return *GetCurrentThreadPointer(kernel);}+KProcess* GetCurrentProcessPointer(KernelCore& kernel) {+ return GetCurrentThread(kernel).GetOwnerProcess();+}++KProcess& GetCurrentProcess(KernelCore& kernel) {+ return *GetCurrentProcessPointer(kernel);+}+s32 GetCurrentCoreId(KernelCore& kernel) {return GetCurrentThread(kernel).GetCurrentCore();}diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.hindex 8b8dc51be2..ca82ce3b62 100644--- a/src/core/hle/kernel/k_thread.h+++ b/src/core/hle/kernel/k_thread.h@@ -110,6 +110,8 @@ enum class StepState : u32 {void SetCurrentThread(KernelCore& kernel, KThread* thread);[[nodiscard]] KThread* GetCurrentThreadPointer(KernelCore& kernel);[[nodiscard]] KThread& GetCurrentThread(KernelCore& kernel);+[[nodiscard]] KProcess* GetCurrentProcessPointer(KernelCore& kernel);+[[nodiscard]] KProcess& GetCurrentProcess(KernelCore& kernel);[[nodiscard]] s32 GetCurrentCoreId(KernelCore& kernel);class KThread final : public KAutoObjectWithSlabHeapAndContainer<KThread, KWorkerTask>,diff --git a/src/core/hle/kernel/k_transfer_memory.cpp b/src/core/hle/kernel/k_transfer_memory.cppindex 9f34c2d466..faa5c73b5c 100644--- a/src/core/hle/kernel/k_transfer_memory.cpp+++ b/src/core/hle/kernel/k_transfer_memory.cpp@@ -16,7 +16,7 @@ KTransferMemory::~KTransferMemory() = default;Result KTransferMemory::Initialize(VAddr address_, std::size_t size_,Svc::MemoryPermission owner_perm_) {// Set members.- owner = kernel.CurrentProcess();+ owner = GetCurrentProcessPointer(kernel);// TODO(bunnei): Lock for transfer memorydiff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cppindex 4ef57356ed..1072da8cce 100644--- a/src/core/hle/kernel/svc.cpp+++ b/src/core/hle/kernel/svc.cpp@@ -4426,7 +4426,7 @@ void Call(Core::System& system, u32 imm) {auto& kernel = system.Kernel();kernel.EnterSVCProfile();- if (system.CurrentProcess()->Is64BitProcess()) {+ if (GetCurrentProcess(system.Kernel()).Is64BitProcess()) {Call64(system, imm);} else {Call32(system, imm);diff --git a/src/core/hle/kernel/svc/svc_activity.cpp b/src/core/hle/kernel/svc/svc_activity.cppindex 1dcdb7a15f..2e7b680d06 100644--- a/src/core/hle/kernel/svc/svc_activity.cpp+++ b/src/core/hle/kernel/svc/svc_activity.cpp@@ -23,11 +23,12 @@ Result SetThreadActivity(Core::System& system, Handle thread_handle,// Get the thread from its handle.KScopedAutoObject thread =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KThread>(thread_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KThread>(thread_handle);R_UNLESS(thread.IsNotNull(), ResultInvalidHandle);// Check that the activity is being set on a non-current thread for the current process.- R_UNLESS(thread->GetOwnerProcess() == system.Kernel().CurrentProcess(), ResultInvalidHandle);+ R_UNLESS(thread->GetOwnerProcess() == GetCurrentProcessPointer(system.Kernel()),+ ResultInvalidHandle);R_UNLESS(thread.GetPointerUnsafe() != GetCurrentThreadPointer(system.Kernel()), ResultBusy);// Set the activity.diff --git a/src/core/hle/kernel/svc/svc_address_arbiter.cpp b/src/core/hle/kernel/svc/svc_address_arbiter.cppindex e6a5d2ae50..998bd3f224 100644--- a/src/core/hle/kernel/svc/svc_address_arbiter.cpp+++ b/src/core/hle/kernel/svc/svc_address_arbiter.cpp@@ -72,7 +72,7 @@ Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_ttimeout = timeout_ns;}- return system.Kernel().CurrentProcess()->WaitAddressArbiter(address, arb_type, value, timeout);+ return GetCurrentProcess(system.Kernel()).WaitAddressArbiter(address, arb_type, value, timeout);}// Signals to an address (via Address Arbiter)@@ -95,8 +95,8 @@ Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_tyreturn ResultInvalidEnumValue;}- return system.Kernel().CurrentProcess()->SignalAddressArbiter(address, signal_type, value,- count);+ return GetCurrentProcess(system.Kernel())+ .SignalAddressArbiter(address, signal_type, value, count);}Result WaitForAddress64(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value,diff --git a/src/core/hle/kernel/svc/svc_cache.cpp b/src/core/hle/kernel/svc/svc_cache.cppindex b5404760e4..598b71da53 100644--- a/src/core/hle/kernel/svc/svc_cache.cpp+++ b/src/core/hle/kernel/svc/svc_cache.cpp@@ -38,7 +38,7 @@ Result FlushProcessDataCache(Core::System& system, Handle process_handle, u64 ad// Get the process from its handle.KScopedAutoObject process =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KProcess>(process_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KProcess>(process_handle);R_UNLESS(process.IsNotNull(), ResultInvalidHandle);// Verify the region is within range.diff --git a/src/core/hle/kernel/svc/svc_code_memory.cpp b/src/core/hle/kernel/svc/svc_code_memory.cppindex ec256b757c..538ff1c71d 100644--- a/src/core/hle/kernel/svc/svc_code_memory.cpp+++ b/src/core/hle/kernel/svc/svc_code_memory.cpp@@ -46,7 +46,7 @@ Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_tR_UNLESS(code_mem != nullptr, ResultOutOfResource);// Verify that the region is in range.- R_UNLESS(system.CurrentProcess()->PageTable().Contains(address, size),+ R_UNLESS(GetCurrentProcess(system.Kernel()).PageTable().Contains(address, size),ResultInvalidCurrentMemory);// Initialize the code memory.@@ -56,7 +56,7 @@ Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_tKCodeMemory::Register(kernel, code_mem);// Add the code memory to the handle table.- R_TRY(system.CurrentProcess()->GetHandleTable().Add(out, code_mem));+ R_TRY(GetCurrentProcess(system.Kernel()).GetHandleTable().Add(out, code_mem));code_mem->Close();@@ -79,8 +79,9 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle,R_UNLESS((address < address + size), ResultInvalidCurrentMemory);// Get the code memory from its handle.- KScopedAutoObject code_mem =- system.CurrentProcess()->GetHandleTable().GetObject<KCodeMemory>(code_memory_handle);+ KScopedAutoObject code_mem = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KCodeMemory>(code_memory_handle);R_UNLESS(code_mem.IsNotNull(), ResultInvalidHandle);// NOTE: Here, Atmosphere extends the SVC to allow code memory operations on one's own process.@@ -90,9 +91,10 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle,switch (operation) {case CodeMemoryOperation::Map: {// Check that the region is in range.- R_UNLESS(- system.CurrentProcess()->PageTable().CanContain(address, size, KMemoryState::CodeOut),- ResultInvalidMemoryRegion);+ R_UNLESS(GetCurrentProcess(system.Kernel())+ .PageTable()+ .CanContain(address, size, KMemoryState::CodeOut),+ ResultInvalidMemoryRegion);// Check the memory permission.R_UNLESS(IsValidMapCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission);@@ -102,9 +104,10 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle,} break;case CodeMemoryOperation::Unmap: {// Check that the region is in range.- R_UNLESS(- system.CurrentProcess()->PageTable().CanContain(address, size, KMemoryState::CodeOut),- ResultInvalidMemoryRegion);+ R_UNLESS(GetCurrentProcess(system.Kernel())+ .PageTable()+ .CanContain(address, size, KMemoryState::CodeOut),+ ResultInvalidMemoryRegion);// Check the memory permission.R_UNLESS(IsValidUnmapCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission);diff --git a/src/core/hle/kernel/svc/svc_condition_variable.cpp b/src/core/hle/kernel/svc/svc_condition_variable.cppindex b59a33e68e..8ad1a0b8f3 100644--- a/src/core/hle/kernel/svc/svc_condition_variable.cpp+++ b/src/core/hle/kernel/svc/svc_condition_variable.cpp@@ -43,8 +43,8 @@ Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_ke}// Wait on the condition variable.- return system.Kernel().CurrentProcess()->WaitConditionVariable(- address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout);+ return GetCurrentProcess(system.Kernel())+ .WaitConditionVariable(address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout);}/// Signal process wide key@@ -52,8 +52,8 @@ void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count) {LOG_TRACE(Kernel_SVC, "called, cv_key=0x{:X}, count=0x{:08X}", cv_key, count);// Signal the condition variable.- return system.Kernel().CurrentProcess()->SignalConditionVariable(- Common::AlignDown(cv_key, sizeof(u32)), count);+ return GetCurrentProcess(system.Kernel())+ .SignalConditionVariable(Common::AlignDown(cv_key, sizeof(u32)), count);}Result WaitProcessWideKeyAtomic64(Core::System& system, uint64_t address, uint64_t cv_key,diff --git a/src/core/hle/kernel/svc/svc_device_address_space.cpp b/src/core/hle/kernel/svc/svc_device_address_space.cppindex cdc453c35f..f68c0e6a95 100644--- a/src/core/hle/kernel/svc/svc_device_address_space.cpp+++ b/src/core/hle/kernel/svc/svc_device_address_space.cpp@@ -37,15 +37,16 @@ Result CreateDeviceAddressSpace(Core::System& system, Handle* out, uint64_t das_KDeviceAddressSpace::Register(system.Kernel(), das);// Add to the handle table.- R_TRY(system.CurrentProcess()->GetHandleTable().Add(out, das));+ R_TRY(GetCurrentProcess(system.Kernel()).GetHandleTable().Add(out, das));R_SUCCEED();}Result AttachDeviceAddressSpace(Core::System& system, DeviceName device_name, Handle das_handle) {// Get the device address space.- KScopedAutoObject das =- system.CurrentProcess()->GetHandleTable().GetObject<KDeviceAddressSpace>(das_handle);+ KScopedAutoObject das = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KDeviceAddressSpace>(das_handle);R_UNLESS(das.IsNotNull(), ResultInvalidHandle);// Attach.@@ -54,8 +55,9 @@ Result AttachDeviceAddressSpace(Core::System& system, DeviceName device_name, HaResult DetachDeviceAddressSpace(Core::System& system, DeviceName device_name, Handle das_handle) {// Get the device address space.- KScopedAutoObject das =- system.CurrentProcess()->GetHandleTable().GetObject<KDeviceAddressSpace>(das_handle);+ KScopedAutoObject das = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KDeviceAddressSpace>(das_handle);R_UNLESS(das.IsNotNull(), ResultInvalidHandle);// Detach.@@ -94,13 +96,14 @@ Result MapDeviceAddressSpaceByForce(Core::System& system, Handle das_handle, HanR_UNLESS(reserved == 0, ResultInvalidEnumValue);// Get the device address space.- KScopedAutoObject das =- system.CurrentProcess()->GetHandleTable().GetObject<KDeviceAddressSpace>(das_handle);+ KScopedAutoObject das = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KDeviceAddressSpace>(das_handle);R_UNLESS(das.IsNotNull(), ResultInvalidHandle);// Get the process.KScopedAutoObject process =- system.CurrentProcess()->GetHandleTable().GetObject<KProcess>(process_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KProcess>(process_handle);R_UNLESS(process.IsNotNull(), ResultInvalidHandle);// Validate that the process address is within range.@@ -134,13 +137,14 @@ Result MapDeviceAddressSpaceAligned(Core::System& system, Handle das_handle, HanR_UNLESS(reserved == 0, ResultInvalidEnumValue);// Get the device address space.- KScopedAutoObject das =- system.CurrentProcess()->GetHandleTable().GetObject<KDeviceAddressSpace>(das_handle);+ KScopedAutoObject das = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KDeviceAddressSpace>(das_handle);R_UNLESS(das.IsNotNull(), ResultInvalidHandle);// Get the process.KScopedAutoObject process =- system.CurrentProcess()->GetHandleTable().GetObject<KProcess>(process_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KProcess>(process_handle);R_UNLESS(process.IsNotNull(), ResultInvalidHandle);// Validate that the process address is within range.@@ -165,13 +169,14 @@ Result UnmapDeviceAddressSpace(Core::System& system, Handle das_handle, Handle pResultInvalidCurrentMemory);// Get the device address space.- KScopedAutoObject das =- system.CurrentProcess()->GetHandleTable().GetObject<KDeviceAddressSpace>(das_handle);+ KScopedAutoObject das = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KDeviceAddressSpace>(das_handle);R_UNLESS(das.IsNotNull(), ResultInvalidHandle);// Get the process.KScopedAutoObject process =- system.CurrentProcess()->GetHandleTable().GetObject<KProcess>(process_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KProcess>(process_handle);R_UNLESS(process.IsNotNull(), ResultInvalidHandle);// Validate that the process address is within range.diff --git a/src/core/hle/kernel/svc/svc_event.cpp b/src/core/hle/kernel/svc/svc_event.cppindex e8fb9efbce..a948493e87 100644--- a/src/core/hle/kernel/svc/svc_event.cpp+++ b/src/core/hle/kernel/svc/svc_event.cpp@@ -15,7 +15,7 @@ Result SignalEvent(Core::System& system, Handle event_handle) {LOG_DEBUG(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle);// Get the current handle table.- const KHandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();+ const KHandleTable& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();// Get the event.KScopedAutoObject event = handle_table.GetObject<KEvent>(event_handle);@@ -28,7 +28,7 @@ Result ClearEvent(Core::System& system, Handle event_handle) {LOG_TRACE(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle);// Get the current handle table.- const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();+ const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();// Try to clear the writable event.{@@ -56,10 +56,10 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) {// Get the kernel reference and handle table.auto& kernel = system.Kernel();- auto& handle_table = kernel.CurrentProcess()->GetHandleTable();+ auto& handle_table = GetCurrentProcess(kernel).GetHandleTable();// Reserve a new event from the process resource limit- KScopedResourceReservation event_reservation(kernel.CurrentProcess(),+ KScopedResourceReservation event_reservation(GetCurrentProcessPointer(kernel),LimitableResource::EventCountMax);R_UNLESS(event_reservation.Succeeded(), ResultLimitReached);@@ -68,7 +68,7 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) {R_UNLESS(event != nullptr, ResultOutOfResource);// Initialize the event.- event->Initialize(kernel.CurrentProcess());+ event->Initialize(GetCurrentProcessPointer(kernel));// Commit the thread reservation.event_reservation.Commit();diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cppindex ad56e2fe65..58dc475082 100644--- a/src/core/hle/kernel/svc/svc_info.cpp+++ b/src/core/hle/kernel/svc/svc_info.cpp@@ -44,7 +44,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handlereturn ResultInvalidEnumValue;}- const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();+ const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();KScopedAutoObject process = handle_table.GetObject<KProcess>(handle);if (process.IsNull()) {LOG_ERROR(Kernel_SVC, "Process is not valid! info_id={}, info_sub_id={}, handle={:08X}",@@ -154,7 +154,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handlereturn ResultInvalidCombination;}- KProcess* const current_process = system.Kernel().CurrentProcess();+ KProcess* const current_process = GetCurrentProcessPointer(system.Kernel());KHandleTable& handle_table = current_process->GetHandleTable();const auto resource_limit = current_process->GetResourceLimit();if (!resource_limit) {@@ -183,7 +183,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handlereturn ResultInvalidCombination;}- *result = system.Kernel().CurrentProcess()->GetRandomEntropy(info_sub_id);+ *result = GetCurrentProcess(system.Kernel()).GetRandomEntropy(info_sub_id);return ResultSuccess;case InfoType::InitialProcessIdRange:@@ -200,9 +200,9 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handlereturn ResultInvalidCombination;}- KScopedAutoObject thread =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KThread>(- static_cast<Handle>(handle));+ KScopedAutoObject thread = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KThread>(static_cast<Handle>(handle));if (thread.IsNull()) {LOG_ERROR(Kernel_SVC, "Thread handle does not exist, handle=0x{:08X}",static_cast<Handle>(handle));@@ -249,7 +249,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, HandleR_UNLESS(info_sub_id == 0, ResultInvalidCombination);// Get the handle table.- KProcess* current_process = system.Kernel().CurrentProcess();+ KProcess* current_process = GetCurrentProcessPointer(system.Kernel());KHandleTable& handle_table = current_process->GetHandleTable();// Get a new handle for the current process.diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cppindex 97ce49dde6..a7a2c3b928 100644--- a/src/core/hle/kernel/svc/svc_ipc.cpp+++ b/src/core/hle/kernel/svc/svc_ipc.cpp@@ -12,11 +12,9 @@ namespace Kernel::Svc {/// Makes a blocking IPC call to a service.Result SendSyncRequest(Core::System& system, Handle handle) {- auto& kernel = system.Kernel();-// Get the client session from its handle.KScopedAutoObject session =- kernel.CurrentProcess()->GetHandleTable().GetObject<KClientSession>(handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KClientSession>(handle);R_UNLESS(session.IsNotNull(), ResultInvalidHandle);LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}({})", handle, session->GetName());@@ -40,7 +38,7 @@ Result SendAsyncRequestWithUserBuffer(Core::System& system, Handle* out_event_haResult ReplyAndReceive(Core::System& system, s32* out_index, uint64_t handles_addr, s32 num_handles,Handle reply_target, s64 timeout_ns) {auto& kernel = system.Kernel();- auto& handle_table = GetCurrentThread(kernel).GetOwnerProcess()->GetHandleTable();+ auto& handle_table = GetCurrentProcess(kernel).GetHandleTable();R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange);R_UNLESS(system.Memory().IsValidVirtualAddressRange(diff --git a/src/core/hle/kernel/svc/svc_lock.cpp b/src/core/hle/kernel/svc/svc_lock.cppindex 7005ac30b7..f3d3e140b6 100644--- a/src/core/hle/kernel/svc/svc_lock.cpp+++ b/src/core/hle/kernel/svc/svc_lock.cpp@@ -24,7 +24,7 @@ Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address,return ResultInvalidAddress;}- return system.Kernel().CurrentProcess()->WaitForAddress(thread_handle, address, tag);+ return GetCurrentProcess(system.Kernel()).WaitForAddress(thread_handle, address, tag);}/// Unlock a mutex@@ -43,7 +43,7 @@ Result ArbitrateUnlock(Core::System& system, VAddr address) {return ResultInvalidAddress;}- return system.Kernel().CurrentProcess()->SignalToAddress(address);+ return GetCurrentProcess(system.Kernel()).SignalToAddress(address);}Result ArbitrateLock64(Core::System& system, Handle thread_handle, uint64_t address, uint32_t tag) {diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cppindex 21f818da67..214bcd0731 100644--- a/src/core/hle/kernel/svc/svc_memory.cpp+++ b/src/core/hle/kernel/svc/svc_memory.cpp@@ -113,7 +113,7 @@ Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, MemoryR_UNLESS(IsValidSetMemoryPermission(perm), ResultInvalidNewMemoryPermission);// Validate that the region is in range for the current process.- auto& page_table = system.Kernel().CurrentProcess()->PageTable();+ auto& page_table = GetCurrentProcess(system.Kernel()).PageTable();R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory);// Set the memory attribute.@@ -137,7 +137,7 @@ Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 masR_UNLESS((mask | attr | SupportedMask) == SupportedMask, ResultInvalidCombination);// Validate that the region is in range for the current process.- auto& page_table{system.Kernel().CurrentProcess()->PageTable()};+ auto& page_table{GetCurrentProcess(system.Kernel()).PageTable()};R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory);// Set the memory attribute.@@ -149,7 +149,7 @@ Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size)LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr,src_addr, size);- auto& page_table{system.Kernel().CurrentProcess()->PageTable()};+ auto& page_table{GetCurrentProcess(system.Kernel()).PageTable()};if (const Result result{MapUnmapMemorySanityChecks(page_table, dst_addr, src_addr, size)};result.IsError()) {@@ -164,7 +164,7 @@ Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 sizLOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr,src_addr, size);- auto& page_table{system.Kernel().CurrentProcess()->PageTable()};+ auto& page_table{GetCurrentProcess(system.Kernel()).PageTable()};if (const Result result{MapUnmapMemorySanityChecks(page_table, dst_addr, src_addr, size)};result.IsError()) {diff --git a/src/core/hle/kernel/svc/svc_physical_memory.cpp b/src/core/hle/kernel/svc/svc_physical_memory.cppindex 8d00e1fc34..a1f5344546 100644--- a/src/core/hle/kernel/svc/svc_physical_memory.cpp+++ b/src/core/hle/kernel/svc/svc_physical_memory.cpp@@ -16,7 +16,7 @@ Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size) {R_UNLESS(size < MainMemorySizeMax, ResultInvalidSize);// Set the heap size.- R_TRY(system.Kernel().CurrentProcess()->PageTable().SetHeapSize(out_address, size));+ R_TRY(GetCurrentProcess(system.Kernel()).PageTable().SetHeapSize(out_address, size));return ResultSuccess;}@@ -45,7 +45,7 @@ Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) {return ResultInvalidMemoryRegion;}- KProcess* const current_process{system.Kernel().CurrentProcess()};+ KProcess* const current_process{GetCurrentProcessPointer(system.Kernel())};auto& page_table{current_process->PageTable()};if (current_process->GetSystemResourceSize() == 0) {@@ -94,7 +94,7 @@ Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) {return ResultInvalidMemoryRegion;}- KProcess* const current_process{system.Kernel().CurrentProcess()};+ KProcess* const current_process{GetCurrentProcessPointer(system.Kernel())};auto& page_table{current_process->PageTable()};if (current_process->GetSystemResourceSize() == 0) {diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cppindex 2e5d228bb9..2b7cebde53 100644--- a/src/core/hle/kernel/svc/svc_port.cpp+++ b/src/core/hle/kernel/svc/svc_port.cpp@@ -34,7 +34,7 @@ Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_add// Get the current handle table.auto& kernel = system.Kernel();- auto& handle_table = kernel.CurrentProcess()->GetHandleTable();+ auto& handle_table = GetCurrentProcess(kernel).GetHandleTable();// Find the client port.auto port = kernel.CreateNamedServicePort(port_name);diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/core/hle/kernel/svc/svc_process.cppindex d2c20aad29..c35d2be76d 100644--- a/src/core/hle/kernel/svc/svc_process.cpp+++ b/src/core/hle/kernel/svc/svc_process.cpp@@ -9,7 +9,7 @@ namespace Kernel::Svc {/// Exits the current processvoid ExitProcess(Core::System& system) {- auto* current_process = system.Kernel().CurrentProcess();+ auto* current_process = GetCurrentProcessPointer(system.Kernel());LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID());ASSERT_MSG(current_process->GetState() == KProcess::State::Running,@@ -23,9 +23,9 @@ Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle) {LOG_DEBUG(Kernel_SVC, "called handle=0x{:08X}", handle);// Get the object from the handle table.- KScopedAutoObject obj =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KAutoObject>(- static_cast<Handle>(handle));+ KScopedAutoObject obj = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KAutoObject>(static_cast<Handle>(handle));R_UNLESS(obj.IsNotNull(), ResultInvalidHandle);// Get the process from the object.@@ -63,10 +63,10 @@ Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_prreturn ResultOutOfRange;}- const auto& kernel = system.Kernel();+ auto& kernel = system.Kernel();const auto total_copy_size = out_process_ids_size * sizeof(u64);- if (out_process_ids_size > 0 && !kernel.CurrentProcess()->PageTable().IsInsideAddressSpace(+ if (out_process_ids_size > 0 && !GetCurrentProcess(kernel).PageTable().IsInsideAddressSpace(out_process_ids, total_copy_size)) {LOG_ERROR(Kernel_SVC, "Address range outside address space. begin=0x{:016X}, end=0x{:016X}",out_process_ids, out_process_ids + total_copy_size);@@ -92,7 +92,7 @@ Result GetProcessInfo(Core::System& system, s64* out, Handle process_handle,ProcessInfoType info_type) {LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, type=0x{:X}", process_handle, info_type);- const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();+ const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();KScopedAutoObject process = handle_table.GetObject<KProcess>(process_handle);if (process.IsNull()) {LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}",diff --git a/src/core/hle/kernel/svc/svc_process_memory.cpp b/src/core/hle/kernel/svc/svc_process_memory.cppindex dbe24e1394..4dfd9e5bb0 100644--- a/src/core/hle/kernel/svc/svc_process_memory.cpp+++ b/src/core/hle/kernel/svc/svc_process_memory.cpp@@ -45,7 +45,7 @@ Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, V// Get the process from its handle.KScopedAutoObject process =- system.CurrentProcess()->GetHandleTable().GetObject<KProcess>(process_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KProcess>(process_handle);R_UNLESS(process.IsNotNull(), ResultInvalidHandle);// Validate that the address is in range.@@ -71,7 +71,7 @@ Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_R_UNLESS((src_address < src_address + size), ResultInvalidCurrentMemory);// Get the processes.- KProcess* dst_process = system.CurrentProcess();+ KProcess* dst_process = GetCurrentProcessPointer(system.Kernel());KScopedAutoObject src_process =dst_process->GetHandleTable().GetObjectWithoutPseudoHandle<KProcess>(process_handle);R_UNLESS(src_process.IsNotNull(), ResultInvalidHandle);@@ -114,7 +114,7 @@ Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle procesR_UNLESS((src_address < src_address + size), ResultInvalidCurrentMemory);// Get the processes.- KProcess* dst_process = system.CurrentProcess();+ KProcess* dst_process = GetCurrentProcessPointer(system.Kernel());KScopedAutoObject src_process =dst_process->GetHandleTable().GetObjectWithoutPseudoHandle<KProcess>(process_handle);R_UNLESS(src_process.IsNotNull(), ResultInvalidHandle);@@ -174,7 +174,7 @@ Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dstreturn ResultInvalidCurrentMemory;}- const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();+ const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();KScopedAutoObject process = handle_table.GetObject<KProcess>(process_handle);if (process.IsNull()) {LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).",@@ -242,7 +242,7 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dreturn ResultInvalidCurrentMemory;}- const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();+ const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();KScopedAutoObject process = handle_table.GetObject<KProcess>(process_handle);if (process.IsNull()) {LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).",diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/core/hle/kernel/svc/svc_query_memory.cppindex db140a341a..ee75ad3701 100644--- a/src/core/hle/kernel/svc/svc_query_memory.cpp+++ b/src/core/hle/kernel/svc/svc_query_memory.cpp@@ -22,7 +22,7 @@ Result QueryMemory(Core::System& system, uint64_t out_memory_info, PageInfo* outResult QueryProcessMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info,Handle process_handle, uint64_t address) {LOG_TRACE(Kernel_SVC, "called process=0x{:08X} address={:X}", process_handle, address);- const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();+ const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();KScopedAutoObject process = handle_table.GetObject<KProcess>(process_handle);if (process.IsNull()) {LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}",diff --git a/src/core/hle/kernel/svc/svc_resource_limit.cpp b/src/core/hle/kernel/svc/svc_resource_limit.cppindex ebc8860281..88166299e3 100644--- a/src/core/hle/kernel/svc/svc_resource_limit.cpp+++ b/src/core/hle/kernel/svc/svc_resource_limit.cpp@@ -27,7 +27,7 @@ Result CreateResourceLimit(Core::System& system, Handle* out_handle) {KResourceLimit::Register(kernel, resource_limit);// Add the limit to the handle table.- R_TRY(kernel.CurrentProcess()->GetHandleTable().Add(out_handle, resource_limit));+ R_TRY(GetCurrentProcess(kernel).GetHandleTable().Add(out_handle, resource_limit));return ResultSuccess;}@@ -41,9 +41,9 @@ Result GetResourceLimitLimitValue(Core::System& system, s64* out_limit_value,R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue);// Get the resource limit.- auto& kernel = system.Kernel();- KScopedAutoObject resource_limit =- kernel.CurrentProcess()->GetHandleTable().GetObject<KResourceLimit>(resource_limit_handle);+ KScopedAutoObject resource_limit = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KResourceLimit>(resource_limit_handle);R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle);// Get the limit value.@@ -61,9 +61,9 @@ Result GetResourceLimitCurrentValue(Core::System& system, s64* out_current_valueR_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue);// Get the resource limit.- auto& kernel = system.Kernel();- KScopedAutoObject resource_limit =- kernel.CurrentProcess()->GetHandleTable().GetObject<KResourceLimit>(resource_limit_handle);+ KScopedAutoObject resource_limit = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KResourceLimit>(resource_limit_handle);R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle);// Get the current value.@@ -81,9 +81,9 @@ Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_haR_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue);// Get the resource limit.- auto& kernel = system.Kernel();- KScopedAutoObject resource_limit =- kernel.CurrentProcess()->GetHandleTable().GetObject<KResourceLimit>(resource_limit_handle);+ KScopedAutoObject resource_limit = GetCurrentProcess(system.Kernel())+ .GetHandleTable()+ .GetObject<KResourceLimit>(resource_limit_handle);R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle);// Set the limit value.diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cppindex 0deb61b62c..00fd1605e7 100644--- a/src/core/hle/kernel/svc/svc_session.cpp+++ b/src/core/hle/kernel/svc/svc_session.cpp@@ -13,7 +13,7 @@ namespace {template <typename T>Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u64 name) {- auto& process = *system.CurrentProcess();+ auto& process = GetCurrentProcess(system.Kernel());auto& handle_table = process.GetHandleTable();// Declare the session we're going to allocate.diff --git a/src/core/hle/kernel/svc/svc_shared_memory.cpp b/src/core/hle/kernel/svc/svc_shared_memory.cppindex 40d6260e30..18e0dc9048 100644--- a/src/core/hle/kernel/svc/svc_shared_memory.cpp+++ b/src/core/hle/kernel/svc/svc_shared_memory.cpp@@ -42,7 +42,7 @@ Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address,R_UNLESS(IsValidSharedMemoryPermission(map_perm), ResultInvalidNewMemoryPermission);// Get the current process.- auto& process = *system.Kernel().CurrentProcess();+ auto& process = GetCurrentProcess(system.Kernel());auto& page_table = process.PageTable();// Get the shared memory.@@ -75,7 +75,7 @@ Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr addresR_UNLESS((address < address + size), ResultInvalidCurrentMemory);// Get the current process.- auto& process = *system.Kernel().CurrentProcess();+ auto& process = GetCurrentProcess(system.Kernel());auto& page_table = process.PageTable();// Get the shared memory.diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/core/hle/kernel/svc/svc_synchronization.cppindex e516a3800b..1a8f7e191c 100644--- a/src/core/hle/kernel/svc/svc_synchronization.cpp+++ b/src/core/hle/kernel/svc/svc_synchronization.cpp@@ -14,7 +14,7 @@ Result CloseHandle(Core::System& system, Handle handle) {LOG_TRACE(Kernel_SVC, "Closing handle 0x{:08X}", handle);// Remove the handle.- R_UNLESS(system.Kernel().CurrentProcess()->GetHandleTable().Remove(handle),+ R_UNLESS(GetCurrentProcess(system.Kernel()).GetHandleTable().Remove(handle),ResultInvalidHandle);return ResultSuccess;@@ -25,7 +25,7 @@ Result ResetSignal(Core::System& system, Handle handle) {LOG_DEBUG(Kernel_SVC, "called handle 0x{:08X}", handle);// Get the current handle table.- const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();+ const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();// Try to reset as readable event.{@@ -59,7 +59,7 @@ Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_addreauto& kernel = system.Kernel();std::vector<KSynchronizationObject*> objs(num_handles);- const auto& handle_table = kernel.CurrentProcess()->GetHandleTable();+ const auto& handle_table = GetCurrentProcess(kernel).GetHandleTable();Handle* handles = system.Memory().GetPointer<Handle>(handles_address);// Copy user handles.@@ -91,7 +91,7 @@ Result CancelSynchronization(Core::System& system, Handle handle) {// Get the thread from its handle.KScopedAutoObject thread =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KThread>(handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KThread>(handle);R_UNLESS(thread.IsNotNull(), ResultInvalidHandle);// Cancel the thread's wait.@@ -106,7 +106,7 @@ void SynchronizePreemptionState(Core::System& system) {KScopedSchedulerLock sl{kernel};// If the current thread is pinned, unpin it.- KProcess* cur_process = system.Kernel().CurrentProcess();+ KProcess* cur_process = GetCurrentProcessPointer(kernel);const auto core_id = GetCurrentCoreId(kernel);if (cur_process->GetPinnedThread(core_id) == GetCurrentThreadPointer(kernel)) {diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cppindex 3e325c9981..b398078418 100644--- a/src/core/hle/kernel/svc/svc_thread.cpp+++ b/src/core/hle/kernel/svc/svc_thread.cpp@@ -28,7 +28,7 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point,// Adjust core id, if it's the default magic.auto& kernel = system.Kernel();- auto& process = *kernel.CurrentProcess();+ auto& process = GetCurrentProcess(kernel);if (core_id == IdealCoreUseProcessValue) {core_id = process.GetIdealCoreId();}@@ -53,9 +53,9 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point,}// Reserve a new thread from the process resource limit (waiting up to 100ms).- KScopedResourceReservation thread_reservation(- kernel.CurrentProcess(), LimitableResource::ThreadCountMax, 1,- system.CoreTiming().GetGlobalTimeNs().count() + 100000000);+ KScopedResourceReservation thread_reservation(&process, LimitableResource::ThreadCountMax, 1,+ system.CoreTiming().GetGlobalTimeNs().count() ++ 100000000);if (!thread_reservation.Succeeded()) {LOG_ERROR(Kernel_SVC, "Could not reserve a new thread");return ResultLimitReached;@@ -97,7 +97,7 @@ Result StartThread(Core::System& system, Handle thread_handle) {// Get the thread from its handle.KScopedAutoObject thread =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KThread>(thread_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KThread>(thread_handle);R_UNLESS(thread.IsNotNull(), ResultInvalidHandle);// Try to start the thread.@@ -156,11 +156,11 @@ Result GetThreadContext3(Core::System& system, VAddr out_context, Handle thread_// Get the thread from its handle.KScopedAutoObject thread =- kernel.CurrentProcess()->GetHandleTable().GetObject<KThread>(thread_handle);+ GetCurrentProcess(kernel).GetHandleTable().GetObject<KThread>(thread_handle);R_UNLESS(thread.IsNotNull(), ResultInvalidHandle);// Require the handle be to a non-current thread in the current process.- const auto* current_process = kernel.CurrentProcess();+ const auto* current_process = GetCurrentProcessPointer(kernel);R_UNLESS(current_process == thread->GetOwnerProcess(), ResultInvalidId);// Verify that the thread isn't terminated.@@ -211,7 +211,7 @@ Result GetThreadPriority(Core::System& system, s32* out_priority, Handle handle)// Get the thread from its handle.KScopedAutoObject thread =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KThread>(handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KThread>(handle);R_UNLESS(thread.IsNotNull(), ResultInvalidHandle);// Get the thread's priority.@@ -222,7 +222,7 @@ Result GetThreadPriority(Core::System& system, s32* out_priority, Handle handle)/// Sets the priority for the specified threadResult SetThreadPriority(Core::System& system, Handle thread_handle, s32 priority) {// Get the current process.- KProcess& process = *system.Kernel().CurrentProcess();+ KProcess& process = GetCurrentProcess(system.Kernel());// Validate the priority.R_UNLESS(HighestThreadPriority <= priority && priority <= LowestThreadPriority,@@ -253,7 +253,7 @@ Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_threareturn ResultOutOfRange;}- auto* const current_process = system.Kernel().CurrentProcess();+ auto* const current_process = GetCurrentProcessPointer(system.Kernel());const auto total_copy_size = out_thread_ids_size * sizeof(u64);if (out_thread_ids_size > 0 &&@@ -284,7 +284,7 @@ Result GetThreadCoreMask(Core::System& system, s32* out_core_id, u64* out_affini// Get the thread from its handle.KScopedAutoObject thread =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KThread>(thread_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KThread>(thread_handle);R_UNLESS(thread.IsNotNull(), ResultInvalidHandle);// Get the core mask.@@ -297,11 +297,11 @@ Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_idu64 affinity_mask) {// Determine the core id/affinity mask.if (core_id == IdealCoreUseProcessValue) {- core_id = system.Kernel().CurrentProcess()->GetIdealCoreId();+ core_id = GetCurrentProcess(system.Kernel()).GetIdealCoreId();affinity_mask = (1ULL << core_id);} else {// Validate the affinity mask.- const u64 process_core_mask = system.Kernel().CurrentProcess()->GetCoreMask();+ const u64 process_core_mask = GetCurrentProcess(system.Kernel()).GetCoreMask();R_UNLESS((affinity_mask | process_core_mask) == process_core_mask, ResultInvalidCoreId);R_UNLESS(affinity_mask != 0, ResultInvalidCombination);@@ -316,7 +316,7 @@ Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id// Get the thread from its handle.KScopedAutoObject thread =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KThread>(thread_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KThread>(thread_handle);R_UNLESS(thread.IsNotNull(), ResultInvalidHandle);// Set the core mask.@@ -329,7 +329,7 @@ Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_idResult GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handle) {// Get the thread from its handle.KScopedAutoObject thread =- system.Kernel().CurrentProcess()->GetHandleTable().GetObject<KThread>(thread_handle);+ GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject<KThread>(thread_handle);R_UNLESS(thread.IsNotNull(), ResultInvalidHandle);// Get the thread's id.diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/core/hle/kernel/svc/svc_transfer_memory.cppindex a4c040e497..7ffc24adfd 100644--- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp+++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp@@ -39,11 +39,11 @@ Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u6R_UNLESS(IsValidTransferMemoryPermission(map_perm), ResultInvalidNewMemoryPermission);// Get the current process and handle table.- auto& process = *kernel.CurrentProcess();+ auto& process = GetCurrentProcess(kernel);auto& handle_table = process.GetHandleTable();// Reserve a new transfer memory from the process resource limit.- KScopedResourceReservation trmem_reservation(kernel.CurrentProcess(),+ KScopedResourceReservation trmem_reservation(&process,LimitableResource::TransferMemoryCountMax);R_UNLESS(trmem_reservation.Succeeded(), ResultLimitReached);diff --git a/src/core/hle/kernel/svc_generator.py b/src/core/hle/kernel/svc_generator.pyindex b0a5707ec7..34d2ac6598 100644--- a/src/core/hle/kernel/svc_generator.py+++ b/src/core/hle/kernel/svc_generator.py@@ -592,7 +592,7 @@ void Call(Core::System& system, u32 imm) {auto& kernel = system.Kernel();kernel.EnterSVCProfile();- if (system.CurrentProcess()->Is64BitProcess()) {+ if (GetCurrentProcess(system.Kernel()).Is64BitProcess()) {Call64(system, imm);} else {Call32(system, imm);