diff options
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 2179cf2ea..00205d1d2 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -136,7 +136,8 @@ bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) { | |||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | // Build program image | 138 | // Build program image |
| 139 | Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create(""); | 139 | auto& kernel = Core::System::GetInstance().Kernel(); |
| 140 | Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create(kernel, ""); | ||
| 140 | std::vector<u8> program_image = file->ReadBytes(PageAlignSize(nro_header.file_size)); | 141 | std::vector<u8> program_image = file->ReadBytes(PageAlignSize(nro_header.file_size)); |
| 141 | if (program_image.size() != PageAlignSize(nro_header.file_size)) { | 142 | if (program_image.size() != PageAlignSize(nro_header.file_size)) { |
| 142 | return {}; | 143 | return {}; |
| @@ -185,9 +186,10 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 185 | return ResultStatus::ErrorLoadingNRO; | 186 | return ResultStatus::ErrorLoadingNRO; |
| 186 | } | 187 | } |
| 187 | 188 | ||
| 189 | auto& kernel = Core::System::GetInstance().Kernel(); | ||
| 188 | process->svc_access_mask.set(); | 190 | process->svc_access_mask.set(); |
| 189 | process->resource_limit = | 191 | process->resource_limit = |
| 190 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | 192 | kernel.ResourceLimitForCategory(Kernel::ResourceLimitCategory::APPLICATION); |
| 191 | process->Run(base_addr, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); | 193 | process->Run(base_addr, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); |
| 192 | 194 | ||
| 193 | is_loaded = true; | 195 | is_loaded = true; |