diff options
| author | 2018-04-26 14:28:54 -0700 | |
|---|---|---|
| committer | 2018-04-26 14:28:54 -0700 | |
| commit | 7391741a204d6f25a06132eda214b2199b60a084 (patch) | |
| tree | aeeb723744c4563ad608361b82dd938b062a3e09 /src/core/loader/nso.cpp | |
| parent | Added PREPO to logging backend, Removed comments from SaveReportWithUser (diff) | |
| parent | Merge pull request #403 from lioncash/common (diff) | |
| download | yuzu-7391741a204d6f25a06132eda214b2199b60a084.tar.gz yuzu-7391741a204d6f25a06132eda214b2199b60a084.tar.xz yuzu-7391741a204d6f25a06132eda214b2199b60a084.zip | |
Merge branch 'master' of https://github.com/yuzu-emu/yuzu into service-impl
Diffstat (limited to 'src/core/loader/nso.cpp')
| -rw-r--r-- | src/core/loader/nso.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 3bc10ed0d..1842bae20 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp | |||
| @@ -73,7 +73,7 @@ static std::vector<u8> ReadSegment(FileUtil::IOFile& file, const NsoSegmentHeade | |||
| 73 | 73 | ||
| 74 | file.Seek(header.offset, SEEK_SET); | 74 | file.Seek(header.offset, SEEK_SET); |
| 75 | if (compressed_size != file.ReadBytes(compressed_data.data(), compressed_size)) { | 75 | if (compressed_size != file.ReadBytes(compressed_data.data(), compressed_size)) { |
| 76 | LOG_CRITICAL(Loader, "Failed to read %d NSO LZ4 compressed bytes", compressed_size); | 76 | NGLOG_CRITICAL(Loader, "Failed to read {} NSO LZ4 compressed bytes", compressed_size); |
| 77 | return {}; | 77 | return {}; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| @@ -158,14 +158,13 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 158 | 158 | ||
| 159 | // Load module | 159 | // Load module |
| 160 | LoadModule(filepath, Memory::PROCESS_IMAGE_VADDR); | 160 | LoadModule(filepath, Memory::PROCESS_IMAGE_VADDR); |
| 161 | LOG_DEBUG(Loader, "loaded module %s @ 0x%" PRIx64, filepath.c_str(), | 161 | NGLOG_DEBUG(Loader, "loaded module {} @ {:#X}", filepath, Memory::PROCESS_IMAGE_VADDR); |
| 162 | Memory::PROCESS_IMAGE_VADDR); | ||
| 163 | 162 | ||
| 164 | process->svc_access_mask.set(); | 163 | process->svc_access_mask.set(); |
| 165 | process->address_mappings = default_address_mappings; | 164 | process->address_mappings = default_address_mappings; |
| 166 | process->resource_limit = | 165 | process->resource_limit = |
| 167 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | 166 | Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); |
| 168 | process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Memory::DEFAULT_STACK_SIZE); | 167 | process->Run(Memory::PROCESS_IMAGE_VADDR, THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); |
| 169 | 168 | ||
| 170 | is_loaded = true; | 169 | is_loaded = true; |
| 171 | return ResultStatus::Success; | 170 | return ResultStatus::Success; |