summaryrefslogtreecommitdiff
path: root/src/core/loader/3dsx.cpp
diff options
context:
space:
mode:
authorGravatar Alexander Laties2016-04-25 16:10:03 -0400
committerGravatar Alexander Laties2016-05-07 11:41:55 -0400
commit0a31e373f1728316b3dfed391ddcb99a474e4102 (patch)
tree1b1bcf1af2398481e7208610f6a2e49264fe11db /src/core/loader/3dsx.cpp
parentMerge pull request #1736 from MerryMage/sdl2-sink (diff)
downloadyuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.gz
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.xz
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.zip
fixup simple type conversions where possible
Diffstat (limited to 'src/core/loader/3dsx.cpp')
-rw-r--r--src/core/loader/3dsx.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index 48a11ef81..98e7ab48f 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -178,11 +178,11 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr, Shared
178 for (unsigned current_inprogress = 0; current_inprogress < remaining && pos < end_pos; current_inprogress++) { 178 for (unsigned current_inprogress = 0; current_inprogress < remaining && pos < end_pos; current_inprogress++) {
179 const auto& table = reloc_table[current_inprogress]; 179 const auto& table = reloc_table[current_inprogress];
180 LOG_TRACE(Loader, "(t=%d,skip=%u,patch=%u)", current_segment_reloc_table, 180 LOG_TRACE(Loader, "(t=%d,skip=%u,patch=%u)", current_segment_reloc_table,
181 (u32)table.skip, (u32)table.patch); 181 static_cast<u32>(table.skip), static_cast<u32>(table.patch));
182 pos += table.skip; 182 pos += table.skip;
183 s32 num_patches = table.patch; 183 s32 num_patches = table.patch;
184 while (0 < num_patches && pos < end_pos) { 184 while (0 < num_patches && pos < end_pos) {
185 u32 in_addr = (u8*)pos - program_image.data(); 185 u32 in_addr = static_cast<u32>(reinterpret_cast<u8*>(pos) - program_image.data());
186 u32 addr = TranslateAddr(*pos, &loadinfo, offsets); 186 u32 addr = TranslateAddr(*pos, &loadinfo, offsets);
187 LOG_TRACE(Loader, "Patching %08X <-- rel(%08X,%d) (%08X)", 187 LOG_TRACE(Loader, "Patching %08X <-- rel(%08X,%d) (%08X)",
188 base_addr + in_addr, addr, current_segment_reloc_table, *pos); 188 base_addr + in_addr, addr, current_segment_reloc_table, *pos);
@@ -284,7 +284,7 @@ ResultStatus AppLoader_THREEDSX::ReadRomFS(std::shared_ptr<FileUtil::IOFile>& ro
284 // Check if the 3DSX has a RomFS... 284 // Check if the 3DSX has a RomFS...
285 if (hdr.fs_offset != 0) { 285 if (hdr.fs_offset != 0) {
286 u32 romfs_offset = hdr.fs_offset; 286 u32 romfs_offset = hdr.fs_offset;
287 u32 romfs_size = file.GetSize() - hdr.fs_offset; 287 u32 romfs_size = static_cast<u32>(file.GetSize()) - hdr.fs_offset;
288 288
289 LOG_DEBUG(Loader, "RomFS offset: 0x%08X", romfs_offset); 289 LOG_DEBUG(Loader, "RomFS offset: 0x%08X", romfs_offset);
290 LOG_DEBUG(Loader, "RomFS size: 0x%08X", romfs_size); 290 LOG_DEBUG(Loader, "RomFS size: 0x%08X", romfs_size);