mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-28 19:07:47 -04:00
Matthew Stanley
685687f36f
Recovery + restructure after rm -rf destroyed duckstation/build/ earlier this session. Adopts the nesrecomp pattern (see F:/Projects/nesrecomp): pristine upstream as submodule, our changes as a patch file that gets auto-applied by a setup script. Submodule: - duckstation/ now pins stenzek/duckstation@ffb33c281 (release-20260328 era) - .gitmodules records the pin; .gitignore stops ignoring the submodule path but still ignores build/ and dep/prebuilt/ (the submodule's own .gitignore also handles these) Patch + setup: - tools/duckstation/psxrecomp_oracle.patch (1187 lines, 7 files) captures our TCP debug-server on port 4371 plus the unfinished pc_break family of commands (with the VirtualMemoryAddress compile fix) - tools/duckstation/setup.sh clones submodule, fetches + verifies + extracts prebuilt Windows deps, rewrites stale absolute paths baked into the prebuilt CMake metadata, applies the oracle patch. Idempotent. - tools/duckstation/build.sh configures CMake (VS 17 2022) + runs MSBuild, then provisions bin/ with portable marker, BIOS copy, and settings.ini post-fixes - tools/duckstation/README.md documents the layout, the regeneration flow, and the known headless-boot configuration issue TCP documentation (salvaged from v3): - TCP_COMMANDS.md: full command table with native (4370) / duckstation (4371) / both columns, reflecting actual v4 implementation including wtrace_* and pc_break/pc_hit_last families - tools/debug_client.py: unified CLI from v3 (ports 4370/4371 match v4) - DEBUG.md: merged v3's END-TO-END COMPLETION RULE, Stale Hypothesis Rule, TOOLING RULE, and TOOL LIFECYCLE RULE sections into v4's existing loop Phase 4 diagnostic artefacts from this session: - generated/relocation_proofs/vblank_registrar/ — corrected VBlank-stall diagnosis. Prior handoff claimed the shell VBlank handler was never installed; live TCP inspection of both runtime and DuckStation oracle proved handler IS installed at 0x800DFEE0. Real gap is one level up in the kernel IRQ chain at *(0xA000E014). - tools/duck_query*.py, duck_search.py, disasm_ram.py, scan_*.py — focused probes used to establish the above; reusable against either server CLAUDE.md §2 and new §15 document the submodule-based oracle setup and the "never edit submodule, regenerate patch instead" rule. Known issues (tracked in tools/duckstation/README.md): - Fresh settings.ini doesn't complete BIOS boot under -nogui; one-time launch with GUI is required to warm up the settings before headless mode works Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
62 lines
2.0 KiB
Python
62 lines
2.0 KiB
Python
"""Search DuckStation's RAM for marker addresses via TCP debug server."""
|
|
import socket, json, sys
|
|
|
|
HOST='127.0.0.1'; PORT=4371
|
|
|
|
def send(cmd):
|
|
s=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
s.settimeout(5)
|
|
s.connect((HOST,PORT))
|
|
s.sendall((json.dumps(cmd)+'\n').encode())
|
|
buf=b''
|
|
while True:
|
|
try: chunk=s.recv(65536)
|
|
except socket.timeout: break
|
|
if not chunk: break
|
|
buf+=chunk
|
|
if b'\n' in buf: break
|
|
s.close()
|
|
line = buf.split(b'\n',1)[0].decode()
|
|
return json.loads(line)
|
|
|
|
def search(start, length, markers, label_per_marker):
|
|
"""Read [start, start+length) bytes; find each marker (hex string LE) in the data."""
|
|
chunk = 8192
|
|
found = {m:[] for m in markers}
|
|
off = 0
|
|
while off < length:
|
|
n = min(chunk, length-off)
|
|
r = send({"cmd":"read_ram", "addr": f"0x{start+off:08X}", "len": n})
|
|
if not r.get('ok'): print('ERR', r); return found
|
|
hex_str = r['hex']
|
|
for m in markers:
|
|
pos=0
|
|
while True:
|
|
i = hex_str.find(m, pos)
|
|
if i<0: break
|
|
byte_off = i//2
|
|
ram_addr = start + off + byte_off
|
|
found[m].append(ram_addr)
|
|
pos = i+1
|
|
off += n
|
|
for m in markers:
|
|
label = label_per_marker.get(m, m)
|
|
for a in found[m]:
|
|
print(f'{label}: RAM phys=0x{a:08X} (KSEG0=0x{0x80000000|a:08X})')
|
|
if not found[m]:
|
|
print(f'{label}: NOT FOUND in [0x{start:08X}..0x{start+length:08X})')
|
|
return found
|
|
|
|
if __name__=='__main__':
|
|
# Markers are little-endian hex of target addresses
|
|
markers = {
|
|
'bca50580': '0x8005A5BC handler (vblank chain)',
|
|
'40a50580': '0x8005A540 registrar',
|
|
'60a10580': '0x8005A160 init function',
|
|
'24a40580': '0x8005A424 cleanup',
|
|
'80a30580': '0x8005A380 dispatch',
|
|
'fca50580': '0x8005A5FC SetVSync',
|
|
}
|
|
# Search all 2MB of RAM
|
|
search(0x00000000, 0x00200000, list(markers.keys()), markers)
|