summaryrefslogtreecommitdiff
path: root/src/core/loader
diff options
context:
space:
mode:
authorGravatar bunnei2018-05-02 15:24:41 -0400
committerGravatar GitHub2018-05-02 15:24:41 -0400
commit1147db9dd1026672b96ca9d548239cace85ce952 (patch)
treeedfd9282300ba280bf51ba8a99f8a727122a31c0 /src/core/loader
parentMerge pull request #430 from lioncash/vec (diff)
parentgeneral: Make formatting of logged hex values more straightforward (diff)
downloadyuzu-1147db9dd1026672b96ca9d548239cace85ce952.tar.gz
yuzu-1147db9dd1026672b96ca9d548239cace85ce952.tar.xz
yuzu-1147db9dd1026672b96ca9d548239cace85ce952.zip
Merge pull request #431 from lioncash/fmt
general: Make formatting of logged hex values more straightforward
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/deconstructed_rom_directory.cpp6
-rw-r--r--src/core/loader/nso.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp
index 40a81025f..b01b2caf6 100644
--- a/src/core/loader/deconstructed_rom_directory.cpp
+++ b/src/core/loader/deconstructed_rom_directory.cpp
@@ -132,7 +132,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load(
132 const VAddr load_addr = next_load_addr; 132 const VAddr load_addr = next_load_addr;
133 next_load_addr = AppLoader_NSO::LoadModule(path, load_addr); 133 next_load_addr = AppLoader_NSO::LoadModule(path, load_addr);
134 if (next_load_addr) { 134 if (next_load_addr) {
135 NGLOG_DEBUG(Loader, "loaded module {} @ {:#X}", module, load_addr); 135 NGLOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", module, load_addr);
136 } else { 136 } else {
137 next_load_addr = load_addr; 137 next_load_addr = load_addr;
138 } 138 }
@@ -176,8 +176,8 @@ ResultStatus AppLoader_DeconstructedRomDirectory::ReadRomFS(
176 offset = 0; 176 offset = 0;
177 size = romfs_file->GetSize(); 177 size = romfs_file->GetSize();
178 178
179 NGLOG_DEBUG(Loader, "RomFS offset: {:#018X}", offset); 179 NGLOG_DEBUG(Loader, "RomFS offset: 0x{:016X}", offset);
180 NGLOG_DEBUG(Loader, "RomFS size: {:#018X}", size); 180 NGLOG_DEBUG(Loader, "RomFS size: 0x{:016X}", size);
181 181
182 // Reset read pointer 182 // Reset read pointer
183 file.Seek(0, SEEK_SET); 183 file.Seek(0, SEEK_SET);
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp
index 138883cc9..01be9e217 100644
--- a/src/core/loader/nso.cpp
+++ b/src/core/loader/nso.cpp
@@ -158,7 +158,7 @@ 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 NGLOG_DEBUG(Loader, "loaded module {} @ {:#X}", filepath, Memory::PROCESS_IMAGE_VADDR); 161 NGLOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", filepath, Memory::PROCESS_IMAGE_VADDR);
162 162
163 process->svc_access_mask.set(); 163 process->svc_access_mask.set();
164 process->address_mappings = default_address_mappings; 164 process->address_mappings = default_address_mappings;