summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/k_process.cpp2
-rw-r--r--src/core/hle/kernel/kernel.cpp8
-rw-r--r--src/core/hle/kernel/kernel.h6
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:
370 // Initialize proces address space 370 // Initialize proces address space
371 if (const Result result{page_table.InitializeForProcess( 371 if (const Result result{page_table.InitializeForProcess(
372 metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, 372 metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application,
373 0x8000000, code_size, &kernel.GetSystemSystemResource(), resource_limit)}; 373 0x8000000, code_size, &kernel.GetAppSystemResource(), resource_limit)};
374 result.IsError()) { 374 result.IsError()) {
375 R_RETURN(result); 375 R_RETURN(result);
376 } 376 }
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 {
1146 return *impl->memory_manager; 1146 return *impl->memory_manager;
1147} 1147}
1148 1148
1149KSystemResource& KernelCore::GetAppSystemResource() {
1150 return *impl->app_system_resource;
1151}
1152
1153const KSystemResource& KernelCore::GetAppSystemResource() const {
1154 return *impl->app_system_resource;
1155}
1156
1149KSystemResource& KernelCore::GetSystemSystemResource() { 1157KSystemResource& KernelCore::GetSystemSystemResource() {
1150 return *impl->sys_system_resource; 1158 return *impl->sys_system_resource;
1151} 1159}
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:
246 /// Gets the virtual memory manager for the kernel. 246 /// Gets the virtual memory manager for the kernel.
247 const KMemoryManager& MemoryManager() const; 247 const KMemoryManager& MemoryManager() const;
248 248
249 /// Gets the application resource manager.
250 KSystemResource& GetAppSystemResource();
251
252 /// Gets the application resource manager.
253 const KSystemResource& GetAppSystemResource() const;
254
249 /// Gets the system resource manager. 255 /// Gets the system resource manager.
250 KSystemResource& GetSystemSystemResource(); 256 KSystemResource& GetSystemSystemResource();
251 257