mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-27 18:52:11 -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>
20 lines
816 B
Python
20 lines
816 B
Python
"""Sample Tomba's state machine state every 500ms for 15 sec."""
|
|
import time, sys
|
|
sys.path.insert(0, 'F:/Projects/psxrecomp-v4/tools/_options_session')
|
|
import _dbg
|
|
|
|
prev = None
|
|
for i in range(30):
|
|
ptr = _dbg.read_word(4470, 0x1F8001D4)
|
|
state_word = _dbg.read_word(4470, ptr + 0x4C) # halfword at +0x4E in upper16
|
|
state = (state_word >> 16) & 0xFFFF
|
|
# Also read the first 16 bytes of the struct (likely has fields)
|
|
head = _dbg.read_word(4470, ptr + 0x00)
|
|
flag2 = _dbg.read_word(4470, ptr + 0x44)
|
|
p = _dbg.call(4470, "ping", timeout=2)
|
|
sig = (ptr, state, head, flag2)
|
|
star = " *CHANGED*" if prev and prev != sig else ""
|
|
print(f"[{i:2}] fr={p.get('frame','?')} ptr=0x{ptr:08X} state=0x{state:04X} head=0x{head:08X} flag2=0x{flag2:08X}{star}")
|
|
prev = sig
|
|
time.sleep(0.5)
|