diff options
Diffstat (limited to 'src/core/loader/nso.cpp')
| -rw-r--r-- | src/core/loader/nso.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index a94558ac5..0c992d662 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp | |||
| @@ -100,7 +100,8 @@ VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base) { | |||
| 100 | return {}; | 100 | return {}; |
| 101 | 101 | ||
| 102 | // Build program image | 102 | // Build program image |
| 103 | Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create(""); | 103 | auto& kernel = Core::System::GetInstance().Kernel(); |
| 104 | Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create(kernel, ""); | ||
| 104 | std::vector<u8> program_image; | 105 | std::vector<u8> program_image; |
| 105 | for (std::size_t i = 0; i < nso_header.segments.size(); ++i) { | 106 | for (std::size_t i = 0; i < nso_header.segments.size(); ++i) { |
| 106 | const std::vector<u8> compressed_data = | 107 | const std::vector<u8> compressed_data = |
| @@ -151,9 +152,10 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 151 | LoadModule(file, Memory::PROCESS_IMAGE_VADDR); | 152 | LoadModule(file, Memory::PROCESS_IMAGE_VADDR); |
| 152 | LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), Memory::PROCESS_IMAGE_VADDR); | 153 | LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), Memory::PROCESS_IMAGE_VADDR); |
| 153 | 154 | ||
| 155 | auto& kernel = Core::System::GetInstance().Kernel(); | ||
| 154 | process->svc_access_mask.set(); | 156 | process->svc_access_mask.set(); |
| 155 | process->resource_limit = | 157 | process->resource_limit = |
| 156 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | 158 | kernel.ResourceLimitForCategory(Kernel::ResourceLimitCategory::APPLICATION); |
| 157 | process->Run(Memory::PROCESS_IMAGE_VADDR, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); | 159 | process->Run(Memory::PROCESS_IMAGE_VADDR, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); |
| 158 | 160 | ||
| 159 | is_loaded = true; | 161 | is_loaded = true; |