aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/loader
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-05-09 00:39:56 -0300
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-05-09 01:29:52 -0300
commit1c0b87edc2d8262c06ea4c301bcfc884875f918b (patch)
treef5b49739cc6cb7ca758111c5171c84b2c3152f5f /src/core/loader
parenteb3eb9f75d9ed1e12bc472fdd94812e911c92927 (diff)
Memory: Re-organize and rename memory area address constants
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);