summaryrefslogtreecommitdiff
path: root/src/core/loader
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2015-05-09 15:57:29 +0200
committerGravatar Tony Wasserka2015-05-09 15:57:29 +0200
commite35e72d0a5c90c37d22328115fa0f29dd17aeaee (patch)
tree4053db2c53a1ac77294c03782de75c91c0cf4b27 /src/core/loader
parentLoader: Add missing include (diff)
parentMemory: Add GetPhysicalPointer helper function (diff)
downloadyuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.tar.gz
yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.tar.xz
yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.zip
Merge pull request #734 from yuriks/memmap
Small memory map definitions cleanup
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/3dsx.cpp4
-rw-r--r--src/core/loader/elf.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index 15527c5a6..e28986085 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -234,9 +234,9 @@ ResultStatus AppLoader_THREEDSX::Load() {
234 Kernel::g_current_process->svc_access_mask.set(); 234 Kernel::g_current_process->svc_access_mask.set();
235 Kernel::g_current_process->address_mappings = default_address_mappings; 235 Kernel::g_current_process->address_mappings = default_address_mappings;
236 236
237 Load3DSXFile(*file, Memory::EXEFS_CODE_VADDR); 237 Load3DSXFile(*file, Memory::PROCESS_IMAGE_VADDR);
238 238
239 Kernel::g_current_process->Run(Memory::EXEFS_CODE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE); 239 Kernel::g_current_process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE);
240 240
241 is_loaded = true; 241 is_loaded = true;
242 return ResultStatus::Success; 242 return ResultStatus::Success;
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index f86a98b8c..47d4e8cea 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -355,7 +355,7 @@ ResultStatus AppLoader_ELF::Load() {
355 Kernel::g_current_process->address_mappings = default_address_mappings; 355 Kernel::g_current_process->address_mappings = default_address_mappings;
356 356
357 ElfReader elf_reader(&buffer[0]); 357 ElfReader elf_reader(&buffer[0]);
358 elf_reader.LoadInto(Memory::EXEFS_CODE_VADDR); 358 elf_reader.LoadInto(Memory::PROCESS_IMAGE_VADDR);
359 // TODO: Fill application title 359 // TODO: Fill application title
360 360
361 Kernel::g_current_process->Run(elf_reader.GetEntryPoint(), 48, Kernel::DEFAULT_STACK_SIZE); 361 Kernel::g_current_process->Run(elf_reader.GetEntryPoint(), 48, Kernel::DEFAULT_STACK_SIZE);