mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-27 10:38:46 -04:00
Matthew Stanley
fdbd2b515f
Two distinct bugs were causing OPTIONS-black hard freezes after 12K-65K frames: 1. interrupts.c + traps.c: exception_jmpbuf is a single global. setjmp captures the running fiber, but longjmp may be requested from a different fiber via psx_exception_longjmp / psx_restore_state_escape during chain-handler dispatch. Cross-fiber longjmp restores RSP to the wrong stack while Win32 still tracks the calling fiber, corrupting fiber state until SwitchToFiber eventually hangs. Fix: track g_exception_owner_fiber at setjmp time. New deferred_exception_longjmp checks the current fiber; if it's not the owner, sets a pending flag and SwitchToFiber's back to the owner. psx_change_thread_fiber's post-SwitchToFiber path observes the flag and executes the longjmp on the correct stack. 2. gpu.c: gpu_read_gpustat fired gpu_vblank_tick() after 1000 polls, which invoked sdl_vblank_present (SDL_Delay -> Sleep) from inside an MMIO read code path. That meant recompiled MIPS spent wall time in Sleep deep inside the fiber call tree -- confusing to reason about and a contributor to fiber/longjmp interactions. Fix: synthetic VBLANK from a poll-storm only updates emulation state (LCF + I_STAT). The host-side render+sleep happens only at the proper cycle-paced VBLANK trigger in psx_check_interrupts. Also adds: dirty_block ring slice to the freeze auto-dump, Win32 main- thread stack capture for wedge_kind=1 hard freezes (SuspendThread + StackWalk64 + SymFromAddr), and dbghelp link. Validated: TombaRecomp psx-runtime ran 30+ minutes / 105K+ frames at OPTIONS with no hard freeze. Previous freezes consistently hit at 11900, 20493, and 64596 frames. Diagnostic tooling under tools/_options_session/ that produced this diagnosis is included. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
84 lines
3.1 KiB
Python
84 lines
3.1 KiB
Python
"""Diff critical memory addresses between runtime (4470) and beetle (4380)
|
|
to find where Tomba's state machine diverges in OPTIONS-black."""
|
|
import sys, struct
|
|
sys.path.insert(0, 'F:/Projects/psxrecomp-v4/tools/_options_session')
|
|
import _dbg
|
|
|
|
def read_word(port, addr):
|
|
try:
|
|
return _dbg.read_word(port, addr)
|
|
except Exception as e:
|
|
return f"ERR: {e}"
|
|
|
|
def read_bytes(port, addr, n):
|
|
try:
|
|
r = _dbg.call(port, 'read_ram', addr=f'0x{addr:08X}', len=n, timeout=4)
|
|
if not r.get('ok'): return f"ERR: {r}"
|
|
return bytes.fromhex(r['hex'])
|
|
except Exception as e:
|
|
return f"ERR: {e}"
|
|
|
|
# Ping both
|
|
p_rt = _dbg.call(4470, "ping", timeout=2)
|
|
p_be = _dbg.call(4380, "ping", timeout=2)
|
|
print(f"runtime fr={p_rt.get('frame','?')} | beetle fr={p_be.get('frame','?')}")
|
|
print()
|
|
|
|
# Critical addresses to compare
|
|
print(f"{'addr':>12} {'runtime':>12} {'beetle':>12} {'match':>6}")
|
|
addrs = [
|
|
(0x1F8001D4, "scratchpad+0x1D4 (state-struct ptr)"),
|
|
(0x80097520, "fn ptr table+0"),
|
|
(0x80097524, "fn ptr table+4 (state-0 helper)"),
|
|
(0x80097528, "fn ptr table+8"),
|
|
(0x8009752C, "fn ptr table+C"),
|
|
(0x8009B3A0, "state-0 helper return ptr (first word)"),
|
|
(0x8009B3D4, "*** mem[ptr+0x34] high half check"),
|
|
(0x8009EB58, "side-path read"),
|
|
]
|
|
for addr, label in addrs:
|
|
rt = read_word(4470, addr)
|
|
be = read_word(4380, addr)
|
|
if isinstance(rt, int) and isinstance(be, int):
|
|
m = "OK" if rt == be else "*DIFF*"
|
|
print(f" 0x{addr:08X} 0x{rt:08X} 0x{be:08X} {m} {label}")
|
|
else:
|
|
print(f" 0x{addr:08X} {rt} {be} ? {label}")
|
|
|
|
# Compare the full state struct (256 bytes from runtime's ptr)
|
|
print()
|
|
print("=== Full state struct comparison ===")
|
|
rt_ptr = read_word(4470, 0x1F8001D4)
|
|
be_ptr = read_word(4380, 0x1F8001D4)
|
|
print(f"runtime ptr = 0x{rt_ptr:08X}, beetle ptr = 0x{be_ptr:08X}")
|
|
if rt_ptr == be_ptr and isinstance(rt_ptr, int):
|
|
rt_buf = read_bytes(4470, rt_ptr, 256)
|
|
be_buf = read_bytes(4380, be_ptr, 256)
|
|
if isinstance(rt_buf, bytes) and isinstance(be_buf, bytes):
|
|
for i in range(0, 256, 16):
|
|
rt_row = rt_buf[i:i+16]
|
|
be_row = be_buf[i:i+16]
|
|
if rt_row != be_row:
|
|
diff = ' '.join('!!' if rt_row[j] != be_row[j] else '..' for j in range(16))
|
|
print(f" +0x{i:03X} RT: {' '.join(f'{x:02x}' for x in rt_row)}")
|
|
print(f" BE: {' '.join(f'{x:02x}' for x in be_row)}")
|
|
print(f" {diff}")
|
|
print()
|
|
|
|
# Compare 0x8009B3A0 helper return struct too
|
|
print()
|
|
print("=== 0x8009B3A0 helper-return struct (256 bytes) ===")
|
|
rt_buf = read_bytes(4470, 0x8009B3A0, 256)
|
|
be_buf = read_bytes(4380, 0x8009B3A0, 256)
|
|
if isinstance(rt_buf, bytes) and isinstance(be_buf, bytes):
|
|
any_diff = False
|
|
for i in range(0, 256, 16):
|
|
rt_row = rt_buf[i:i+16]
|
|
be_row = be_buf[i:i+16]
|
|
if rt_row != be_row:
|
|
any_diff = True
|
|
print(f" +0x{i:03X} RT: {' '.join(f'{x:02x}' for x in rt_row)}")
|
|
print(f" BE: {' '.join(f'{x:02x}' for x in be_row)}")
|
|
if not any_diff:
|
|
print(" (IDENTICAL)")
|