diff options
author | bunnei <bunneidev@gmail.com> | 2023-02-11 06:03:39 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2023-02-11 06:03:39 +0100 |
commit | e79270507b88f20c9d6e0307ead451ad776b528a (patch) | |
tree | 824662a3ee379a97c0df7b9991b4d697b061d5dd /src | |
parent | Merge pull request #9761 from Morph1984/oops (diff) | |
download | yuzu-e79270507b88f20c9d6e0307ead451ad776b528a.tar yuzu-e79270507b88f20c9d6e0307ead451ad776b528a.tar.gz yuzu-e79270507b88f20c9d6e0307ead451ad776b528a.tar.bz2 yuzu-e79270507b88f20c9d6e0307ead451ad776b528a.tar.lz yuzu-e79270507b88f20c9d6e0307ead451ad776b528a.tar.xz yuzu-e79270507b88f20c9d6e0307ead451ad776b528a.tar.zst yuzu-e79270507b88f20c9d6e0307ead451ad776b528a.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/kernel/k_process.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 8 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.h | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index e201bb0cd..0e4283a0c 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -370,7 +370,7 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: // Initialize proces address space if (const Result result{page_table.InitializeForProcess( metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, - 0x8000000, code_size, &kernel.GetSystemSystemResource(), resource_limit)}; + 0x8000000, code_size, &kernel.GetAppSystemResource(), resource_limit)}; result.IsError()) { R_RETURN(result); } diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index d9eafe261..5b72eaaa1 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -1146,6 +1146,14 @@ const KMemoryManager& KernelCore::MemoryManager() const { return *impl->memory_manager; } +KSystemResource& KernelCore::GetAppSystemResource() { + return *impl->app_system_resource; +} + +const KSystemResource& KernelCore::GetAppSystemResource() const { + return *impl->app_system_resource; +} + KSystemResource& KernelCore::GetSystemSystemResource() { return *impl->sys_system_resource; } diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 5f52e1e95..af0ae0e98 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -246,6 +246,12 @@ public: /// Gets the virtual memory manager for the kernel. const KMemoryManager& MemoryManager() const; + /// Gets the application resource manager. + KSystemResource& GetAppSystemResource(); + + /// Gets the application resource manager. + const KSystemResource& GetAppSystemResource() const; + /// Gets the system resource manager. KSystemResource& GetSystemSystemResource(); |