diff options
| author | 2015-10-10 14:42:17 -0400 | |
|---|---|---|
| committer | 2015-10-10 14:42:17 -0400 | |
| commit | 04325e5980a649bea58aad349fc04eaf403aba3a (patch) | |
| tree | dd23b69022f0b3df4a6c5542483c9f85258388ee /src/core/loader/3dsx.cpp | |
| parent | Merge pull request #1195 from Gareth422/secondary (diff) | |
| parent | CitraQt, SkyEye, Loader, VideoCore: Remove newlines in LOG_* calls. (diff) | |
| download | yuzu-04325e5980a649bea58aad349fc04eaf403aba3a.tar.gz yuzu-04325e5980a649bea58aad349fc04eaf403aba3a.tar.xz yuzu-04325e5980a649bea58aad349fc04eaf403aba3a.zip | |
Merge pull request #1194 from linkmauve/no-newline
Remove newlines in LOG_* calls
Diffstat (limited to 'src/core/loader/3dsx.cpp')
| -rw-r--r-- | src/core/loader/3dsx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index 111b6a409..8eed6a50a 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp | |||
| @@ -181,14 +181,14 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr, Shared | |||
| 181 | 181 | ||
| 182 | for (unsigned current_inprogress = 0; current_inprogress < remaining && pos < end_pos; current_inprogress++) { | 182 | for (unsigned current_inprogress = 0; current_inprogress < remaining && pos < end_pos; current_inprogress++) { |
| 183 | const auto& table = reloc_table[current_inprogress]; | 183 | const auto& table = reloc_table[current_inprogress]; |
| 184 | LOG_TRACE(Loader, "(t=%d,skip=%u,patch=%u)\n", current_segment_reloc_table, | 184 | LOG_TRACE(Loader, "(t=%d,skip=%u,patch=%u)", current_segment_reloc_table, |
| 185 | (u32)table.skip, (u32)table.patch); | 185 | (u32)table.skip, (u32)table.patch); |
| 186 | pos += table.skip; | 186 | pos += table.skip; |
| 187 | s32 num_patches = table.patch; | 187 | s32 num_patches = table.patch; |
| 188 | while (0 < num_patches && pos < end_pos) { | 188 | while (0 < num_patches && pos < end_pos) { |
| 189 | u32 in_addr = (u8*)pos - program_image.data(); | 189 | u32 in_addr = (u8*)pos - program_image.data(); |
| 190 | u32 addr = TranslateAddr(*pos, &loadinfo, offsets); | 190 | u32 addr = TranslateAddr(*pos, &loadinfo, offsets); |
| 191 | LOG_TRACE(Loader, "Patching %08X <-- rel(%08X,%d) (%08X)\n", | 191 | LOG_TRACE(Loader, "Patching %08X <-- rel(%08X,%d) (%08X)", |
| 192 | base_addr + in_addr, addr, current_segment_reloc_table, *pos); | 192 | base_addr + in_addr, addr, current_segment_reloc_table, *pos); |
| 193 | switch (current_segment_reloc_table) { | 193 | switch (current_segment_reloc_table) { |
| 194 | case 0: | 194 | case 0: |