diff options
author | bunnei <bunneidev@gmail.com> | 2020-04-21 18:59:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-21 18:59:16 -0400 |
commit | cd47ccec496c9a961abf1dc58f8d2a4165c1bf2b (patch) | |
tree | ec4adafd6b8f513a4d37e4594dfa864df4d6bb17 /src/core/loader/elf.cpp | |
parent | f293b1561132cbdf70551201a219ef5e5fc62338 (diff) | |
parent | 9c12aef2f85ae50d6e6b25df54720fcb0bd46f14 (diff) |
Merge pull request #3745 from bunnei/fix-homebrew-load
Fix process memory initialization for ELF and NRO
Diffstat (limited to 'src/core/loader/elf.cpp')
-rw-r--r-- | src/core/loader/elf.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 1e9ed2837..8f7615115 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -398,6 +398,11 @@ AppLoader_ELF::LoadResult AppLoader_ELF::Load(Kernel::Process& process) { Kernel::CodeSet codeset = elf_reader.LoadInto(base_address); const VAddr entry_point = codeset.entrypoint; + // Setup the process code layout + if (process.LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), buffer.size()).IsError()) { + return {ResultStatus::ErrorNotInitialized, {}}; + } + process.LoadModule(std::move(codeset), entry_point); is_loaded = true; |