diff options
| author | bunnei <bunneidev@gmail.com> | 2017-09-30 20:15:09 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2017-09-30 20:33:58 +0200 |
| commit | 8c92435ded5c9c89290604a03e307c038b4d4117 (patch) | |
| tree | 89640df0ae25ef5c78b79c1d8169f5ad6c25d63b /src/core/loader/elf.cpp | |
| parent | process: Support loading multiple codesets. (diff) | |
| download | yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.gz yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.bz2 yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.lz yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.xz yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.zst yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.zip | |
Diffstat (limited to 'src/core/loader/elf.cpp')
| -rw-r--r-- | src/core/loader/elf.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 055bc39de..2efc67ff8 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -401,7 +401,8 @@ ResultStatus AppLoader_ELF::Load() { SharedPtr<CodeSet> codeset = elf_reader.LoadInto(Memory::PROCESS_IMAGE_VADDR); codeset->name = filename; - Kernel::g_current_process = Kernel::Process::Create(std::move(codeset)); + Kernel::g_current_process = Kernel::Process::Create("main"); + Kernel::g_current_process->LoadModule(codeset, codeset->entrypoint); Kernel::g_current_process->svc_access_mask.set(); Kernel::g_current_process->address_mappings = default_address_mappings; @@ -409,7 +410,7 @@ ResultStatus AppLoader_ELF::Load() { Kernel::g_current_process->resource_limit = Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); - Kernel::g_current_process->Run(48, Kernel::DEFAULT_STACK_SIZE); + Kernel::g_current_process->Run(codeset->entrypoint, 48, Kernel::DEFAULT_STACK_SIZE); is_loaded = true; return ResultStatus::Success; |