aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/loader
diff options
context:
space:
mode:
authorGravatar Tony Wasserka <neobrainx@gmail.com>2015-05-09 15:57:29 +0200
committerGravatar Tony Wasserka <neobrainx@gmail.com>2015-05-09 15:57:29 +0200
commite35e72d0a5c90c37d22328115fa0f29dd17aeaee (patch)
tree4053db2c53a1ac77294c03782de75c91c0cf4b27 /src/core/loader
parent417c867e1432f3a6dd3576c290478248910257ed (diff)
parent17a8cae0038b82202149bad687823b89074aa696 (diff)
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 15527c5a..e2898608 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -234,9 +234,9 @@ ResultStatus AppLoader_THREEDSX::Load() {
Kernel::g_current_process->svc_access_mask.set();
Kernel::g_current_process->address_mappings = default_address_mappings;
- Load3DSXFile(*file, Memory::EXEFS_CODE_VADDR);
+ Load3DSXFile(*file, Memory::PROCESS_IMAGE_VADDR);
- Kernel::g_current_process->Run(Memory::EXEFS_CODE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE);
+ Kernel::g_current_process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE);
is_loaded = true;
return ResultStatus::Success;
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index f86a98b8..47d4e8ce 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -355,7 +355,7 @@ ResultStatus AppLoader_ELF::Load() {
Kernel::g_current_process->address_mappings = default_address_mappings;
ElfReader elf_reader(&buffer[0]);
- elf_reader.LoadInto(Memory::EXEFS_CODE_VADDR);
+ elf_reader.LoadInto(Memory::PROCESS_IMAGE_VADDR);
// TODO: Fill application title
Kernel::g_current_process->Run(elf_reader.GetEntryPoint(), 48, Kernel::DEFAULT_STACK_SIZE);