Services/Loader: Use more sensible log formats for certain functions

along with more info being logged.

1 files changed, 23 insertions, 10 deletions

diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index aaaa4d650..4efed78bf 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -198,20 +198,33 @@ ResultStatus AppLoader_NCCH::Load() {
     if (file->ReadBytes(&exheader_header, sizeof(ExHeader_Header)) != sizeof(ExHeader_Header))
         return ResultStatus::Error;
 
-    is_compressed = (exheader_header.codeset_info.flags.flag & 1) == 1;
-    entry_point = exheader_header.codeset_info.text.address;
-
-    LOG_INFO(Loader, "Name:            %s", exheader_header.codeset_info.name);
-    LOG_DEBUG(Loader, "Code compressed: %s", is_compressed ? "yes" : "no");
-    LOG_DEBUG(Loader, "Entry point:     0x%08X", entry_point);
+    is_compressed           = (exheader_header.codeset_info.flags.flag & 1) == 1;
+    entry_point             = exheader_header.codeset_info.text.address;
+    code_size               = exheader_header.codeset_info.text.code_size;
+    stack_size              = exheader_header.codeset_info.stack_size;
+    bss_size                = exheader_header.codeset_info.bss_size;
+    core_version            = exheader_header.arm11_system_local_caps.core_version;
+    priority                = exheader_header.arm11_system_local_caps.priority;
+    resource_limit_category = exheader_header.arm11_system_local_caps.resource_limit_category;
+
+    LOG_INFO(Loader,  "Name:                         %s"   , exheader_header.codeset_info.name);
+    LOG_DEBUG(Loader, "Code compressed:             %s"    , is_compressed ? "yes" : "no");
+    LOG_DEBUG(Loader, "Entry point:                 0x%08X", entry_point);
+    LOG_DEBUG(Loader, "Code size:                   0x%08X", code_size);
+    LOG_DEBUG(Loader, "Stack size:                  0x%08X", stack_size);
+    LOG_DEBUG(Loader, "Bss size:                    0x%08X", bss_size);
+    LOG_DEBUG(Loader, "Core version:                %d"    , core_version);
+    LOG_DEBUG(Loader, "Thread priority:             0x%X"  , priority);
+    LOG_DEBUG(Loader, "Resource limit descriptor:   0x%08X", exheader_header.arm11_system_local_caps.resource_limit_descriptor);
+    LOG_DEBUG(Loader, "Resource limit category:     %d"    , resource_limit_category);
 
     // Read ExeFS...
 
     exefs_offset = ncch_header.exefs_offset * kBlockSize;
     u32 exefs_size = ncch_header.exefs_size * kBlockSize;
 
-    LOG_DEBUG(Loader, "ExeFS offset:    0x%08X", exefs_offset);
-    LOG_DEBUG(Loader, "ExeFS size:      0x%08X", exefs_size);
+    LOG_DEBUG(Loader, "ExeFS offset:                0x%08X", exefs_offset);
+    LOG_DEBUG(Loader, "ExeFS size:                  0x%08X", exefs_size);
 
     file->Seek(exefs_offset + ncch_offset, SEEK_SET);
     if (file->ReadBytes(&exefs_header, sizeof(ExeFs_Header)) != sizeof(ExeFs_Header))
@@ -247,8 +260,8 @@ ResultStatus AppLoader_NCCH::ReadRomFS(std::vector<u8>& buffer) const {
         u32 romfs_offset = ncch_offset + (ncch_header.romfs_offset * kBlockSize) + 0x1000;
         u32 romfs_size = (ncch_header.romfs_size * kBlockSize) - 0x1000;
 
-        LOG_DEBUG(Loader, "RomFS offset:    0x%08X", romfs_offset);
-        LOG_DEBUG(Loader, "RomFS size:      0x%08X", romfs_size);
+        LOG_DEBUG(Loader, "RomFS offset:           0x%08X", romfs_offset);
+        LOG_DEBUG(Loader, "RomFS size:             0x%08X", romfs_size);
 
         buffer.resize(romfs_size);