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>
48 lines
1.7 KiB
Python
48 lines
1.7 KiB
Python
"""Look for the outer caller of FUN_bfc08b3c (= 0x00008B3C in recompiled form)."""
|
|
import json, sys
|
|
from collections import Counter
|
|
|
|
path = sys.argv[1] if len(sys.argv) > 1 else \
|
|
'F:/Projects/TombaRecomp/psx_freeze_dump_psx-runtime_1778800465.json'
|
|
|
|
with open(path) as f:
|
|
d = json.load(f)
|
|
|
|
# Print all distinct func addresses in fn_entry, sorted by occurrence
|
|
fn_c = Counter(e['func'] for e in d['fn_entry'])
|
|
print(f'Total distinct funcs in fn_entry: {len(fn_c)}')
|
|
print()
|
|
|
|
# Are there any direct entries to 0x00008B3C or 0xBFC08B3C?
|
|
candidates = [f for f in fn_c if int(f, 16) in (0x00008B3C, 0xBFC08B3C, 0x80008B3C)]
|
|
print(f'Direct entries to FUN_bfc08b3c: {candidates}')
|
|
|
|
# Any entries to 0x9144 (FUN_bfc09144)?
|
|
candidates = [f for f in fn_c if int(f, 16) in (0x00009144, 0xBFC09144)]
|
|
print(f'Direct entries to FUN_bfc09144: {[(f, fn_c[f]) for f in candidates]}')
|
|
|
|
# What about all funcs in 0x8000-0x9999 range (BIOS shell card area)?
|
|
print()
|
|
print('All BIOS shell area funcs in fn_entry (0x8000-0x9FFF):')
|
|
for f, c in sorted(fn_c.items(), key=lambda x: int(x[0], 16)):
|
|
addr = int(f, 16)
|
|
if 0x8000 <= addr < 0xA000:
|
|
print(f' {f}: {c}')
|
|
|
|
# What about Tomba code (0x80000000+)?
|
|
print()
|
|
print('All Tomba code funcs in fn_entry (0x80000000+):')
|
|
for f, c in sorted(fn_c.items(), key=lambda x: int(x[0], 16)):
|
|
addr = int(f, 16)
|
|
if 0x80000000 <= addr:
|
|
print(f' {f}: {c}')
|
|
|
|
# What RA values come back from Tomba functions?
|
|
print()
|
|
print('Distinct RA values for Tomba-function entries:')
|
|
for target in ('0x80068024', '0x80068098', '0x80068554'):
|
|
print(f' {target}:')
|
|
ra_c = Counter(e['ra'] for e in d['fn_entry'] if e['func'] == target)
|
|
for ra, c in ra_c.most_common(5):
|
|
print(f' RA={ra}: {c}')
|