diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-04 05:01:16 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-09 03:11:02 +0200 |
| commit | 6d60acf0f1afcae873988da5218f2f1c7bc9d151 (patch) | |
| tree | cec75198ab74759002dd1da78f6ac2af5e61949f /src/core/loader/elf.cpp | |
| parent | Common: Add StringFromFixedZeroTerminatedBuffer (diff) | |
| download | yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.tar yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.tar.gz yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.tar.bz2 yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.tar.lz yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.tar.xz yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.tar.zst yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/loader/elf.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 467e91924..ac3f84d04 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,14 @@ 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->static_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; |