mirror of
https://github.com/Druthulu/BFM-decomp
synced 2026-09-28 14:59:48 -04:00
2a0ac5ab8d
- aprop_symfix: STALE-DELTA class — the S50 1:1 stale-seed-symbol rule generalized to n:n (sorted-by-address zip, ONE uniform target-draft delta required; refuses count mismatch / non-addressed names / disagreeing deltas). R39 negative controls (synthetic + S50-snapshot equality over still-stub rows, zero false positives); first live batch 4 rebased -> 4/4 BANKED (func_8016BCC0, func_8017F1C8, func_80186BD8, func_80186BF8). The delta test refused func_80186C1C whose deltas differ by 4 — a hand-check had wrongly accepted it. cookbook §171-D - recover_integration demacroize (SELF-decl class): 4/7 banked (func_80139BE0, func_8014ED28, func_80161D88, func_801659DC) - R38-first partition of the MATCH-108 pile: 75 still-stub = 13 never-gated + 62 verdictted (31 PLUMBING = 7 SELF + 15 CALLEE->T6 + 3 UNDEF-DATA + 6 OTHER; 14 CC1->T6; 8 md CARVE-REFUSED->ledger; 1 DIFF); immfix pile fully consumed - stored-draft re-gates 0/23 (the ~8% A10 law held); 9 STALE->clean world-motion drafts identified (siblings' banks defined their missing symbols) - gate_lane: propagate-commit tag derives from GATE_PHASE (was hardcoded) - R22 clean fleet: extract-all 212/212 + main; check-all 213/213 BYTE-IDENTICAL
71 lines
4.2 KiB
Python
71 lines
4.2 KiB
Python
"""The wave gate driver — the S49 practice, paid for in two incidents (cookbook §169 law 3).
|
|
|
|
Usage: tools/gate_lane.py <wavedir> <slate-or-confirmed.json> [results.json]
|
|
Accepts either shape (`name` or `fn` per record) and takes an explicit `draft` path when present.
|
|
|
|
The contract, and why each clause exists:
|
|
- group drafts by (binary, destination split .c)
|
|
- gate_stage --no-propagate --commit, NO outer timeout (the tool owns its own)
|
|
- revert any residue between groups; abort loudly if the tree is dirty at entry
|
|
- propagate PER FUNCTION afterwards, committing each
|
|
Usage: gate_lane.py <wavedir> <slate.json> [results.json]"""
|
|
import json, os, shutil, subprocess, sys, collections, glob
|
|
sys.path.insert(0,'tools'); import corpus
|
|
wavedir, slate = sys.argv[1], sys.argv[2]
|
|
outp = sys.argv[3] if len(sys.argv)>3 else '.run/gate_lane_results.json'
|
|
raw=[c for c in json.load(open(slate)) if isinstance(c,dict) and (c.get('name') or c.get('fn'))]
|
|
cards=[dict(c, name=c.get('name') or c.get('fn')) for c in raw] # accept slate OR confirmed shape
|
|
if not cards: sys.exit(f"R32: {slate} yielded 0 usable records — wrong shape?")
|
|
def dirty(): return subprocess.run("git status --porcelain -- src/ config/",shell=True,
|
|
capture_output=True,text=True).stdout.strip()
|
|
def writers(): return subprocess.run("pgrep -af 'dedup_propagate|gate_stage|harvest_verify'",
|
|
shell=True,capture_output=True,text=True).stdout
|
|
if dirty(): sys.exit("TREE DIRTY at entry — resolve before gating:\n"+dirty()[:400])
|
|
groups=collections.defaultdict(list)
|
|
for c in cards:
|
|
p=c.get('draft') or f"{wavedir}/{c['name']}/{c['name']}.c" # explicit path wins (agents use per-binary dirs)
|
|
if not os.path.isfile(p): continue
|
|
src=None
|
|
for f in sorted(glob.glob(f"src/{c['binary']}/*.c")):
|
|
t=open(f).read()
|
|
if "INCLUDE_ASM" in t and c['name'] in t: src=f; break
|
|
groups[(c['binary'],src)].append((c['name'],p))
|
|
n_g=sum(len(v) for v in groups.values())
|
|
missing=[c['name'] for c in cards if not os.path.isfile(c.get('draft') or f"{wavedir}/{c['name']}/{c['name']}.c")]
|
|
if n_g != len(cards): # R32: a silent skip is a DEFECT, not a no-op
|
|
print(f"R32 COVERAGE: {len(cards)} records -> {n_g} gateable; {len(missing)} missing drafts: {missing[:8]}", flush=True)
|
|
if n_g == 0: sys.exit("R32: nothing gateable — refusing to report 0 as a result")
|
|
print(f"gating {n_g} drafts in {len(groups)} groups", flush=True)
|
|
banked=[]; res={}
|
|
for (b,src),items in sorted(groups.items()):
|
|
if dirty():
|
|
subprocess.run("git checkout -- src/ config/",shell=True); print(" (reverted residue)",flush=True)
|
|
d=f".run/gate_lane/{b}__{os.path.basename(src or 'x')}"
|
|
shutil.rmtree(d,ignore_errors=True); os.makedirs(d,exist_ok=True)
|
|
for n,p in items: shutil.copy(p,f"{d}/{n}.c")
|
|
sub=os.path.dirname(corpus.asm_path(b,items[0][0]) or "")
|
|
cmd=[".venv/bin/python","tools/gate_stage.py","--drafts",d,"--binary",b,"--no-propagate","--commit"]
|
|
if src: cmd+=["--src",src,"--src-file",src]
|
|
if sub: cmd+=["--asm-subdir",sub]
|
|
r=subprocess.run(cmd,capture_output=True,text=True) # NO outer timeout (§169 law 3)
|
|
js=[l for l in (r.stdout+r.stderr).splitlines() if l.startswith('{')]
|
|
v=json.loads(js[-1]) if js else {}
|
|
got=v.get('verified',[]); banked+=got
|
|
print(f" {b:14} {os.path.basename(src or ''):34} {len(items)}d -> {len(got)} banked", flush=True)
|
|
res[f"{b}:{src}"]=v
|
|
json.dump(res,open(outp,'w'),indent=1)
|
|
if dirty(): subprocess.run("git checkout -- src/ config/",shell=True)
|
|
print(f"\nBANKED {len(banked)}: {banked}", flush=True)
|
|
json.dump(banked,open(outp.replace('.json','_banked.json'),'w'))
|
|
# propagate per function
|
|
for fn in banked:
|
|
addr="0x"+fn.split("_")[1].lower()
|
|
r=subprocess.run([".venv/bin/python","tools/dedup_propagate.py","--addr",addr],
|
|
capture_output=True,text=True)
|
|
if dirty():
|
|
tag=os.environ.get("GATE_PHASE","decomp") # P31 T1: was hardcoded "phase-30 S49"
|
|
subprocess.run("git add src/ config/",shell=True)
|
|
subprocess.run(f'git commit -q -m "feat({tag}): propagate {fn} (gate lane)"',shell=True)
|
|
print(f" prop {fn}: committed", flush=True)
|
|
print("DONE", flush=True)
|