- The last big NAMED blocker, costed across four checkpoints as §112 header + §20 call-site cast + a scripted §99 pass over 2,022 overlay-local decls. Probing first showed two of the three were unnecessary: the conflict is entirely between DEFINE_func_80151924()'s own forward-decl (extern s32 func_80151944(void)) and the byte-true definition (void f(void *a0)), four lines apart in the assembled TU. The 2,022 decls live in OTHER TUs and never entered it. - ONE 4-line edit in engine_core.h: decl -> byte-true, call site -> ((s32 (*)(void))f)() so the caller's codegen is unchanged. rtu_match: conflicting types -> MATCH (15 ins). Sweep 138/138. - Family 0x80131eec fully closed: 149 (T87) + 138 (T97) + 1 immediate-refusal = all 288 members. - SHARED-HEADER RISK VERIFIED, NOT ARGUED: engine_core.h is included by all 138 overlays, so §20 cast-folding is a hypothesis. Per-binary gates 138/138 are necessary but not sufficient; the fleet check is the one that counts. R22 clean-fleet 140/140 + tools-health RC=0 (corpus 0 PHANTOM/0 TRUNCATED, cdecl, audit-binaries, dedup 1886/0, C1 239604/239604). - METRICS: fn-count 91.96 -> 92.00% (+138, exact) · instr 87.4 -> 87.5% (+2,070) · distinct +72. - COSTING LESSON: the estimate came from reading the symptom (2,022 decls of this name exist) instead of probing the failure (which decl actually conflicts). Probe before COSTING, not just before scaling.
9.1 KiB
BFM FLEET matching progress (generated by tools/progress.py --fleet — authoritative)
140 binaries: main + resident + 138 location overlays. DETERMINISTIC,
source-derived (committed src/*.c + config/dedup.us.yaml). Live byte gate: make check-all;
cross-binary collapsible-byte leverage: docs/duplicates.cross.md.
THREE progress metrics (all matter — see the labels):
FLEET fn-count byte-ident: 325417 / 353720 = 92.00% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay) FLEET instr-weighted : 11493049 / 13141652 = 87.5% (shipped .text across main + resident + 138 overlays; the decomp.dev-DISPLAY number) FLEET distinct-code(uniq): 4396900 / 5634875 = 78.0% (69816/87459 unique fns; the DISTINCT-RE number) MAIN game-code weighted : 436 / 60201 = 0.7% (INCLUDED in the fleet numbers above since 2026-07-22 — roadmap §1 metrics contract; LINKED-excluding Ghidra sig dated 2026-06-14; caveat is R34: no independent second oracle for a PS-X EXE, NOT drift) (fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 11492613 / 13081451 = 87.9%)
FLEET REAL substantive : 323562 (of which dedup-shared 239530 via 1886 groups / 239604 instances) FLEET LINKED PsyQ objs : 959 FLEET NON_MATCHING : 7 (0 in any default build — G4) FLEET INCLUDE_ASM stubs : 28296 FLEET matchable : 353720
| binary | REAL | shared | LINKED | byte-ident | matchable | byte-ident % |
|---|---|---|---|---|---|---|
| main | 54 | 2 | 959 | 1055 | 2096 | 50.3% |
| resident | 129 | 0 | 0 | 131 | 145 | 90.3% |
| ov_SC01_000 | 2311 | 1742 | 0 | 2311 | 2403 | 96.2% |
| ov_SC01_001 | 2318 | 1743 | 0 | 2320 | 2466 | 94.1% |
| ov_SC01_004 | 2309 | 1734 | 0 | 2310 | 2414 | 95.7% |
| ov_SC01_005 | 2340 | 1757 | 0 | 2340 | 2503 | 93.5% |
| ov_SC01_006 | 2340 | 1757 | 0 | 2340 | 2503 | 93.5% |
| ov_SC01_008 | 2309 | 1734 | 0 | 2311 | 2426 | 95.3% |
| ov_SC01_009 | 2334 | 1735 | 0 | 2335 | 2507 | 93.1% |
| ov_SC01_074 | 2315 | 1735 | 0 | 2317 | 2425 | 95.5% |
| ov_SC01_077 | 2482 | 1702 | 0 | 2484 | 2585 | 96.1% |
| ov_SC01_080 | 2349 | 1738 | 0 | 2349 | 2512 | 93.5% |
| ov_SC01_084 | 2358 | 1738 | 0 | 2363 | 2579 | 91.6% |
| ov_SC02_000 | 2412 | 1773 | 0 | 2412 | 2683 | 89.9% |
| ov_SC02_003 | 2412 | 1773 | 0 | 2412 | 2683 | 89.9% |
| ov_SC02_004 | 2314 | 1738 | 0 | 2314 | 2401 | 96.4% |
| ov_SC02_005 | 2437 | 1734 | 0 | 2447 | 2927 | 83.6% |
| ov_SC02_011 | 2445 | 1741 | 0 | 2456 | 2893 | 84.9% |
| ov_SC02_015 | 2319 | 1740 | 0 | 2319 | 2414 | 96.1% |
| ov_SC02_016 | 2357 | 1740 | 0 | 2360 | 2545 | 92.7% |
| ov_SC02_017 | 2406 | 1740 | 0 | 2414 | 2732 | 88.4% |
| ov_SC02_021 | 2324 | 1740 | 0 | 2324 | 2437 | 95.4% |
| ov_SC02_026 | 2339 | 1738 | 0 | 2345 | 2572 | 91.2% |
| ov_SC02_027 | 2363 | 1738 | 0 | 2372 | 2692 | 88.1% |
| ov_SC02_028 | 2365 | 1738 | 0 | 2375 | 2701 | 87.9% |
| ov_SC02_031 | 2352 | 1739 | 0 | 2357 | 2562 | 92.0% |
| ov_SC02_035 | 2325 | 1738 | 0 | 2328 | 2520 | 92.4% |
| ov_SC02_039 | 2310 | 1738 | 0 | 2310 | 2416 | 95.6% |
| ov_SC02_041 | 2353 | 1738 | 0 | 2356 | 2561 | 92.0% |
| ov_SC03_001 | 2454 | 1739 | 0 | 2471 | 2869 | 86.1% |
| ov_SC03_002 | 2372 | 1743 | 0 | 2387 | 2631 | 90.7% |
| ov_SC03_003 | 2320 | 1738 | 0 | 2321 | 2423 | 95.8% |
| ov_SC03_006 | 2394 | 1744 | 0 | 2403 | 2767 | 86.8% |
| ov_SC03_007 | 2371 | 1738 | 0 | 2375 | 2623 | 90.5% |
| ov_SC03_010 | 2329 | 1738 | 0 | 2329 | 2471 | 94.3% |
| ov_SC03_011 | 2336 | 1738 | 0 | 2342 | 2527 | 92.7% |
| ov_SC03_012 | 2311 | 1738 | 0 | 2312 | 2406 | 96.1% |
| ov_SC03_013 | 2335 | 1738 | 0 | 2335 | 2493 | 93.7% |
| ov_SC03_014 | 2396 | 1763 | 0 | 2396 | 2685 | 89.2% |
| ov_SC03_015 | 2398 | 1763 | 0 | 2398 | 2685 | 89.3% |
| ov_SC03_023 | 2322 | 1738 | 0 | 2323 | 2435 | 95.4% |
| ov_SC03_024 | 2387 | 1743 | 0 | 2394 | 2641 | 90.6% |
| ov_SC03_028 | 2356 | 1738 | 0 | 2360 | 2664 | 88.6% |
| ov_SC03_029 | 2367 | 1740 | 0 | 2377 | 2644 | 89.9% |
| ov_SC03_030 | 2333 | 1743 | 0 | 2335 | 2495 | 93.6% |
| ov_SC03_031 | 2329 | 1738 | 0 | 2332 | 2514 | 92.8% |
| ov_SC03_089 | 2345 | 1738 | 0 | 2352 | 2581 | 91.1% |
| ov_SC03_090 | 2348 | 1738 | 0 | 2356 | 2625 | 89.8% |
| ov_SC03_091 | 2350 | 1738 | 0 | 2358 | 2640 | 89.3% |
| ov_SC03_092 | 2366 | 1738 | 0 | 2378 | 2587 | 91.9% |
| ov_SC03_093 | 2337 | 1738 | 0 | 2341 | 2563 | 91.3% |
| ov_SC03_094 | 2332 | 1738 | 0 | 2338 | 2577 | 90.7% |
| ov_SC03_095 | 2321 | 1738 | 0 | 2324 | 2474 | 93.9% |
| ov_SC03_096 | 2322 | 1738 | 0 | 2325 | 2465 | 94.3% |
| ov_SC03_097 | 2358 | 1738 | 0 | 2365 | 2603 | 90.9% |
| ov_SC03_098 | 2329 | 1738 | 0 | 2332 | 2541 | 91.8% |
| ov_SC03_099 | 2322 | 1738 | 0 | 2325 | 2504 | 92.9% |
| ov_SC03_100 | 2332 | 1738 | 0 | 2336 | 2539 | 92.0% |
| ov_SC03_101 | 2335 | 1738 | 0 | 2339 | 2528 | 92.5% |
| ov_SC03_102 | 2323 | 1738 | 0 | 2326 | 2492 | 93.3% |
| ov_SC03_103 | 2328 | 1740 | 0 | 2331 | 2510 | 92.9% |
| ov_SC03_104 | 2352 | 1738 | 0 | 2359 | 2616 | 90.2% |
| ov_SC03_105 | 2347 | 1738 | 0 | 2354 | 2597 | 90.6% |
| ov_SC03_108 | 2313 | 1738 | 0 | 2313 | 2443 | 94.7% |
| ov_SC03_109 | 2318 | 1738 | 0 | 2320 | 2424 | 95.7% |
| ov_SC03_110 | 2320 | 1738 | 0 | 2320 | 2468 | 94.0% |
| ov_SC03_111 | 2331 | 1738 | 0 | 2334 | 2510 | 93.0% |
| ov_SC03_112 | 2328 | 1740 | 0 | 2330 | 2526 | 92.2% |
| ov_SC03_113 | 2321 | 1740 | 0 | 2324 | 2468 | 94.2% |
| ov_SC03_114 | 2309 | 1738 | 0 | 2311 | 2415 | 95.7% |
| ov_SC03_115 | 2328 | 1738 | 0 | 2330 | 2472 | 94.3% |
| ov_SC03_116 | 2317 | 1738 | 0 | 2320 | 2438 | 95.2% |
| ov_SC03_117 | 2351 | 1738 | 0 | 2357 | 2557 | 92.2% |
| ov_SC03_118 | 2399 | 1762 | 0 | 2400 | 2685 | 89.4% |
| ov_SC03_119 | 2395 | 1762 | 0 | 2396 | 2685 | 89.2% |
| ov_SC03_121 | 2325 | 1738 | 0 | 2328 | 2459 | 94.7% |
| ov_SC03_124 | 2416 | 1734 | 0 | 2436 | 2741 | 88.9% |
| ov_SC03_125 | 2359 | 1738 | 0 | 2371 | 2588 | 91.6% |
| ov_SC03_126 | 2322 | 1740 | 0 | 2322 | 2423 | 95.8% |
| ov_SC04_000 | 2342 | 1742 | 0 | 2351 | 2546 | 92.3% |
| ov_SC04_002 | 2364 | 1738 | 0 | 2368 | 2636 | 89.8% |
| ov_SC04_003 | 2335 | 1738 | 0 | 2339 | 2502 | 93.5% |
| ov_SC04_004 | 2344 | 1738 | 0 | 2346 | 2558 | 91.7% |
| ov_SC04_005 | 2354 | 1738 | 0 | 2360 | 2612 | 90.4% |
| ov_SC04_006 | 2321 | 1738 | 0 | 2323 | 2454 | 94.7% |
| ov_SC04_007 | 2348 | 1738 | 0 | 2352 | 2569 | 91.6% |
| ov_SC04_008 | 2314 | 1738 | 0 | 2314 | 2415 | 95.8% |
| ov_SC04_009 | 2328 | 1738 | 0 | 2331 | 2441 | 95.5% |
| ov_SC04_010 | 2318 | 1738 | 0 | 2319 | 2419 | 95.9% |
| ov_SC04_011 | 2377 | 1738 | 0 | 2383 | 2803 | 85.0% |
| ov_SC04_012 | 2316 | 1738 | 0 | 2317 | 2420 | 95.7% |
| ov_SC04_015 | 2386 | 1739 | 0 | 2397 | 2611 | 91.8% |
| ov_SC04_016 | 2318 | 1738 | 0 | 2320 | 2440 | 95.1% |
| ov_SC04_018 | 2452 | 1773 | 0 | 2452 | 2857 | 85.8% |
| ov_SC04_019 | 2452 | 1773 | 0 | 2452 | 2857 | 85.8% |
| ov_SC04_020 | 2347 | 1738 | 0 | 2359 | 2567 | 91.9% |
| ov_SC04_021 | 2322 | 1740 | 0 | 2322 | 2423 | 95.8% |
| ov_SC05_000 | 2320 | 1742 | 0 | 2323 | 2422 | 95.9% |
| ov_SC05_001 | 2342 | 1738 | 0 | 2347 | 2574 | 91.2% |
| ov_SC05_002 | 2326 | 1738 | 0 | 2329 | 2442 | 95.4% |
| ov_SC05_003 | 2322 | 1738 | 0 | 2323 | 2481 | 93.6% |
| ov_SC05_004 | 2318 | 1738 | 0 | 2320 | 2464 | 94.2% |
| ov_SC05_005 | 2322 | 1738 | 0 | 2323 | 2491 | 93.3% |
| ov_SC05_006 | 2316 | 1738 | 0 | 2316 | 2430 | 95.3% |
| ov_SC05_007 | 2326 | 1738 | 0 | 2331 | 2482 | 93.9% |
| ov_SC05_008 | 2347 | 1738 | 0 | 2349 | 2543 | 92.4% |
| ov_SC05_009 | 2321 | 1738 | 0 | 2325 | 2438 | 95.4% |
| ov_SC05_010 | 2349 | 1738 | 0 | 2353 | 2588 | 90.9% |
| ov_SC05_011 | 2317 | 1738 | 0 | 2318 | 2409 | 96.2% |
| ov_SC05_017 | 2439 | 1735 | 0 | 2450 | 2842 | 86.2% |
| ov_SC05_018 | 2378 | 1738 | 0 | 2391 | 2673 | 89.5% |
| ov_SC05_019 | 2322 | 1740 | 0 | 2322 | 2423 | 95.8% |
| ov_SC06_000 | 2398 | 1747 | 0 | 2401 | 2691 | 89.2% |
| ov_SC06_006 | 2341 | 1738 | 0 | 2342 | 2511 | 93.3% |
| ov_SC06_008 | 2362 | 1740 | 0 | 2368 | 2542 | 93.2% |
| ov_SC06_010 | 2341 | 1738 | 0 | 2346 | 2517 | 93.2% |
| ov_SC06_011 | 2326 | 1738 | 0 | 2330 | 2468 | 94.4% |
| ov_SC06_013 | 2320 | 1738 | 0 | 2321 | 2425 | 95.7% |
| ov_SC06_014 | 2327 | 1738 | 0 | 2329 | 2453 | 94.9% |
| ov_SC06_015 | 2325 | 1738 | 0 | 2325 | 2421 | 96.0% |
| ov_SC06_016 | 2341 | 1738 | 0 | 2343 | 2549 | 91.9% |
| ov_SC06_018 | 2355 | 1740 | 0 | 2362 | 2665 | 88.6% |
| ov_SC06_020 | 2330 | 1740 | 0 | 2331 | 2518 | 92.6% |
| ov_SC06_022 | 2355 | 1738 | 0 | 2363 | 2642 | 89.4% |
| ov_SC06_024 | 2363 | 1738 | 0 | 2369 | 2667 | 88.8% |
| ov_SC06_025 | 2349 | 1738 | 0 | 2354 | 2572 | 91.5% |
| ov_SC06_027 | 2309 | 1738 | 0 | 2310 | 2408 | 95.9% |
| ov_SC06_029 | 2370 | 1738 | 0 | 2382 | 2662 | 89.5% |
| ov_SC06_030 | 2324 | 1738 | 0 | 2324 | 2456 | 94.6% |
| ov_SC06_032 | 2350 | 1739 | 0 | 2357 | 2658 | 88.7% |
| ov_SC06_033 | 2351 | 1739 | 0 | 2358 | 2631 | 89.6% |
| ov_SC07_000 | 2337 | 1742 | 0 | 2339 | 2521 | 92.8% |
| ov_SC07_001 | 2321 | 1738 | 0 | 2323 | 2454 | 94.7% |
| ov_SC07_002 | 2348 | 1738 | 0 | 2352 | 2579 | 91.2% |
| ov_SC07_006 | 2211 | 1555 | 0 | 2291 | 2456 | 93.3% |
| ov_SC07_007 | 2230 | 1586 | 0 | 2314 | 2613 | 88.6% |
| ov_SC07_008 | 2306 | 1738 | 0 | 2306 | 2386 | 96.6% |
| ov_SC07_009 | 2316 | 1738 | 0 | 2318 | 2430 | 95.4% |
| ov_SC07_010 | 2233 | 1608 | 0 | 2316 | 2524 | 91.8% |
| ov_SC07_011 | 2230 | 1585 | 0 | 2310 | 2449 | 94.3% |