diff options
| author | 2014-12-05 23:53:49 -0200 | |
|---|---|---|
| committer | 2014-12-13 02:08:02 -0200 | |
| commit | 0600e2d8b5b30bd68c8b19cb1f2051e096e7caa9 (patch) | |
| tree | 40fee084c551bfb497e68181447298f862ea68ca /src/core/loader/3dsx.cpp | |
| parent | Implement text path trimming for shorter paths. (diff) | |
| download | yuzu-0600e2d8b5b30bd68c8b19cb1f2051e096e7caa9.tar.gz yuzu-0600e2d8b5b30bd68c8b19cb1f2051e096e7caa9.tar.xz yuzu-0600e2d8b5b30bd68c8b19cb1f2051e096e7caa9.zip | |
Convert old logging calls to new logging macros
Diffstat (limited to 'src/core/loader/3dsx.cpp')
| -rw-r--r-- | src/core/loader/3dsx.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index 7ef146359..f48d13530 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp | |||
| @@ -174,14 +174,14 @@ int THREEDSXReader::Load3DSXFile(const std::string& filename, u32 base_addr) | |||
| 174 | return ERROR_READ; | 174 | return ERROR_READ; |
| 175 | 175 | ||
| 176 | for (u32 current_inprogress = 0; current_inprogress < remaining && pos < end_pos; current_inprogress++) { | 176 | for (u32 current_inprogress = 0; current_inprogress < remaining && pos < end_pos; current_inprogress++) { |
| 177 | DEBUG_LOG(LOADER, "(t=%d,skip=%u,patch=%u)\n", | 177 | LOG_TRACE(Loader, "(t=%d,skip=%u,patch=%u)\n", |
| 178 | current_segment_reloc_table, (u32)reloc_table[current_inprogress].skip, (u32)reloc_table[current_inprogress].patch); | 178 | current_segment_reloc_table, (u32)reloc_table[current_inprogress].skip, (u32)reloc_table[current_inprogress].patch); |
| 179 | pos += reloc_table[current_inprogress].skip; | 179 | pos += reloc_table[current_inprogress].skip; |
| 180 | s32 num_patches = reloc_table[current_inprogress].patch; | 180 | s32 num_patches = reloc_table[current_inprogress].patch; |
| 181 | while (0 < num_patches && pos < end_pos) { | 181 | while (0 < num_patches && pos < end_pos) { |
| 182 | u32 in_addr = (char*)pos - (char*)&all_mem[0]; | 182 | u32 in_addr = (char*)pos - (char*)&all_mem[0]; |
| 183 | u32 addr = TranslateAddr(*pos, &loadinfo, offsets); | 183 | u32 addr = TranslateAddr(*pos, &loadinfo, offsets); |
| 184 | DEBUG_LOG(LOADER, "Patching %08X <-- rel(%08X,%d) (%08X)\n", | 184 | LOG_TRACE(Loader, "Patching %08X <-- rel(%08X,%d) (%08X)\n", |
| 185 | base_addr + in_addr, addr, current_segment_reloc_table, *pos); | 185 | base_addr + in_addr, addr, current_segment_reloc_table, *pos); |
| 186 | switch (current_segment_reloc_table) { | 186 | switch (current_segment_reloc_table) { |
| 187 | case 0: *pos = (addr); break; | 187 | case 0: *pos = (addr); break; |
| @@ -199,10 +199,10 @@ int THREEDSXReader::Load3DSXFile(const std::string& filename, u32 base_addr) | |||
| 199 | // Write the data | 199 | // Write the data |
| 200 | memcpy(Memory::GetPointer(base_addr), &all_mem[0], loadinfo.seg_sizes[0] + loadinfo.seg_sizes[1] + loadinfo.seg_sizes[2]); | 200 | memcpy(Memory::GetPointer(base_addr), &all_mem[0], loadinfo.seg_sizes[0] + loadinfo.seg_sizes[1] + loadinfo.seg_sizes[2]); |
| 201 | 201 | ||
| 202 | DEBUG_LOG(LOADER, "CODE: %u pages\n", loadinfo.seg_sizes[0] / 0x1000); | 202 | LOG_DEBUG(Loader, "CODE: %u pages\n", loadinfo.seg_sizes[0] / 0x1000); |
| 203 | DEBUG_LOG(LOADER, "RODATA: %u pages\n", loadinfo.seg_sizes[1] / 0x1000); | 203 | LOG_DEBUG(Loader, "RODATA: %u pages\n", loadinfo.seg_sizes[1] / 0x1000); |
| 204 | DEBUG_LOG(LOADER, "DATA: %u pages\n", data_load_size / 0x1000); | 204 | LOG_DEBUG(Loader, "DATA: %u pages\n", data_load_size / 0x1000); |
| 205 | DEBUG_LOG(LOADER, "BSS: %u pages\n", bss_load_size / 0x1000); | 205 | LOG_DEBUG(Loader, "BSS: %u pages\n", bss_load_size / 0x1000); |
| 206 | 206 | ||
| 207 | return ERROR_NONE; | 207 | return ERROR_NONE; |
| 208 | } | 208 | } |
| @@ -220,7 +220,7 @@ int THREEDSXReader::Load3DSXFile(const std::string& filename, u32 base_addr) | |||
| 220 | * @return Success on success, otherwise Error | 220 | * @return Success on success, otherwise Error |
| 221 | */ | 221 | */ |
| 222 | ResultStatus AppLoader_THREEDSX::Load() { | 222 | ResultStatus AppLoader_THREEDSX::Load() { |
| 223 | INFO_LOG(LOADER, "Loading 3DSX file %s...", filename.c_str()); | 223 | LOG_INFO(Loader, "Loading 3DSX file %s...", filename.c_str()); |
| 224 | FileUtil::IOFile file(filename, "rb"); | 224 | FileUtil::IOFile file(filename, "rb"); |
| 225 | if (file.IsOpen()) { | 225 | if (file.IsOpen()) { |
| 226 | 226 | ||