summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-01-19 05:30:59 +0100
committerGitHub <noreply@github.com>2017-01-19 05:30:59 +0100
commitebe0150635340ff79a0323245b40b082fe380360 (patch)
tree5e97ceef016df9eabafa34688314430d0afc6206 /src/core
parentMerge pull request #2442 from wwylele/hid-signal (diff)
parentloader: Add support for 3DSX special relocation types, fixes citra-emu/citra#2449 (diff)
downloadyuzu-ebe0150635340ff79a0323245b40b082fe380360.tar
yuzu-ebe0150635340ff79a0323245b40b082fe380360.tar.gz
yuzu-ebe0150635340ff79a0323245b40b082fe380360.tar.bz2
yuzu-ebe0150635340ff79a0323245b40b082fe380360.tar.lz
yuzu-ebe0150635340ff79a0323245b40b082fe380360.tar.xz
yuzu-ebe0150635340ff79a0323245b40b082fe380360.tar.zst
yuzu-ebe0150635340ff79a0323245b40b082fe380360.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/loader/3dsx.cpp34
1 files changed, 25 insertions, 9 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index 1c10740a0..09266e8b0 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -177,18 +177,34 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr,
pos += table.skip;
s32 num_patches = table.patch;
while (0 < num_patches && pos < end_pos) {
- 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);
+ u32 in_addr = base_addr + static_cast<u32>(reinterpret_cast<u8*>(pos) -
+ program_image.data());
+ u32 orig_data = *pos;
+ u32 sub_type = orig_data >> (32 - 4);
+ u32 addr = TranslateAddr(orig_data & ~0xF0000000, &loadinfo, offsets);
+ LOG_TRACE(Loader, "Patching %08X <-- rel(%08X,%d) (%08X)", in_addr, addr,
+ current_segment_reloc_table, *pos);
switch (current_segment_reloc_table) {
- case 0:
- *pos = (addr);
+ case 0: {
+ if (sub_type != 0)
+ return ERROR_READ;
+ *pos = addr;
break;
- case 1:
- *pos = static_cast<u32>(addr - in_addr);
+ }
+ case 1: {
+ u32 data = addr - in_addr;
+ switch (sub_type) {
+ case 0: // 32-bit signed offset
+ *pos = data;
+ break;
+ case 1: // 31-bit signed offset
+ *pos = data & ~(1U << 31);
+ break;
+ default:
+ return ERROR_READ;
+ }
break;
+ }
default:
break; // this should never happen
}