mirror of
https://github.com/Druthulu/BFM-decomp
synced 2026-09-26 13:33:34 -04:00
Drew T
757bd82a0f
The §9.1 "scattered .bss commons" exclusion class (Phase 8 → P31) is closed 3/3. New tools/psyq_bss_split.py (own ELF32 REL reader/writer) cuts an object's packed .bss into per-base NOBITS pieces: bases derived from the game bytes per HI16/LO16 pair, references walked in offset order into single-base runs, cuts snapped to symbol starts (the linker scattered SYMBOLS), symbols moved, a LOCAL section symbol per piece inserted, relocs retargeted with the addend rewritten in the immediates, self-diffed. It runs inside the one prepare step shared by psyq_link.link_object / psyq_link_region.build_region / psyq_integrate.integrate (prepare_object before classify), re-derived every build. GS_001.o was certified "5 interleaved bases, NOT splittable" by the S77 probe, which grouped by BASE; by RUN it is six symbol-aligned pieces. All seven cuts across the three objects are confirmed by the other objects' by-name recoveries (_que 0x800C5510, _svm_sreg_buf 0x800B9B58, PSDBASEX/CLIP2/PSDBASEY/POSITION/GsDRAWENV). R39 negative control: 235 placed objects across 9 curated dirs, 0 refusals, exactly 3 splits (a libcd .bss+size end pointer refused the first build → reference problems are fatal only when a split is needed). Wiring: yaml 800c→libgpu2, sgap_6→sgap_6+snd12, gsgap3→libgs8 (comments rewritten); LIBGPU_ELF := .run/obj40/libgpu (curated libgpu_used retired); libgs 34 objs/8 blocks (make_libgs.sh +GS_001); snd 63/12 (make_snd_used.py exclusions 4→3). src/800c.c and src/gsgap3.c removed (Sony code hand-matched as REAL/verbatim), sgap_6.c keeps only func_8003FA54; splat-emitted libgpu2.c/libgs8.c/snd12.c stubs for the no-SDK fallback. Verified: main 143dbb89f34491258bbc27810d0a12ec8b43a8dd WITH the SDK objects and WITHOUT them from a fresh extract; make tools-health OK; R22 fleet clean extract-all 212/212 + check-all 213/213. Metrics: main REAL 886→839, LINKED 1,040→1,150, VERBATIM 85→29, stubs 29 (unchanged); game-code weighted 91.1% (40,895/44,870) — both terms lost the 3,667 SDK ins; the remainder is still exactly the 3,975-ins open-stub sum. Verbatim manifest --update 200→33 rows (subtractive). Docs: cookbook §489 (+index), psyq-worklist rows + "S78 task #4", SETUP S79 R21 table, decision-log S79 addendum, accelerators S79, CURRENT_PHASE S79 FINAL 🛑.
50 lines
3.3 KiB
Bash
50 lines
3.3 KiB
Bash
#!/usr/bin/env bash
|
|
# Regenerate the curated libgs object dir (.run/obj40/libgs_used) for the Phase-7 FULL-libgs
|
|
# integration (Makefile LIBGS_ELF). SDK-derived + gitignored, like .run/obj40/libcd; the build is
|
|
# byte-identical WITH or WITHOUT it (the stubs reproduce the same bytes), so this only matters to a
|
|
# developer who wants the real SDK objects linked. Needs the LIBGS ELF objects from
|
|
# tools/psyq_build_libs.sh LIBGS (which needs tools/psyq/lib40/LIBGS.LIB from the DTL-S2002 redump).
|
|
#
|
|
# These are the 34 libgs objects BFM links, forming 8 contiguous blocks across vram
|
|
# 0x8005080C-0x80057928 (the 4 remaining non-libgs gaps are libgte objects, wired as libgte27-30):
|
|
# block 7: 2D_BG0 2D_BG1 (0x8005080C, S78 #3)
|
|
# block 1: 2D_COM0 (0x80051804)
|
|
# block 2: 2D_LIN0 2D_COM1 2D_SP0 (0x80051DC8)
|
|
# block 3: 2D_SP1 (0x80052460)
|
|
# block 8: GS_001 (0x800525DC, S78 #4)
|
|
# block 4: GS_002 GS_003 MATRIX GS_103 GS_104 GS_105 GS_106 GS_107 (0x80052BDC)
|
|
# block 5: GS_108 GS_109 (0x800538EC)
|
|
# block 6: GS_110 GS_119 GS_120 GS_121 GS_122 GS_123 GS_127 GS_131
|
|
# GS_133 GS_134 GS_135 GS_137 PRESET PRESET3 OBJT OBJT3 (0x80053AF8)
|
|
# GS_001 (the 1536 B gap before block 4) was EXCLUDED from Phase 7 to P31 S78 — psyq-obj-parser packs
|
|
# its scattered PSD* commons into one .bss referenced via .bss+offset at SIX bases (35 words differed
|
|
# at the global-zeroing run; cookbook §9.1 "hard case"). Since S78 #4 psyq_integrate splits such a
|
|
# section into per-base NOBITS pieces at link-prepare (tools/psyq_bss_split.py, cookbook §489), so
|
|
# GS_001 links byte-identical like any other object; it is block libgs8 (was the gsgap3 stub).
|
|
# The list is DISAMBIGUATED (session E): psyq_identify reports byte-identical-.text aliases — keep
|
|
# GS_131 (not RVWUNIT), GS_137 (not RVWLUNIT), PRESET3 (not PRESET2), OBJT3 (not OBJT2); the losers
|
|
# have a spurious .data/.rdata mismatch and do NOT link byte-exact. GS_106 is an 8-instruction object
|
|
# whose .text pattern recurs in game code, so it anchors uniquely only within the libgs window
|
|
# (psyq_identify/psyq_integrate take the 0x80051804..0x80057928 range — see make extract).
|
|
# psyq_link_region --verify confirms the chosen 31 are per-object .text byte-identical.
|
|
set -euo pipefail
|
|
cd "$(dirname "$0")/.."
|
|
LIBGS=.run/obj40/libgs
|
|
DST=.run/obj40/libgs_used
|
|
OBJS=(2D_COM0 2D_LIN0 2D_COM1 2D_SP0 2D_SP1 2D_BG0 2D_BG1 \
|
|
GS_001 GS_002 GS_003 MATRIX GS_103 GS_104 GS_105 GS_106 GS_107 GS_108 GS_109 \
|
|
GS_110 GS_119 GS_120 GS_121 GS_122 GS_123 GS_127 GS_131 GS_133 GS_134 GS_135 GS_137 \
|
|
PRESET PRESET3 OBJT OBJT3)
|
|
|
|
[ -d "$LIBGS" ] || tools/psyq_build_libs.sh LIBGS
|
|
rm -rf "$DST"; mkdir -p "$DST"
|
|
for o in "${OBJS[@]}"; do
|
|
[ -f "$LIBGS/$o.o" ] || { echo "ERROR: $LIBGS/$o.o missing (run tools/psyq_build_libs.sh LIBGS)"; exit 1; }
|
|
cp "$LIBGS/$o.o" "$DST/$o.o"
|
|
done
|
|
echo "libgs_used: ${#OBJS[@]} objects -> $DST"
|
|
# Optional self-check: verify the whole region links per-object .text byte-identical.
|
|
if [ "${1:-}" = "--verify" ]; then
|
|
.venv/bin/python tools/psyq_link_region.py "$DST" 0x8005080C 0x80057928
|
|
fi
|