Files
BFM-decomp/tools/scope_data_externs.py
T
Drew T a0e7ff7f6f fix(phase-26): scope_data_externs ANSI-brace fix + wire §8d into family_sweep --hseq; 780-class diagnosed
- _body_open_brace only matched a `{` on its own line (the K&R shape), so fix() SILENTLY NO-OP'D on
  every ANSI draft — the same silent-skip disease as the four catalogued in §40/§8d, caught because
  the h_seq re-sweep banked 0/780. Now brace-scans forward from the signature (ANSI same-line,
  ANSI own-line, and K&R all work). Load-bearing for func_80178D40's upcoming ×134 bank.
- family_sweep --hseq now applies the §8d scoped stage at staging time.
- HONEST RESULT: still 0/780 — the substantial-band h_seq rejections are a DIFFERENT (sibling) class,
  now fully diagnosed against the bytes:
    gcc-2.7.2 decl-conflict semantics: a VISIBLE file-scope decl + a conflicting later decl (file OR
    block) is a HARD ERROR; a limbo-only block decl (scope closed) + a conflicting later decl is a
    warning. The h_seq drafts carry the EXEMPLAR TU's spellings; sibling TUs legitimately spell the
    same symbol differently (loose typing), and the visible decl is often MACRO-INJECTED — a
    DEFINE_func_* leading extern (§8c), invisible to any col-0 scan (e.g. D_80115158's `short` decl
    enters ov_SC01_000.c via DEFINE_func_8014168C() @4637; the draft carries ov077's
    `unsigned short` -> conflicting types at ANY scope).
  Sub-class (a) no-visible-decl -> §8d demotion (the jr class, proven x133). Sub-class (b) visible
  decl, different spelling -> needs reconcile-to-TU-VISIBLE (rewrite the draft decl to the TU-visible
  spelling + byte-neutral access cast; oracle = col-0 decls above the stub + engine_core.h macro
  externs for the DEFINE_ invocations above). Parked as a designed follow-up task; the 780 members
  are mechanical-recovery fodder once the tool exists.
2026-07-13 21:49:22 -06:00

146 lines
7.3 KiB
Python
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
#!/usr/bin/env python3
"""scope_data_externs.py — place a templated body's DATA externs at the scope the target TU can accept
(Phase 26, cookbook §8d). The missing recovery step that unblocks the heavy-jr ×N family sweeps.
THE BUG IT FIXES (byte-proven on func_8015AE2C -> ov_SC01_000)
-------------------------------------------------------------
`family_remap.gather_externs` carries the exemplar's decls for every symbol the body references and
prepends them at FILE scope (family_remap.py, remap_hseq). For a per-location DATA symbol that the
target TU declares only at BLOCK scope — inside its OWN later functions, loosely typed — that carried
file-scope decl ESTABLISHES A GLOBAL DECLARATION the TU never had, and every later block-scope `extern`
of that symbol must now agree with it. They don't (the engine is loosely typed), so gcc-2.7.2 rejects
the TU. The asymmetry, both halves byte-proven by the whole-binary gate:
BLOCK(int) -> BLOCK(struct Ent *) -> FILE(void *) ... builds [ OK ] (the region, stub state)
FILE(void *) -> BLOCK(int) -> ... conflicting types for `D_801812A4' (ERROR)
Example: ov_SC01_000's `D_801812A4` is a fn-ptr dispatch table declared FOUR incompatible ways in one
region — `(int)` and `(struct Ent_8015CD20 *)` at block scope inside func_8015C128 / func_8015CD20, then
`(void *)` at file scope. That compiles. Prepend the body's `extern void (*D_801812A4[])(void *);` above
them and it does not.
THE FIX
-------
Emit the carried extern at BLOCK scope (inside the function body) whenever the TU has NO file-scope decl
of that symbol above the insertion point. Then it declares no global, nothing below it can conflict, and
the TU's own decl environment is preserved exactly. This is the §8c principle ("splitting a TU means
rebuilding its declaration environment") applied to templating: a carried decl must not CHANGE the
environment — and it restores fidelity, because the original source declares these symbols at block
scope in precisely the same way (m2c/Ghidra emit per-function externs there).
BYTE-NEUTRAL: an `extern` declaration emits no code, and moving it changes neither the symbol nor the
declared type, so every access keeps its opcode. Only name lookup moves. The whole-binary byte-gate
(G3/P9) remains the sole arbiter — a wrong placement just fails the gate and the sibling reverts.
NEVER WORSE THAN THE STATUS QUO: if the symbol DOES have a file-scope decl above, we leave the line
alone (identical spelling = a legal duplicate; a differing spelling is the §41 reconcile class and is
an error at file scope either way, so demoting could not have saved it — the `reconciled` stage is the
fallback there).
SCOPE: `D_` data externs only. Function externs stay at file scope so `cast_call_sites` /
`canon_sig_reconcile` (which parse file-scope decls) keep working on them; gcc tolerates mismatched
function decls with a pedwarn, so they are not the failing class.
Usage (library — the sweep calls fix() directly; ×N per family, so no subprocess):
from scope_data_externs import fix
body, moved = fix(body, tu_text, insert_pos, "func_8015AE2C")
CLI (diagnostics):
tools/scope_data_externs.py --body .run/_repro_body.c --tu src/ov_SC01_000/ov_SC01_000_jr_8015AE2C.c \
--func func_8015AE2C [--out fixed.c]
"""
import argparse
import re
import sys
# a col-0 (file-scope) `extern ...;` on one line. Leading whitespace => block scope, which is what we
# emit and never need to re-place.
FILE_EXTERN_RE = re.compile(r'^extern\b[^;{}\n]*;', re.M)
DATA_SYM_RE = re.compile(r'\bD_[0-9A-Fa-f]{6,8}\b')
def _file_scope_data_syms(text):
"""Every D_ symbol declared by a col-0 `extern` in `text`. The symbol a decl DECLARES is its first
D_ token — true for both `extern u8 D_x[];` and the fn-ptr-array form `extern void (*D_x[])(void *);`
(the form reconcile_decls' regex cannot parse, which is why that tool silently skipped this class)."""
out = set()
for m in FILE_EXTERN_RE.finditer(text):
d = DATA_SYM_RE.search(m.group(0))
if d:
out.add(d.group(0))
return out
def _body_open_brace(body, func):
r"""Index just past the `{` that opens `func`'s body — i.e. where block-scope decls go. Scans forward
from the signature to the first `{` at depth 0 of the *statement* (so it handles the ANSI form with
the brace on the signature line, the ANSI form with the brace on its own line, AND the K&R form whose
param decls sit between the signature and the `{`). The first cut of this used `^\s*\{\s*$` — own-line
braces only — and silently no-op'd on every ANSI draft (the same silent-skip disease as the four
catalogued in §40/§8d; caught because the h_seq re-sweep banked 0/780)."""
sig = re.search(rf'^[^\n]*\b{re.escape(func)}\s*\(', body, re.M)
if not sig:
return None
i = body.find('{', sig.end())
if i < 0:
return None
j = body.find('\n', i)
return (j + 1) if j >= 0 else (i + 1)
def fix(body, tu_text, insert_pos, func):
"""Demote the body's file-scope DATA externs that the TU does not already declare at file scope
above `insert_pos`. Returns (new_body, [moved symbols]). A no-op (body unchanged) when nothing
qualifies, when the body declares no data externs, or when the opening brace can't be located."""
above = _file_scope_data_syms(tu_text[:insert_pos])
demote = [] # (line_text, sym)
keep_lines = []
for ln in body.split('\n'):
if FILE_EXTERN_RE.match(ln): # col-0 extern (match => anchored at col 0)
d = DATA_SYM_RE.search(ln)
if d and d.group(0) not in above:
demote.append((ln, d.group(0)))
continue # drop from the file-scope preamble
keep_lines.append(ln)
if not demote:
return body, []
stripped = '\n'.join(keep_lines)
at = _body_open_brace(stripped, func)
if at is None: # can't place them safely -> leave the body alone
return body, []
block = ''.join(f' {ln}\n' for ln, _ in demote)
return stripped[:at] + '\n' + block + stripped[at:], [s for _, s in demote]
def main():
ap = argparse.ArgumentParser(description=__doc__,
formatter_class=argparse.RawDescriptionHelpFormatter)
ap.add_argument('--body', required=True, help='the remapped body (file-scope externs prepended)')
ap.add_argument('--tu', required=True, help='the target TU (.c) the body is spliced into')
ap.add_argument('--func', required=True)
ap.add_argument('--at', type=int, default=None,
help='char offset of the insertion point (default: the INCLUDE_ASM stub for --func)')
ap.add_argument('--out')
a = ap.parse_args()
body, tu = open(a.body).read(), open(a.tu).read()
pos = a.at
if pos is None:
m = re.search(rf'INCLUDE_ASM\("[^"]*",\s*{re.escape(a.func)}\);', tu)
if not m:
sys.exit(f'no INCLUDE_ASM stub for {a.func} in {a.tu} (pass --at)')
pos = m.start()
new, moved = fix(body, tu, pos, a.func)
print(f'file-scope data syms above the insertion point: {len(_file_scope_data_syms(tu[:pos]))}')
print(f'demoted to block scope: {len(moved)} {moved}')
if a.out:
open(a.out, 'w').write(new)
print(f'wrote {a.out}')
if __name__ == '__main__':
main()