diff options
| author | 2018-01-20 23:10:15 -0500 | |
|---|---|---|
| committer | 2018-01-20 23:10:15 -0500 | |
| commit | defaaf4519dd0beea5886c03b9a7a0bd348e2eb4 (patch) | |
| tree | e02eb29dffd9826ef3913b870e41956a4ec62283 /src | |
| parent | Merge pull request #122 from tgsm/time-remove-pragma (diff) | |
| parent | Fix NRO Entry Point (diff) | |
| download | yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.tar.gz yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.tar.xz yuzu-defaaf4519dd0beea5886c03b9a7a0bd348e2eb4.zip | |
Merge pull request #92 from gdkchan/nro_refactor
Fix NRO entry point
Diffstat (limited to 'src')
| -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) { | |||
| 107 | bss_size = PageAlignSize(mod_header.bss_end_offset - mod_header.bss_start_offset); | 107 | bss_size = PageAlignSize(mod_header.bss_end_offset - mod_header.bss_start_offset); |
| 108 | } | 108 | } |
| 109 | codeset->data.size += bss_size; | 109 | codeset->data.size += bss_size; |
| 110 | program_image.resize(PageAlignSize(static_cast<u32>(program_image.size()) + bss_size)); | 110 | program_image.resize(static_cast<u32>(program_image.size()) + bss_size); |
| 111 | 111 | ||
| 112 | // Load codeset for current process | 112 | // Load codeset for current process |
| 113 | codeset->name = path; | 113 | codeset->name = path; |
| @@ -138,7 +138,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 138 | process->address_mappings = default_address_mappings; | 138 | process->address_mappings = default_address_mappings; |
| 139 | process->resource_limit = | 139 | process->resource_limit = |
| 140 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | 140 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); |
| 141 | process->Run(base_addr + sizeof(NroHeader), 48, Kernel::DEFAULT_STACK_SIZE); | 141 | process->Run(base_addr, 48, Kernel::DEFAULT_STACK_SIZE); |
| 142 | 142 | ||
| 143 | is_loaded = true; | 143 | is_loaded = true; |
| 144 | return ResultStatus::Success; | 144 | return ResultStatus::Success; |