diff options
Diffstat (limited to 'src/core/loader/nca.cpp')
| -rw-r--r-- | src/core/loader/nca.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index 067945d46..da064f8e3 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp | |||
| @@ -123,7 +123,7 @@ ResultStatus Nca::Load(FileUtil::IOFile&& in_file, std::string in_path) { | |||
| 123 | file.Seek(0, SEEK_SET); | 123 | file.Seek(0, SEEK_SET); |
| 124 | std::array<u8, sizeof(NcaHeader)> header_array{}; | 124 | std::array<u8, sizeof(NcaHeader)> header_array{}; |
| 125 | if (sizeof(NcaHeader) != file.ReadBytes(header_array.data(), sizeof(NcaHeader))) | 125 | if (sizeof(NcaHeader) != file.ReadBytes(header_array.data(), sizeof(NcaHeader))) |
| 126 | NGLOG_CRITICAL(Loader, "File reader errored out during header read."); | 126 | LOG_CRITICAL(Loader, "File reader errored out during header read."); |
| 127 | 127 | ||
| 128 | NcaHeader header{}; | 128 | NcaHeader header{}; |
| 129 | std::memcpy(&header, header_array.data(), sizeof(NcaHeader)); | 129 | std::memcpy(&header, header_array.data(), sizeof(NcaHeader)); |
| @@ -140,7 +140,7 @@ ResultStatus Nca::Load(FileUtil::IOFile&& in_file, std::string in_path) { | |||
| 140 | std::array<u8, sizeof(NcaSectionHeaderBlock)> array{}; | 140 | std::array<u8, sizeof(NcaSectionHeaderBlock)> array{}; |
| 141 | if (sizeof(NcaSectionHeaderBlock) != | 141 | if (sizeof(NcaSectionHeaderBlock) != |
| 142 | file.ReadBytes(array.data(), sizeof(NcaSectionHeaderBlock))) | 142 | file.ReadBytes(array.data(), sizeof(NcaSectionHeaderBlock))) |
| 143 | NGLOG_CRITICAL(Loader, "File reader errored out during header read."); | 143 | LOG_CRITICAL(Loader, "File reader errored out during header read."); |
| 144 | 144 | ||
| 145 | NcaSectionHeaderBlock block{}; | 145 | NcaSectionHeaderBlock block{}; |
| 146 | std::memcpy(&block, array.data(), sizeof(NcaSectionHeaderBlock)); | 146 | std::memcpy(&block, array.data(), sizeof(NcaSectionHeaderBlock)); |
| @@ -154,7 +154,7 @@ ResultStatus Nca::Load(FileUtil::IOFile&& in_file, std::string in_path) { | |||
| 154 | // Seek back to beginning of this section. | 154 | // Seek back to beginning of this section. |
| 155 | file.Seek(SECTION_HEADER_OFFSET + i * SECTION_HEADER_SIZE, SEEK_SET); | 155 | file.Seek(SECTION_HEADER_OFFSET + i * SECTION_HEADER_SIZE, SEEK_SET); |
| 156 | if (sizeof(Pfs0Superblock) != file.ReadBytes(&sb, sizeof(Pfs0Superblock))) | 156 | if (sizeof(Pfs0Superblock) != file.ReadBytes(&sb, sizeof(Pfs0Superblock))) |
| 157 | NGLOG_CRITICAL(Loader, "File reader errored out during header read."); | 157 | LOG_CRITICAL(Loader, "File reader errored out during header read."); |
| 158 | 158 | ||
| 159 | u64 offset = (static_cast<u64>(header.section_tables[i].media_offset) * | 159 | u64 offset = (static_cast<u64>(header.section_tables[i].media_offset) * |
| 160 | MEDIA_OFFSET_MULTIPLIER) + | 160 | MEDIA_OFFSET_MULTIPLIER) + |
| @@ -258,7 +258,7 @@ ResultStatus AppLoader_NCA::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 258 | const VAddr load_addr = next_load_addr; | 258 | const VAddr load_addr = next_load_addr; |
| 259 | next_load_addr = AppLoader_NSO::LoadModule(module, nca->GetExeFsFile(module), load_addr); | 259 | next_load_addr = AppLoader_NSO::LoadModule(module, nca->GetExeFsFile(module), load_addr); |
| 260 | if (next_load_addr) { | 260 | if (next_load_addr) { |
| 261 | NGLOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", module, load_addr); | 261 | LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", module, load_addr); |
| 262 | } else { | 262 | } else { |
| 263 | next_load_addr = load_addr; | 263 | next_load_addr = load_addr; |
| 264 | } | 264 | } |
| @@ -283,7 +283,7 @@ ResultStatus AppLoader_NCA::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 283 | ResultStatus AppLoader_NCA::ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset, | 283 | ResultStatus AppLoader_NCA::ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset, |
| 284 | u64& size) { | 284 | u64& size) { |
| 285 | if (nca->GetRomFsSize() == 0) { | 285 | if (nca->GetRomFsSize() == 0) { |
| 286 | NGLOG_DEBUG(Loader, "No RomFS available"); | 286 | LOG_DEBUG(Loader, "No RomFS available"); |
| 287 | return ResultStatus::ErrorNotUsed; | 287 | return ResultStatus::ErrorNotUsed; |
| 288 | } | 288 | } |
| 289 | 289 | ||
| @@ -292,8 +292,8 @@ ResultStatus AppLoader_NCA::ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_f | |||
| 292 | offset = nca->GetRomFsOffset(); | 292 | offset = nca->GetRomFsOffset(); |
| 293 | size = nca->GetRomFsSize(); | 293 | size = nca->GetRomFsSize(); |
| 294 | 294 | ||
| 295 | NGLOG_DEBUG(Loader, "RomFS offset: 0x{:016X}", offset); | 295 | LOG_DEBUG(Loader, "RomFS offset: 0x{:016X}", offset); |
| 296 | NGLOG_DEBUG(Loader, "RomFS size: 0x{:016X}", size); | 296 | LOG_DEBUG(Loader, "RomFS size: 0x{:016X}", size); |
| 297 | 297 | ||
| 298 | return ResultStatus::Success; | 298 | return ResultStatus::Success; |
| 299 | } | 299 | } |