diff options
author | bunnei <bunneidev@gmail.com> | 2015-05-09 03:20:37 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-05-09 03:20:37 +0200 |
commit | 917ac23dfcab37c65e11e3413e397863bd4bc000 (patch) | |
tree | 956ca5d1a4aad3383c4a3bfc9103476abe3f1987 /src/core/loader/elf.cpp | |
parent | Merge pull request #728 from lioncash/vars (diff) | |
parent | Kernel: Remove unused g_main_thread variable (diff) | |
download | yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.gz yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.bz2 yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.lz yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.xz yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.zst yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.zip |
Diffstat (limited to 'src/core/loader/elf.cpp')
-rw-r--r-- | src/core/loader/elf.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 467e91924..f86a98b8c 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -10,9 +10,9 @@ #include "common/logging/log.h" #include "common/symbols.h" -#include "core/mem_map.h" -#include "core/loader/elf.h" #include "core/hle/kernel/kernel.h" +#include "core/loader/elf.h" +#include "core/mem_map.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // ELF Header Constants @@ -350,9 +350,15 @@ ResultStatus AppLoader_ELF::Load() { if (file->ReadBytes(&buffer[0], size) != size) return ResultStatus::Error; + Kernel::g_current_process = Kernel::Process::Create(filename, 0); + Kernel::g_current_process->svc_access_mask.set(); + Kernel::g_current_process->address_mappings = default_address_mappings; + ElfReader elf_reader(&buffer[0]); - elf_reader.LoadInto(0x00100000); - Kernel::LoadExec(elf_reader.GetEntryPoint()); + elf_reader.LoadInto(Memory::EXEFS_CODE_VADDR); + // TODO: Fill application title + + Kernel::g_current_process->Run(elf_reader.GetEntryPoint(), 48, Kernel::DEFAULT_STACK_SIZE); is_loaded = true; return ResultStatus::Success; |