Files
Drew T 6e840730a9 feat(carve): bank 4 more via the carve chain — and §8b's "non-adjacent => ISOLATE" is over-strict
resident:func_800D00E4/func_800D02D0/func_800D0488 + ov_SC07_002:func_80180248, all byte-verified
from clean rebuilds (resident 8e17e02f, ov_SC07_002 fad71342) and counted from the SOURCE.
ov_SC06_029's two are re-gated separately against HEAD — this agent's worktree predated five banks
there, so its numbers for that binary no longer apply.

TWO OF THE SIX NEEDED NO CARVE WORK AT ALL, AND CARVE-REFUSED WAS AN INSTRUMENT VERDICT.
ov_SC07_002:func_80180248's table is ALREADY inside a carve bound to its own subseg: in stub state
spimdisasm migrates the table into the fn's .s and the object fills the piece exactly, so banking
just swaps that block for cc1's identical one. `island_probe` classified it `tail` on the table's
ADDRESS, `apply()` routed it to build_carve, which resolves spans out of the RAW data asm where a
carved table no longer is -> "not found in the raw data asm" -> harvest_verify booked CARVE-REFUSED.
A verdict about the route we chose, not about the function (R43). jtbl_carve now has a `covered`
verdict (table inside an existing carve bound to the fn's OWN subseg) and a `covered-tpad` wall (the
retail copy carries a trailing §8a pad the matched body won't emit — bankable, needs a `0t<n>`
entry); a fully-covered batch is a no-op before either route.

THE RESIDENT CAN CARVE LIKE AN OVERLAY. Its three tables are adjacent and lead the island
(0x450e0..0x451ac, one span, all in subseg `resident`). The genuinely new part: the resident opens
with `- [0x0, rodata, hdr]`, a 1-word .rodata header BEFORE the code, so its layout is
rodata -> text -> data -> rodata(carve) -> data, which `ld_interleave --order` cannot express (every
listed piece lands after TEXT_START, and hdr.rodata.o would fall into the unchecked `empties` bucket
and be parked after the text, moving every byte). New `--pre` places a leading-rodata piece ahead of
the text; resident_JTBL_INTERLEAVE uses it.

NEW LAW, BYTE-PROVEN (§8b was over-strict — EXTEND the carve, do not isolate): a .rodata carve piece
binds to a code SUBSEG, not a function, and the object's .rodata is the address-ordered
concatenation of cc1's tables for BANKED functions and still-stubbed functions' MIGRATED tables. So
a span may legitimately hold a MIX, and extending a carve across an align-pad word and two unrelated
STILL-STUBBED tables was byte-identical with nothing banked — where the tooling demanded a
jr-isolation. Corollaries, all measured: migrated tables self-align (spimdisasm emits `.align 3` iff
the table's SPAN-RELATIVE offset is 8-aligned), so stubbed tables need no spec; JTBL_PADS counts cc1
tables only, so a mixed span's spec GROWS as each sibling banks; and the zero-word rule is INVALID
across a migrated boundary, because that zero is supplied by the preceding migrated block.

ALSO REPORTED, NOT FIXED (harness gap worth its own change): verify_worktree.provision omits
`.run/sig.<bin>.jsonl` — main clone 259 files, provisioned worktree 0 — and jr_isolate_all's
carve-ownership scan swallows the resulting FileNotFoundError in a bare `except: continue`. Measured:
2603 of 2603 functions raised, the scan found 0 owners, and the run aborted with a CONFIDENT FALSE
verdict ("committed .rodata carve ownership is not 1:1 — stranded/duplicated carve"). Both resolve
instantly once the sigs are present. Any worktree-run isolation before that is fixed reports a
corruption that is not there.
2026-09-02 19:34:09 -06:00

204 lines
12 KiB
Python

#!/usr/bin/env python3
"""Reorder splat's generated linker script to honour a .data -> .rodata -> .data
"sandwich" layout (Phase 7 Task 2', the rodata-island problem).
splat emits one output section (`.main`) section-major in `section_order`
(.rodata, .text, .data, .bss), which floats ALL rodata to one place. But this
EXE's real layout puts .data on BOTH sides of the compiler rodata. For the
SURGICAL LZSS carve (Phase 7), only jtbl_80072A38 is migrated to .rodata; the
rest of the island stays raw inside the tail data object:
.text 0x80010000 .. 0x800629DC
.data (front) 0x800629DC .. 0x80072A38 53198.data.o (globals, ptr tables)
.rodata 0x80072A38 .. 0x80072C70 800.o span A: LZSS jtbl + 11 game jtbls
.data 0x80072C70 .. 0x80072E44 63470.data.o (loadDestPtrTable + globals)
.rodata 0x80072E44 .. 0x80073140 800_b.o span B: 14 game jtbls
.data 0x80073140 .. 0x800732A0 63940.data.o
.rodata 0x800732A0 .. 0x8007344C 800_c.o span C: 8 game jtbls
.data (tail) 0x8007344C .. 0x80074800 63C4C.data.o (snd2 jtbls + tail globals)
UPDATED P31 S72: main's island is SEVEN pieces, not three. `src/800.c` was split into three TUs so
each jump-table span gets its own code object (one object contributes exactly ONE contiguous
`.rodata` run), and the EXE is driven by `--order` — `--front/--tail` cannot express this and is now
the OVERLAY form only. See cookbook §426/§431.
i.e. .data appears on BOTH sides of .rodata, which a single section_order can't
express. This script rewrites the `.main {...}` body to the interleaved order:
text -> front .data -> .rodata -> tail .data -> .bss, keeping splat's START/END/
SIZE symbols. Front vs tail .data is decided by object basename (FRONT_DATA /
TAIL_DATA). All other (empty) .data objects go in the front group.
Idempotent: keyed off splat's exact section-major output; re-running on an
already-patched script is a no-op (the markers won't match). Run post-extract.
"""
import re, sys, argparse
_ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
_ap.add_argument("ld", nargs="?", default="build/us/SLUS_007.26.ld",
help="splat-generated linker script to rewrite in place")
_ap.add_argument("--front", action="append",
help="object basename whose .data belongs to the FRONT region (repeatable)")
_ap.add_argument("--tail", action="append",
help="object basename whose .data belongs to the TAIL region (repeatable)")
_ap.add_argument("--order",
help="Phase-26 §8 MULTI-jtbl mode: a comma-separated, address-ordered list of "
"object LEAF names forming the data-region sandwich (text -> [these] -> bss). "
"A `*.data.o` or `trailing.o` leaf contributes its (.data); any other (code) "
"object leaf contributes its (.rodata) carve. Overrides --front/--tail. Every "
"unlisted .data/.rodata line must be an empty code-object section (parked with "
".text, byte-neutral). Generalises the single-jtbl 3-piece sandwich to N pieces.")
_ap.add_argument("--pre", action="append", default=[],
help="object LEAF name whose section belongs BEFORE .text (repeatable, "
"--order mode only). The resident blob opens with a 1-word `.rodata` "
"header piece at the segment base (`- [0x0, rodata, hdr]`), so its "
"layout is rodata -> text -> data -> rodata(carve) -> data. `--order` "
"alone cannot express that: every listed piece is emitted AFTER the "
"text, and an unlisted non-empty piece would be parked with the text "
"(silently moving the header word). Cookbook §8f.")
_ap.add_argument("--section", default=".main",
help="output-section name to rewrite (default .main for the EXE; overlays "
"use their own, e.g. .ov_SC01_077). The linker START/END/SIZE symbol "
"prefix is derived by stripping the leading dot (Phase 26 §8 overlay carve).")
_a = _ap.parse_args()
LD = _a.ld
SECTION = _a.section # output section to rewrite
PREFIX = SECTION.lstrip(".") # splat names its symbols <PREFIX>_TEXT_START etc.
# object basenames whose (.data) belongs to the front / tail region. Defaults are the EXE's
# LZSS-sandwich objects (TRANSITIONAL — the Makefile passes --front/--tail explicitly, and the
# whole step is gated to BINARY=main since overlays have no rodata island). See cookbook §8.
FRONT_DATA = tuple(_a.front) if _a.front else ("53198.data.o",)
TAIL_DATA = tuple(_a.tail) if _a.tail else ("6324C.data.o",)
src = open(LD).read()
# Grab the output-section body (between its first '{' and matching '}').
m = re.search(re.escape(SECTION) + r"\b.*?\n[ \t]*\{\n(.*?)(\n[ \t]*\})", src, re.S)
if not m:
sys.exit(f"ld_interleave: could not find {SECTION} {{ ... }} block")
head, body, tail = src[m.start():m.start(1)], m.group(1), m.group(2)
# Collect the object input-section lines by linker section, preserving order.
def grab(section):
# lines like: build/src/800.o(.rodata);
return re.findall(rf"^[ \t]*build/\S+\({re.escape(section)}\);", body, re.M)
text_lines = grab(".text")
rodata_lines = grab(".rodata")
data_lines = grab(".data")
bss_lines = grab(".bss")
I = " " # 8-space indent matching splat's body
if _a.order:
# --- Phase-26 §8 MULTI-jtbl address-ordered mode ---------------------------------------
# The data region is an explicit, address-ordered sequence of pieces (data subsegs and the
# per-function .rodata jtbl carves). Emit each piece's linker line back-to-back so the linker
# lays them out contiguously in exactly the original island order. ALIGN(.,4) between pieces
# is a no-op on the word-aligned jtbl/data boundaries (kept as a safety net, matching the
# proven single-carve path). Every code object contributes at most ONE contiguous .rodata run,
# so a matched jr-function whose jtbl is non-adjacent to a sibling's MUST be in its own subseg.
items = [x for x in _a.order.split(",") if x]
def _sect_of(leaf):
return ".data" if (leaf.endswith(".data.o") or leaf == "trailing.o") else ".rodata"
def _find_line(leaf, sect):
pat = f"/{leaf}({sect});"
hits = [l for l in (data_lines + rodata_lines) if pat in l]
if len(hits) != 1:
sys.exit(f"ld_interleave --order: expected exactly 1 `{leaf}({sect})` line, found {len(hits)}")
return hits[0]
ordered = [_find_line(leaf, _sect_of(leaf)) for leaf in items]
pre = [_find_line(leaf, _sect_of(leaf)) for leaf in (_a.pre or [])]
selected = set(ordered) | set(pre)
# Everything not placed in the island must be an EMPTY code-object .data/.rodata section
# (non-empty ones would be a real data conflict -> the byte-gate catches it). Park with .text.
empties = [l for l in (data_lines + rodata_lines) if l not in selected]
# R43 GUARD, not an assumption. The line above has always ASSERTED "empty code-object section"
# and never checked it. A `build/asm/**` piece is an EXTRACTED data/rodata subseg — non-empty by
# construction — so an unlisted one is a real layout piece about to be silently relocated to just
# after the text. Measured on the resident: `hdr.rodata.o(.rodata)` is the 4-byte header word at
# the segment base, and parking it after the text moves every byte of the image. Name it and
# refuse; the fix is to list it in --order (a tail piece) or --pre (a pre-text piece).
def _primary_of(line):
"""The section an EXTRACTED asm piece actually carries, from its object name; None for a
code object (whose unlisted .data/.rodata really are the empty sections this parks)."""
m = re.search(r"/([^/]+)\((\.\w+)\);", line)
if not m or "build/asm/" not in line:
return None
leaf, sect = m.group(1), m.group(2)
want = (".rodata" if leaf.endswith(".rodata.o") else
".data" if (leaf.endswith(".data.o") or leaf == "trailing.o") else None)
return sect if want == sect else None
stray = [l for l in empties if _primary_of(l)]
if stray:
sys.exit("ld_interleave --order: %d extracted asm piece(s) are in neither --order nor "
"--pre and would be parked with .text (they are never empty):\n %s\n"
" List each in --order (after the text) or --pre (before the text)."
% (len(stray), "\n ".join(s.strip() for s in stray)))
out_lines = [f"{I}FILL(0x00000000);"]
if pre:
out_lines.append(f"{I}{PREFIX}_RODATA_START = .;")
out_lines += [f"{I}{l.strip()}" for l in pre]
out_lines += [f"{I}. = ALIGN(., 4);", f"{I}{PREFIX}_RODATA_END = .;",
f"{I}{PREFIX}_RODATA_SIZE = ABSOLUTE({PREFIX}_RODATA_END - {PREFIX}_RODATA_START);"]
out_lines += [f"{I}{PREFIX}_TEXT_START = .;"]
out_lines += [f"{I}{l.strip()}" for l in text_lines]
out_lines += [f"{I}{l.strip()}" for l in empties] # empty (0-byte) sections, byte-neutral
out_lines += [f"{I}. = ALIGN(., 4);", f"{I}{PREFIX}_TEXT_END = .;",
f"{I}{PREFIX}_TEXT_SIZE = ABSOLUTE({PREFIX}_TEXT_END - {PREFIX}_TEXT_START);"]
out_lines.append(f"{I}{PREFIX}_DATA_START = .;")
for l in ordered:
out_lines.append(f"{I}{l.strip()}")
out_lines.append(f"{I}. = ALIGN(., 4);")
out_lines += [f"{I}{PREFIX}_DATA_END = .;",
f"{I}{PREFIX}_DATA_SIZE = ABSOLUTE({PREFIX}_DATA_END - {PREFIX}_DATA_START);"]
out_lines += [f"{I}{PREFIX}_BSS_START = .;"]
out_lines += [f"{I}{l.strip()}" for l in bss_lines]
out_lines += [f"{I}. = ALIGN(., 4);", f"{I}{PREFIX}_BSS_END = .;",
f"{I}{PREFIX}_BSS_SIZE = ABSOLUTE({PREFIX}_BSS_END - {PREFIX}_BSS_START);"]
new_body = "\n".join(out_lines)
out = src[:m.start()] + head + new_body + tail + src[m.end():]
open(LD, "w").write(out)
print(f"ld_interleave --order: {SECTION} island = {len(ordered)} pieces "
f"[{', '.join(items)}]; pre={len(pre)} text={len(text_lines)} "
f"empties={len(empties)} bss={len(bss_lines)}")
sys.exit(0)
def is_named(line, names):
return any(n in line for n in names)
front_data = [l for l in data_lines if not is_named(l, TAIL_DATA)]
tail_data = [l for l in data_lines if is_named(l, TAIL_DATA)]
# Sanity: front must contain the FRONT_DATA object.
if not any(is_named(l, FRONT_DATA) for l in front_data):
sys.exit("ld_interleave: front data object not found — config drift?")
if not tail_data:
sys.exit("ld_interleave: tail data object not found — config drift?")
I = " " # 8-space indent matching splat's body
def grp(start, lines, end_sym, size_sym):
out = [f"{I}{start} = .;"]
out += [f"{I}{l.strip()}" for l in lines]
out += [f"{I}. = ALIGN(., 4);", f"{I}{end_sym} = .;"]
if size_sym:
out += [f"{I}{size_sym} = ABSOLUTE({end_sym} - {start});"]
return out
new = [f"{I}FILL(0x00000000);"]
new += grp(f"{PREFIX}_TEXT_START", text_lines, f"{PREFIX}_TEXT_END", f"{PREFIX}_TEXT_SIZE")
new += grp(f"{PREFIX}_DATA_START", front_data, f"{PREFIX}_DATA_END", f"{PREFIX}_DATA_SIZE")
new += grp(f"{PREFIX}_RODATA_START", rodata_lines, f"{PREFIX}_RODATA_END", f"{PREFIX}_RODATA_SIZE")
new += grp(f"{PREFIX}_DATA2_START", tail_data, f"{PREFIX}_DATA2_END", f"{PREFIX}_DATA2_SIZE")
new += grp(f"{PREFIX}_BSS_START", bss_lines, f"{PREFIX}_BSS_END", f"{PREFIX}_BSS_SIZE")
new_body = "\n".join(new)
out = src[:m.start()] + head + new_body + tail + src[m.end():]
open(LD, "w").write(out)
print(f"ld_interleave: rewrote {SECTION} — text={len(text_lines)} "
f"front_data={len(front_data)} rodata={len(rodata_lines)} "
f"tail_data={len(tail_data)} bss={len(bss_lines)}")