mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-26 02:11:36 -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>
24 lines
1.1 KiB
Python
24 lines
1.1 KiB
Python
"""Show main_stack from a freeze dump."""
|
|
import json, sys
|
|
dump = sys.argv[1] if len(sys.argv) > 1 else \
|
|
'F:/Projects/TombaRecomp/psx_freeze_dump_psx-runtime_1778826348.json'
|
|
with open(dump) as f:
|
|
d = json.load(f)
|
|
|
|
print(f"=== {d['backend']} @ wall={d['wall_clock_epoch']} ===")
|
|
print(f" frame_count: {d['frame_count']}, psx_cyc: {d['psx_cycle_count']:,}")
|
|
print(f" wedge_kind: {d['wedge_kind']} ({d['wedge_kind_name']})")
|
|
print(f" in_exception: {d['in_exception']}, cur_fn: {d['current_func']}, last_store_pc: {d['last_store_pc']}")
|
|
print(f" exc_entries: {d['exception_entries']:,}, exc_reentry: {d['exception_reentry_blocks']:,}")
|
|
print(f" i_stat: {d['i_stat']}, i_mask: {d['i_mask']}")
|
|
print(f" sio_stat: {d['sio_stat']}, sio_ctrl: {d['sio_ctrl']}, sio_card_active: {d['sio_card_active']}, mc_max_state: {d['mc_max_state']}")
|
|
print()
|
|
|
|
ms = d.get('main_stack', [])
|
|
print(f"=== main_stack ({len(ms)} frames) ===")
|
|
for f in ms:
|
|
s = f.get('symbol', '???')
|
|
o = f.get('displacement', '?')
|
|
m = f.get('module', '?')
|
|
print(f" [{f['depth']:>3}] {f['addr']} {m}!{s}+0x{int(o):X}" if o != '?' else f" [{f['depth']:>3}] {f['addr']} {m}!{s}")
|