summaryrefslogtreecommitdiffstats
path: root/src/core/loader/3dsx.cpp
diff options
context:
space:
mode:
authorAlexander Laties <alex.laties@gmail.com>2016-04-25 22:10:03 +0200
committerAlexander Laties <alex.laties@gmail.com>2016-05-07 17:41:55 +0200
commit0a31e373f1728316b3dfed391ddcb99a474e4102 (patch)
tree1b1bcf1af2398481e7208610f6a2e49264fe11db /src/core/loader/3dsx.cpp
parentMerge pull request #1736 from MerryMage/sdl2-sink (diff)
downloadyuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.gz
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.bz2
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.lz
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.xz
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.zst
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.zip
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
for (unsigned current_inprogress = 0; current_inprogress < remaining && pos < end_pos; current_inprogress++) {
const auto& table = reloc_table[current_inprogress];
LOG_TRACE(Loader, "(t=%d,skip=%u,patch=%u)", current_segment_reloc_table,
- (u32)table.skip, (u32)table.patch);
+ static_cast<u32>(table.skip), static_cast<u32>(table.patch));
pos += table.skip;
s32 num_patches = table.patch;
while (0 < num_patches && pos < end_pos) {
- u32 in_addr = (u8*)pos - program_image.data();
+ u32 in_addr = static_cast<u32>(reinterpret_cast<u8*>(pos) - program_image.data());
u32 addr = TranslateAddr(*pos, &loadinfo, offsets);
LOG_TRACE(Loader, "Patching %08X <-- rel(%08X,%d) (%08X)",
base_addr + in_addr, addr, current_segment_reloc_table, *pos);
@@ -284,7 +284,7 @@ ResultStatus AppLoader_THREEDSX::ReadRomFS(std::shared_ptr<FileUtil::IOFile>& ro
// Check if the 3DSX has a RomFS...
if (hdr.fs_offset != 0) {
u32 romfs_offset = hdr.fs_offset;
- u32 romfs_size = file.GetSize() - hdr.fs_offset;
+ u32 romfs_size = static_cast<u32>(file.GetSize()) - hdr.fs_offset;
LOG_DEBUG(Loader, "RomFS offset: 0x%08X", romfs_offset);
LOG_DEBUG(Loader, "RomFS size: 0x%08X", romfs_size);