diff options
| author | bunnei <bunneidev@gmail.com> | 2018-01-21 05:10:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 05:10:15 +0100 |
| commit | defaaf4519dd0beea5886c03b9a7a0bd348e2eb4 (patch) | |
| tree | e02eb29dffd9826ef3913b870e41956a4ec62283 /src/core/loader | |
| parent | Merge pull request #122 from tgsm/time-remove-pragma (diff) | |
| parent | Fix NRO Entry Point (diff) | |
| download | yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.tar yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.tar.gz yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.tar.bz2 yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.tar.lz yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.tar.xz yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.tar.zst yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.zip | |
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/nro.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 0a087153f..6f8a2f21e 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -107,7 +107,7 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) { bss_size = PageAlignSize(mod_header.bss_end_offset - mod_header.bss_start_offset); } codeset->data.size += bss_size; - program_image.resize(PageAlignSize(static_cast<u32>(program_image.size()) + bss_size)); + program_image.resize(static_cast<u32>(program_image.size()) + bss_size); // Load codeset for current process codeset->name = path; @@ -138,7 +138,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) { process->address_mappings = default_address_mappings; process->resource_limit = Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); - process->Run(base_addr + sizeof(NroHeader), 48, Kernel::DEFAULT_STACK_SIZE); + process->Run(base_addr, 48, Kernel::DEFAULT_STACK_SIZE); is_loaded = true; return ResultStatus::Success; |