shifathosn
/
AnyPS5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(relinker): make guest_module_args run its native path 

The machine check compared against 'x86-64' (uname reports 'x86_64'), so the
native execution was always skipped. With it enabled the fixture itself was
wrong: the initialiser's rip-relative call used the wrong displacement, and
the pending block was set on a different copy of the host library than the
one the module binds to.

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Adrià Franch 2026-10-10 00:23:46 +02:00
parent 7d1821e3ab
commit 8868d563b5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/relinker/relinker/tests/test_guest_module_args.py
View File

@ -36,7 +36,7 @@ def args_module():
struct.pack_into('<II', image, 0x2500, 1, 3)
struct.pack_into('<QQq', image, 0x2700, 0x2820, (1 << 32) | 6, 0)
image[0x1000:0x1006] = b'\xb8\x2a\0\0\0\xc3'
code = b'\x48\x83\xec\x08\xff\x15' + struct.pack('<i', 0x2820 - 0x1016)
code = b'\x48\x83\xec\x08\xff\x15' + struct.pack('<i', 0x2820 - 0x101a)
code += b'\x48\x83\xc4\x08\xb8' + struct.pack('<I', RETURNED) + b'\xc3'
image[0x1010:0x1010 + len(code)] = code
return image
@ -63,7 +63,7 @@ def main():
return
relinker = Path(sys.argv[1]).resolve()
host = Path(sys.argv[2]).resolve()
native = sys.platform == 'linux' and os.uname().machine == 'x86-64'
native = sys.platform == 'linux' and os.uname().machine == 'x86_64'
with tempfile.TemporaryDirectory(prefix='anyps5-guest-args-') as directory:
work = Path(directory)
modules = work / 'sce_module'
@ -102,10 +102,10 @@ def main():
libraries.mkdir()
shutil.copyfile(host, libraries / 'libc.prx')
events = work / 'events.txt'
run = subprocess.run([sys.executable, __file__, '--load', str(host), str(converted)],
run = subprocess.run([sys.executable, __file__, '--load', str(libraries / 'libc.prx'), str(converted)],
env={**os.environ, 'ANYPS5_GUEST_MODULE_ARGS': str(events)},
capture_output=True, text=True, timeout=30)
assert run.returncode == 0, (run.stdout, run.stderr)
assert run.returncode == 0, (run.returncode, run.stdout, run.stderr)
recorded = events.read_text()
assert f'args={ARGS:016x} argp={ARGP:016x}' in recorded, recorded
assert f'result={RETURNED}' in recorded, recorded