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>
31 lines
1.2 KiB
Python
31 lines
1.2 KiB
Python
import sys, struct
|
|
sys.path.insert(0, 'F:/Projects/psxrecomp-v4/tools/_options_session')
|
|
import _dbg
|
|
|
|
# Read scratchpad ptr at 0x1F8001D4
|
|
ptr_word = _dbg.read_word(4470, 0x1F8001D4)
|
|
print(f"scratchpad[0x1D4] = ptr 0x{ptr_word:08X}")
|
|
|
|
# Read mem[ptr + 0x4E] (halfword), and surrounding bytes for context
|
|
r = _dbg.call(4470, 'read_ram', addr=f'0x{ptr_word:08X}', len=0x80, timeout=3)
|
|
b = bytes.fromhex(r['hex'])
|
|
print(f"\nContents of mem[{ptr_word:08X}..]:")
|
|
for i in range(0, len(b), 16):
|
|
line = ' '.join(f'{x:02x}' for x in b[i:i+16])
|
|
print(f" +{i:02X}: {line}")
|
|
|
|
state = struct.unpack_from('<H', b, 0x4E)[0]
|
|
print(f"\nstate_index = mem[ptr+0x4E] (halfword) = 0x{state:04X} ({state} decimal)")
|
|
if state < 6:
|
|
print(f" -> would dispatch via jump table 0x800E738C[{state}]")
|
|
else:
|
|
print(f" -> state >= 6, chain handler SKIPS (this is the 'do nothing' branch)")
|
|
|
|
# Read the jump table itself to see what each state would do
|
|
jt = _dbg.call(4470, 'read_ram', addr='0x800E738C', len=6*4, timeout=3)
|
|
jtb = bytes.fromhex(jt['hex'])
|
|
print(f"\nJump table 0x800E738C (6 entries):")
|
|
for i in range(6):
|
|
tgt = struct.unpack_from('<I', jtb, i*4)[0]
|
|
print(f" state={i}: target=0x{tgt:08X}")
|