diff options
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/loader.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/ncch.cpp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 147bf8591..be719d74c 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -139,7 +139,7 @@ std::unique_ptr<AppLoader> GetLoader(const std::string& filename) { | |||
| 139 | type = filename_type; | 139 | type = filename_type; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | LOG_INFO(Loader, "Loading file %s as %s...", filename.c_str(), GetFileTypeString(type)); | 142 | LOG_DEBUG(Loader, "Loading file %s as %s...", filename.c_str(), GetFileTypeString(type)); |
| 143 | 143 | ||
| 144 | return GetFileLoader(std::move(file), type, filename_filename, filename); | 144 | return GetFileLoader(std::move(file), type, filename_filename, filename); |
| 145 | } | 145 | } |
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 98b8259d9..1a4e3efa8 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <algorithm> | 5 | #include <algorithm> |
| 6 | #include <cinttypes> | ||
| 6 | #include <cstring> | 7 | #include <cstring> |
| 7 | #include <memory> | 8 | #include <memory> |
| 8 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
| @@ -253,7 +254,7 @@ ResultStatus AppLoader_NCCH::LoadExeFS() { | |||
| 253 | 254 | ||
| 254 | // Skip NCSD header and load first NCCH (NCSD is just a container of NCCH files)... | 255 | // Skip NCSD header and load first NCCH (NCSD is just a container of NCCH files)... |
| 255 | if (MakeMagic('N', 'C', 'S', 'D') == ncch_header.magic) { | 256 | if (MakeMagic('N', 'C', 'S', 'D') == ncch_header.magic) { |
| 256 | LOG_WARNING(Loader, "Only loading the first (bootable) NCCH within the NCSD file!"); | 257 | LOG_DEBUG(Loader, "Only loading the first (bootable) NCCH within the NCSD file!"); |
| 257 | ncch_offset = 0x4000; | 258 | ncch_offset = 0x4000; |
| 258 | file.Seek(ncch_offset, SEEK_SET); | 259 | file.Seek(ncch_offset, SEEK_SET); |
| 259 | file.ReadBytes(&ncch_header, sizeof(NCCH_Header)); | 260 | file.ReadBytes(&ncch_header, sizeof(NCCH_Header)); |
| @@ -277,8 +278,8 @@ ResultStatus AppLoader_NCCH::LoadExeFS() { | |||
| 277 | priority = exheader_header.arm11_system_local_caps.priority; | 278 | priority = exheader_header.arm11_system_local_caps.priority; |
| 278 | resource_limit_category = exheader_header.arm11_system_local_caps.resource_limit_category; | 279 | resource_limit_category = exheader_header.arm11_system_local_caps.resource_limit_category; |
| 279 | 280 | ||
| 280 | LOG_INFO(Loader, "Name: %s", exheader_header.codeset_info.name); | 281 | LOG_DEBUG(Loader, "Name: %s", exheader_header.codeset_info.name); |
| 281 | LOG_INFO(Loader, "Program ID: %016llX", ncch_header.program_id); | 282 | LOG_DEBUG(Loader, "Program ID: %016" PRIX64, ncch_header.program_id); |
| 282 | LOG_DEBUG(Loader, "Code compressed: %s", is_compressed ? "yes" : "no"); | 283 | LOG_DEBUG(Loader, "Code compressed: %s", is_compressed ? "yes" : "no"); |
| 283 | LOG_DEBUG(Loader, "Entry point: 0x%08X", entry_point); | 284 | LOG_DEBUG(Loader, "Entry point: 0x%08X", entry_point); |
| 284 | LOG_DEBUG(Loader, "Code size: 0x%08X", code_size); | 285 | LOG_DEBUG(Loader, "Code size: 0x%08X", code_size); |
| @@ -336,6 +337,8 @@ ResultStatus AppLoader_NCCH::Load() { | |||
| 336 | if (result != ResultStatus::Success) | 337 | if (result != ResultStatus::Success) |
| 337 | return result; | 338 | return result; |
| 338 | 339 | ||
| 340 | LOG_INFO(Loader, "Program ID: %016" PRIX64, ncch_header.program_id); | ||
| 341 | |||
| 339 | is_loaded = true; // Set state to loaded | 342 | is_loaded = true; // Set state to loaded |
| 340 | 343 | ||
| 341 | result = LoadExec(); // Load the executable into memory for booting | 344 | result = LoadExec(); // Load the executable into memory for booting |