MacKwnoX/NX2navi
1
0
Fork 0
mirror of https://github.com/tangerineturtle1/NX2navi.git synced 2026-11-15 19:19:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a JUMP_SLOT relocation's addend when it binds a guest function, and log one on a host function.

Browse Source 
The loader added the addend for ABS64 and GLOB_DAT and always dropped it for JUMP_SLOT, though the AArch64 ELF ABI
gives S + A for all three. A JUMP_SLOT that binds a guest function now gets its addend too; one that binds a host
function (an override or an observer, where an offset into the trampoline means nothing) drops it and logs the
relocation, so a module that ever carries one shows up in the log instead of jumping to the wrong place.

Checked: the runtime compiles. The game's three modules hold 11,698 JUMP_SLOT relocations, none with a nonzero addend
(read from the 1.1.1 ExeFS), so nothing changes for this game.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
chrg6
2026-11-11 17:30:30 -05:00
parent 79b36044b0
commit 4b23c4da09
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/loader.c
View File

@@ -365,7 +365,17 @@ static void relocate_table(Mod *m, const Elf64Rela *r, uint64_t n) {
if (sym_defined(m, si)) m->sym_own++;
else m->sym_import++;
Res s = resolve(m, si, type == R_JUMP_SLOT);
v = s.kind == RES_WEAK ? 0 : s.value + (type == R_JUMP_SLOT ? 0 : (uint64_t)r[i].addend);
// S + A for every symbolic type (the AArch64 ELF ABI), JUMP_SLOT included where the symbol is a guest
// function; linkers write 0 there. A host function's address takes no addend (an offset into a host
// trampoline means nothing), so such an addend is logged and dropped, as is one on an unresolved weak symbol
// (address 0, the guest's own test for an absent function).
int64_t a = r[i].addend;
if (type == R_JUMP_SLOT && a && s.kind != RES_GUEST) {
rt_log("loader: %s JUMP_SLOT relocation %llu for %s carries addend %lld on a host function: left out",
m->pub.name, (unsigned long long)i, sym_name(m, si), (long long)a);
a = 0;
}
v = s.kind == RES_WEAK ? 0 : s.value + (uint64_t)a;
}
ST64(base + r[i].off, v);
}