summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar liamwhite2023-03-27 12:16:40 -0400
committerGravatar GitHub2023-03-27 12:16:40 -0400
commit0661f5ccd1704935dc9c49521a79cc26832db3b0 (patch)
treee0923dd40e8dd0f6ec92a2de7722f911bd26c514 /src/core/hle/kernel/kernel.cpp
parentMerge pull request #9995 from german77/plain (diff)
parentmemory: rename global memory references to application memory (diff)
downloadyuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.gz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.xz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.zip
Merge pull request #9984 from liamwhite/global-memory
memory: rename global memory references to application memory
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 29809b2c5..4f3366c9d 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -102,7 +102,7 @@ struct KernelCore::Impl {
102 void InitializeCores() { 102 void InitializeCores() {
103 for (u32 core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) { 103 for (u32 core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) {
104 cores[core_id]->Initialize((*application_process).Is64BitProcess()); 104 cores[core_id]->Initialize((*application_process).Is64BitProcess());
105 system.Memory().SetCurrentPageTable(*application_process, core_id); 105 system.ApplicationMemory().SetCurrentPageTable(*application_process, core_id);
106 } 106 }
107 } 107 }
108 108
@@ -206,7 +206,7 @@ struct KernelCore::Impl {
206 206
207 void InitializePhysicalCores() { 207 void InitializePhysicalCores() {
208 exclusive_monitor = 208 exclusive_monitor =
209 Core::MakeExclusiveMonitor(system.Memory(), Core::Hardware::NUM_CPU_CORES); 209 Core::MakeExclusiveMonitor(system.ApplicationMemory(), Core::Hardware::NUM_CPU_CORES);
210 for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { 210 for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) {
211 const s32 core{static_cast<s32>(i)}; 211 const s32 core{static_cast<s32>(i)};
212 212