mirror of
https://github.com/Druthulu/BFM-decomp
synced 2026-10-04 16:28:11 -04:00
T3.c3: restruct pass_hint aligned rows; drop cross-base overlapping edits as KEPT(overlap-edit)
This commit is contained in:
Drew T
@@ -0,0 +1,30 @@
|
||||
# T3.c3 — restruct.py: pass_hint int crash + overlapping-edit Refuse
|
||||
|
||||
## Changed (tools/restruct.py only)
|
||||
- `classify_residual`: `pairs` was `ds.classify`'s REGISTER pairs `(x, y, count)`; pass_hint expects aligned differing rows `(k, "<word> <mnem>"|"--", …)`. Now builds those rows from difflib opcodes over `ds.masked_word` (same alignment as `delever_search --explain`), `pairs=rows[:8]`; register pairs kept as `regs`. `import difflib` added.
|
||||
- `pass_hint`: reads only 3-tuples with str `[1]`/`[2]` (a legacy register-pair row is skipped, never `.split()` on an int).
|
||||
- Overlap cause: NOT double emission. A `nested:*(s32 *)(s0 + 0x20)` base's site `*(s16 *)(*(s32 *)(s0 + 0x20) + 0x18)` contains its parent base `param:s0`'s site `*(s32 *)(s0 + 0x20)`; s_edits dedupes per base only, so the cross-base union overlapped (seen via scratch `.run/P38/T3/ovl.py` on md_SC07_004: func_801A1470, 801A19C0, 801A1F3C, 801A2400 (LOCAL), 801A2F34, 801A3180 …).
|
||||
- New `drop_overlaps(edits)`: sort `(pos, -end, repl)`, keep earlier-starting (longer on tie), drop those starting inside. `work_file_S` applies it to the body's all-base edit list (per_base order kept for S2), counts `skips["overlap-edit"]`, appends dropped sites as `KEPT(overlap-edit)`, adds them to `out["kept"]`; LOCAL typedef `needed` now from surviving edits only. compose_text's Refuse stays as the guard.
|
||||
- Selftests +2 (register-pair row → REGALLOC, no crash; drop_overlaps synthetic): 56.
|
||||
|
||||
## Commands
|
||||
- `delever_oracle.py --snapshot-baseline` → 7428 objects at e4341ee11, 218/218 link inputs.
|
||||
- `--calibrate ov_SC04_011 ov_SC03_015 md_SC07_004 main -j 16` → 146/146 identical, 32 twin checks 0 mismatch, positive control DIFFERS on build/src/800.o — OK.
|
||||
- `restruct.py --selftest` → struct_layout 9/9, restruct 56/56 OK.
|
||||
- 9 try-files (`-j 4`, 9 concurrent run.sh --bg; logs .run/logs/t3c3_try_1..9) — all final IDENTICAL, 0 TYPE-NOT-VISIBLE, 0 Traceback/Refuse:
|
||||
- ov_SC06_032_jr_80182890: members 1652 kept 419 skipped 699; MEMBERS 123 S2 7 REFUSED 8 NO-SITE 5; overlap-edit 172
|
||||
- ov_SC02_027_jr_8017D898: members 1495 kept 244 skipped 535; MEMBERS 193 S2 4 KEPT-ALL 1 REFUSED 11 NO-SITE 6; overlap-edit 164
|
||||
- md_SC07_004: members 1595 kept 451 skipped 644 levers off 2; MEMBERS 220 S2 17 S+A 1 KEPT-ALL 1 REFUSED 16 NO-SITE 7; overlap-edit 180
|
||||
- md_SC07_003: members 630 kept 88 skipped 242; MEMBERS 82 S2 2 REFUSED 4 NO-SITE 4; overlap-edit 61
|
||||
- 800.c: members 697 kept 286 skipped 255 levers off 5; MEMBERS 108 S2 10 S+A 2 KEPT-ALL 1 REFUSED 22 NO-SITE 40; overlap-edit 5
|
||||
- ov_MAIN_012_jr_8015A3C8: members 618 kept 172 skipped 94; MEMBERS 104 S2 5 KEPT-ALL 1 REFUSED 8 NO-SITE 3; overlap-edit 27
|
||||
- ov_SC03_107_jr_8015A3C8: members 565 kept 172 skipped 77; MEMBERS 102 S2 4 KEPT-ALL 1 REFUSED 10 NO-SITE 3; overlap-edit 26
|
||||
- md_MAIN_046: members 126 kept 16 skipped 27; MEMBERS 24 S2 3 REFUSED 2 NO-SITE 2; overlap-edit 5
|
||||
- md_MAIN_036: members 85 kept 3 skipped 24; MEMBERS 15 S2 2 REFUSED 1; overlap-edit 0
|
||||
- hints now produced: CSE-KILL 34, OTHER 13, COUNT-OTHER 10, SCHED-ALIAS 2.
|
||||
- `restruct.py --selftest --real` → 61/61 OK, linked-control OK; no func_801814AC line printed in this log.
|
||||
|
||||
## For the expert
|
||||
- REFUSED bodies are per-body COMPILE-ERRORs in the candidate (e.g. md_MAIN_036:300 `ar46E98' undeclared`; md_SC07_003:2644 parse error / `Blk8`, :4442 `D_801F4444`) — pre-existing engine behaviour, now visible because the runs finish; not touched.
|
||||
- Overlap drop keeps the OUTER (nested-base) edit, so the parent `s0->unk20` read inside it stays a cast; composing both (`((T *)((U *)s0)->unk20)->unk18`) is a possible later refinement.
|
||||
- `.run/P36/delever/calibration.json` modified by step 1 (oracle state), not committed by me.
|
||||
+46
-6
@@ -50,6 +50,7 @@ outer gate (the clean fleet run, R22) which tools/restruct_cycle.sh runs before
|
||||
"""
|
||||
import argparse
|
||||
import collections
|
||||
import difflib
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
@@ -522,8 +523,12 @@ def pass_hint(residual):
|
||||
if not residual or residual.get("kind") in (None, "UNSCORED"):
|
||||
return "UNSCORED"
|
||||
kind = residual["kind"]
|
||||
mn = [(p[1].split()[1] if len(p[1].split()) > 1 else "") for p in residual.get("pairs", []) if p[1] != "--"]
|
||||
tg = [(p[2].split()[1] if len(p[2].split()) > 1 else "") for p in residual.get("pairs", []) if p[2] != "--"]
|
||||
# `pairs` = the aligned differing rows (k, "<word> <mnem …>" | "--", same) from classify_residual; a register-pair row
|
||||
# (x, y, count — delever_search.classify's `pairs`, what classify_residual emitted before T3.c3: `.split()` on an int crashed)
|
||||
# carries no mnemonic and is skipped here (T3.c3)
|
||||
rows = [p for p in residual.get("pairs", []) if len(p) == 3 and isinstance(p[1], str) and isinstance(p[2], str)]
|
||||
mn = [(p[1].split()[1] if len(p[1].split()) > 1 else "") for p in rows if p[1] != "--"]
|
||||
tg = [(p[2].split()[1] if len(p[2].split()) > 1 else "") for p in rows if p[2] != "--"]
|
||||
words = set(mn) | set(tg)
|
||||
if words & {"lwl", "lwr", "swl", "swr"}:
|
||||
return "ALIGNMENT"
|
||||
@@ -539,7 +544,7 @@ def pass_hint(residual):
|
||||
return "COUNT-OTHER"
|
||||
if kind == "REG":
|
||||
return "REGALLOC"
|
||||
ims = [p for p in residual.get("pairs", []) if p[1] != "--" and p[2] != "--" and p[1].split()[1:2] == p[2].split()[1:2]]
|
||||
ims = [p for p in rows if p[1] != "--" and p[2] != "--" and p[1].split()[1:2] == p[2].split()[1:2]]
|
||||
if ims and all(x[1].split()[1] in ("addiu", "lui", "ori") for x in ims):
|
||||
return "ADDRESS-FOLD"
|
||||
return "OTHER"
|
||||
@@ -690,6 +695,20 @@ def compose_text(raw, edits, inserts=()):
|
||||
return "".join(out)
|
||||
|
||||
|
||||
def drop_overlaps(edits):
|
||||
"""(kept, dropped) over one body's edits of ALL its bases: s_edits drops overlaps within one base, but a `nested:` base's site
|
||||
CONTAINS its parent base's site (`*(s16 *)(*(s32 *)(s0 + 0x20) + 0x18)` holds `*(s32 *)(s0 + 0x20)`, base param:s0). The
|
||||
earlier-starting edit stays (the longer one on a tie), the ones starting inside it drop — deterministic, source order.
|
||||
was: compose_text raised Refuse on them and the whole --try-file run crashed (T3.c3)."""
|
||||
kept, dropped, last = [], [], 0
|
||||
for e in sorted(edits, key=lambda e: (e[0], -e[1], e[2])):
|
||||
if e[0] < last:
|
||||
dropped.append(e)
|
||||
continue
|
||||
kept.append(e); last = e[1]
|
||||
return kept, dropped
|
||||
|
||||
|
||||
def greedy_kept(judge_cands, edits, tag):
|
||||
"""Rung S2 on an edit list: judge_cands(sub_edits, tag) -> verdict. leave-one-out (n), else cumulative revert in source order
|
||||
until IDENTICAL, then minimise. Returns (kept_edits, compiles, verdict)."""
|
||||
@@ -817,7 +836,18 @@ def classify_residual(tu, fn, cand_bytes):
|
||||
if not mine or not tgt:
|
||||
return dict(kind="UNSCORED", err="function not found in one object")
|
||||
c = ds.classify(mine, tgt)
|
||||
return dict(kind=c["kind"], score=c["score"], n_mine=c["n_mine"], n_tgt=c["n_tgt"], pairs=c["pairs"][:4])
|
||||
# pairs = the aligned differing rows pass_hint reads (k, "<word> <mnem>" | "--", …), delever_search --explain's alignment;
|
||||
# regs = classify's register pairs (x, y, n). was: pairs=c["pairs"][:4] (the register pairs — pass_hint crashed on the int, T3.c3)
|
||||
aa, bb = [ds.masked_word(i) for i in mine], [ds.masked_word(i) for i in tgt]
|
||||
rows = []
|
||||
for t, i1, i2, j1, j2 in difflib.SequenceMatcher(None, aa, bb, autojunk=False).get_opcodes():
|
||||
if t == "equal":
|
||||
continue
|
||||
for k in range(max(i2 - i1, j2 - j1)):
|
||||
m_ = f"{mine[i1 + k]['word']:08x} {mine[i1 + k]['mnem']}" if i1 + k < i2 else "--"
|
||||
t_ = f"{tgt[j1 + k]['word']:08x} {tgt[j1 + k]['mnem']}" if j1 + k < j2 else "--"
|
||||
rows.append((i1 + k, m_, t_))
|
||||
return dict(kind=c["kind"], score=c["score"], n_mine=c["n_mine"], n_tgt=c["n_tgt"], pairs=rows[:8], regs=c["pairs"][:4])
|
||||
|
||||
# ----------------------------------------------------------------------------------------------------------------------
|
||||
# rung 1 on one body
|
||||
@@ -986,9 +1016,13 @@ def work_file_S(tu, bodies, label, calib_id, log, pool=None, allow_local=False,
|
||||
bsites = [s for s in sites if s.get("fn") == fn]
|
||||
per_base = s_body_edits(tu, fn, text_acc, masked, d2, bsites, bodies[fn], allow_local, local_types)
|
||||
edits = [e for (_, _, status, es, _) in per_base for e in es]
|
||||
_, overlapped = drop_overlaps(edits) # a nested base's site holds its parent's (T3.c3)
|
||||
edits = [e for e in edits if not any(e is o for o in overlapped)] # per_base order kept for the S2 search
|
||||
skips = collections.Counter()
|
||||
for (_, _, _, _, sk) in per_base:
|
||||
skips.update(sk)
|
||||
if overlapped:
|
||||
skips["overlap-edit"] += len(overlapped)
|
||||
row = dict(ts=time.strftime("%Y-%m-%d %H:%M:%S"), label=label, rung="S", calib=calib_id, tu=tu, unit=fn, fn=fn, addr=dl.fn_addr(fn, tu),
|
||||
header=is_hdr, nhash_before=nh0, nhash_after=nh0,
|
||||
bases=[dict(base=bk, type=tn, status=stt, edits=len(es), skips=dict(sk)) for (bk, tn, stt, es, sk) in per_base],
|
||||
@@ -1004,7 +1038,7 @@ def work_file_S(tu, bodies, label, calib_id, log, pool=None, allow_local=False,
|
||||
base_text = text_acc
|
||||
# a LOCAL type (try mode) travels with its body: its typedef is inserted at file scope right before this function; a
|
||||
# typedef already placed below (an earlier, lower body of the same type) is moved up so both bodies see it (bottom-up order)
|
||||
needed = {tn for (_, tn, stt, es, _) in per_base if stt == "LOCAL" and es}
|
||||
needed = {tn for (_, tn, stt, es, _) in per_base if stt == "LOCAL" and any(any(e is x for x in edits) for e in es)} # was: `and es` (T3.c3)
|
||||
ls_acc = dl.line_starts(base_text)
|
||||
ins_pos = ls_acc[d2["line"] - 1]
|
||||
inserts = []
|
||||
@@ -1043,8 +1077,10 @@ def work_file_S(tu, bodies, label, calib_id, log, pool=None, allow_local=False,
|
||||
s = e[3]
|
||||
v = "MEMBER" if any(e is a for a in accepted) else ("KEPT(" + row.get("hint", "?") + ")" if row.get("verdict") in ("S2", "KEPT-ALL") else "REFUSED")
|
||||
row["sites"].append(site_row(s, v, tname_of.get(id(e)), e[2].rsplit("->", 1)[-1].rsplit(".", 1)[-1]))
|
||||
for e in overlapped: # the dropped nested/parent edit stays a cast (T3.c3)
|
||||
row["sites"].append(site_row(e[3], "KEPT(overlap-edit)", tname_of.get(id(e)), e[2].rsplit("->", 1)[-1].rsplit(".", 1)[-1]))
|
||||
out["members"] += len(accepted)
|
||||
out["kept"] += len(kept)
|
||||
out["kept"] += len(kept) + len(overlapped)
|
||||
if accepted:
|
||||
text_acc = compose_text(base_text, list(accepted) + inserts)
|
||||
for tn in sorted(needed):
|
||||
@@ -3507,6 +3543,10 @@ def selftest(real=False):
|
||||
ok("hint CSE-KILL", pass_hint(dict(kind="COUNT", pairs=[(3, "3c020000 lui", "--")])) == "CSE-KILL")
|
||||
ok("hint WIDTH", pass_hint(dict(kind="MIXED", pairs=[(3, "3042ffff andi", "00021400 sll")])) == "WIDTH")
|
||||
ok("hint REGALLOC", pass_hint(dict(kind="REG", pairs=[(3, "00431021 addu", "00431821 addu")])) == "REGALLOC")
|
||||
ok("hint: a register-pair row (int count) is skipped, not split (T3.c3)", pass_hint(dict(kind="REG", pairs=[("v0", "v1", 2)])) == "REGALLOC")
|
||||
ov_k, ov_d = drop_overlaps([(20, 30, "b", {}), (10, 40, "a", {}), (10, 15, "c", {}), (40, 45, "d", {})])
|
||||
ok("drop_overlaps: the earlier/longer edit stays, the nested ones drop (T3.c3)", [e[2] for e in ov_k] == ["a", "d"] and sorted(e[2] for e in ov_d) == ["b", "c"],
|
||||
f"{[e[2] for e in ov_k]} {[e[2] for e in ov_d]}")
|
||||
# ---- rung D on the fixture
|
||||
DEFS_OVERRIDE = {"fx_callee": [("src/ov/fx_defs.c", "void", "s32 a0, s32 a1", False)], "fx_kr": [("src/ov/fx_defs.c", "s32", "s32 a, s32 b", True)]}
|
||||
units = d_units(tu, text)
|
||||
|
||||
Reference in New Issue
Block a user