mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-10-03 00:05:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(phase-29): normalize func_8014F468 to the fleet-canonical s32 (unblocks the ×138 reach) + §75

Browse Source 
- THE PROPAGATION CAP WAS A MINORITY-SPELLING SOURCE OVERLAY, byte-censused:
    extern s32 func_8014F468(void);   1710   |  s32 func_8014F468(void)  134   <- fleet canon
    extern void func_8014F468(void);    20   |  void func_8014F468(void)   4   <- the outlier
  and ALL 4 `void` definitions are ov_SC07_{006,007,010,011} — the overlay the F3E8 body was
  banked from. dedup_propagate carries the source overlay's file-scope externs into the shared
  macro VERBATIM, so the macro inherited `extern void` and the 134 overlays that define the
  symbol `s32` rejected it. Propagation landed on exactly that 4-overlay island.
- The exclusion message ("byte-diverge / irreconcilable") is provably the wrong cause: members
  are selected BY h_exact, so all 138 are byte-identical by construction. It is a COMPILE
  conflict, never a byte one (same defect family as §68's mislabel, same tool).
- NORMALIZED the 24 minority occurrences to s32 (4 definitions + 19 overlay externs + the 1
  line in the freshly-authored macro). func_8014F468 is a pure inline-asm $sp-switch trampoline
  — no C-level value flow — and 134 overlays already PROVED s32 is byte-correct for the
  identical function. Fleet is now uniform: 1730 extern s32 + 138 s32 defs, 0 `void`.
- BYTE-GATED the complete blast radius (the 4 instantiators of DEFINE_func_8014F3E8):
  ov_SC07_006 7ca772be · 007 b3b95547 · 010 d7b5875d · 011 9885af74 — all BYTE-IDENTICAL.
- cookbook §75: census the carried extern before believing an exclusion message; prefer a
  majority-spelling source overlay; always pass --recover; after normalizing use dedup_extend
  (the body is already a macro) not dedup_propagate --addr.
This commit is contained in:
Drew T
2026-07-25 12:45:11 -06:00
parent 10ea5ff653
commit 2fcb8de6bf
25 changed files with 83 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/matching-cookbook.md
+59
View File
@@ -5841,3 +5841,62 @@ behemoth hides a `jal` easily.)
**Standing rule of thumb:** prefer a **callee-saved** register for any pin whose variable outlives a
call; if the target's register really is caller-saved and the value really does span a `jal`, the pin
cannot express it — that is a genuine wall verdict, not a drafting slip.
## §75 — A propagation cap is usually a MINORITY-SPELLING SOURCE OVERLAY, not a wall: census the carried extern before believing the exclusion message (Phase 29 SESSION-19, `func_8014F3E8` ×4 → ×138)
`dedup_propagate` authors the shared macro from ONE source overlay and carries that overlay's
file-scope `extern` lines into the macro **verbatim**. Those externs are then instantiated in every
member TU. So **whatever spelling the source overlay happens to use becomes the fleet's spelling** —
and if the source is an outlier, the macro conflicts everywhere else and the group silently caps its
reach at the outlier's island. The exclusion message calls that `byte-diverge / irreconcilable`,
which is the wrong cause and reads like a wall.
**The tell: the bytes cannot be diverging.** Members are selected by `h_exact` — the SHA1 of raw
instruction bytes, relocs included. If a group has N members it is because all N are byte-identical.
So an exclusion is a **compile** conflict, never a byte one. Any message saying otherwise is lying
(cf. §68's mislabel — same tool, same defect family).
**The census that names the real cause (30 seconds, read-only).** Take the symbol the carried extern
declares and count every spelling of it across the tree:
```
grep -rh '<sym>' src --include=*.c --include=*.h \
| grep -E 'extern|^\s*(void|s32|int|u32)\s+<sym>\s*\(' \
| sed -E 's/^\s+//; s/\s+/ /g; s/ \\$//' | sort | uniq -c | sort -rn
```
Worked case — `func_8014F468`, carried by the `func_8014F3E8` body:
| spelling | count | |
|---|---|---|
| `extern s32 func_8014F468(void);` | 1,710 | fleet canon |
| `s32 func_8014F468(void)` (def) | 134 | fleet canon |
| `extern void func_8014F468(void);` | 20 | **the outlier** |
| `void func_8014F468(void)` (def) | 4 | **the outlier — and all 4 are `ov_SC07_{006,007,010,011}`** |
The source overlay I banked from was one of the four. The macro inherited `extern void`, and the 134
overlays that *define* the symbol `s32` rejected it — propagation landed on exactly the 4-overlay
island. Nothing about the code was hard.
**The fix is NORMALIZATION, not a reconciliation engine.** Flip the minority spelling to the fleet
canon (here 24 occurrences: 4 definitions + 19 overlay externs + 1 line in the freshly-authored
macro), byte-gate the affected binaries, then extend the group. `func_8014F468` is a pure inline-asm
`$sp`-switch trampoline, so the return type carries no C-level value flow — and 134 overlays already
*proved* `s32` is byte-correct for the identical function. All 4 flipped binaries stayed
byte-identical.
**Why a reconciliation engine is the WRONG shape here.** One macro text is instantiated in 138 TUs;
it cannot carry a per-overlay extern. If the members genuinely disagree, no per-member rewrite of a
*shared* body can satisfy them all — you must make them agree first. (`reconcile_tu.fix()` already
does "TU wins + cast at use" for DATA decls and deliberately skips `d.kind == 'func'`; extending it
would not have helped, because the conflicting text lives in the shared header, not in a draft.)
**Practice:**
1. **Prefer a majority-spelling source overlay.** Before propagating from overlay X, census X's decls
of every symbol the body carries. A minority source caps the group by construction.
2. **Always pass `--recover`** on a targeted `--addr` run. Without it, the first culprit overlay
triggers the historical all-or-nothing drop and the group banks **×0** instead of ×(N−1). This
session lost a whole group to that flag before re-running.
3. **After normalizing, the body is already a macro** — so the follow-up is `dedup_extend`
(`--binaries <the excluded set>`), **not** `dedup_propagate --addr`, which can only author from an
*inline def* and will report "no source overlay has it matched".
4. Re-check any group historically stuck at a small reach for the same cause — `func_80174CB0` (×3
since SESSION-18) was carrying the identical class.
src/ov_SC07_006/ov_SC07_006_jr_80140608.c
+1 -1
View File
@@ -4315,7 +4315,7 @@ DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014F3E8 (src/shared) */
extern void func_8014F4C0();
void func_8014F468(void)
s32 func_8014F468(void)
{
extern int D_801F4EF4;
src/ov_SC07_006/ov_SC07_006_jr_80154C24.c
+1 -1
View File
@@ -1533,7 +1533,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0();
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_006/ov_SC07_006_jr_801588CC.c
+1 -1
View File
@@ -1533,7 +1533,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0();
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_006/ov_SC07_006_jr_8015C32C.c
+1 -1
View File
@@ -1533,7 +1533,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0();
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_006/ov_SC07_006_jr_8017AE2C.c
+1 -1
View File
@@ -1535,7 +1535,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0();
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_006/ov_SC07_006_jr_8017BEBC.c
+1 -1
View File
@@ -1509,7 +1509,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0();
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_007/ov_SC07_007_jr_80140608.c
+1 -1
View File
@@ -3624,7 +3624,7 @@ DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014F3E8 (src/shared) */
extern void func_8014F4C0(u8 *a0);
void func_8014F468(void)
s32 func_8014F468(void)
{
extern int D_801C665C;
src/ov_SC07_007/ov_SC07_007_jr_80154C24.c
+1 -1
View File
@@ -1533,7 +1533,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_007/ov_SC07_007_jr_801588CC.c
+1 -1
View File
@@ -1533,7 +1533,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_007/ov_SC07_007_jr_8015C32C.c
+1 -1
View File
@@ -1533,7 +1533,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_007/ov_SC07_007_jr_8017AE2C.c
+1 -1
View File
@@ -1535,7 +1535,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c
+1 -1
View File
@@ -1509,7 +1509,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_010/ov_SC07_010_jr_80140608.c
+1 -1
View File
@@ -3113,7 +3113,7 @@ DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014F3E8 (src/shared) */
extern void func_8014F4C0(u8 *a0);
void func_8014F468(void)
s32 func_8014F468(void)
{
extern int D_801A6B54;
src/ov_SC07_010/ov_SC07_010_jr_80154C24.c
+1 -1
View File
@@ -948,7 +948,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern u8 D_800D3918[];
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
src/ov_SC07_010/ov_SC07_010_jr_801588CC.c
+1 -1
View File
@@ -948,7 +948,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern u8 D_800D3918[];
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
src/ov_SC07_010/ov_SC07_010_jr_8015C32C.c
+1 -1
View File
@@ -948,7 +948,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern u8 D_800D3918[];
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c
+1 -1
View File
@@ -950,7 +950,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern u8 D_800D3918[];
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
src/ov_SC07_011/ov_SC07_011_jr_80140608.c
+1 -1
View File
@@ -3626,7 +3626,7 @@ DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014F3E8 (src/shared) */
extern void func_8014F4C0(u8 *a0);
void func_8014F468(void)
s32 func_8014F468(void)
{
extern int D_8018F1EC;
src/ov_SC07_011/ov_SC07_011_jr_80154C24.c
+1 -1
View File
@@ -1534,7 +1534,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_011/ov_SC07_011_jr_801588CC.c
+1 -1
View File
@@ -1534,7 +1534,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_011/ov_SC07_011_jr_8015C32C.c
+1 -1
View File
@@ -1534,7 +1534,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_011/ov_SC07_011_jr_8017AE2C.c
+1 -1
View File
@@ -1536,7 +1536,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/ov_SC07_011/ov_SC07_011_jr_8017BEBC.c
+1 -1
View File
@@ -1510,7 +1510,7 @@ extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
extern s32 func_8014F24C(struct SubF24C *a0);
extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
extern void func_8014F4C0(u8 *a0);
extern void func_8014F468(void);
extern s32 func_8014F468(void);
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
src/shared/engine_core.h
+1 -1
View File
@@ -29296,7 +29296,7 @@
}
#define DEFINE_func_8014F3E8() \
extern void func_8014F468(void); \
extern s32 func_8014F468(void); \
extern int func_8014F6F4(void); \
s32 func_8014F3E8(s32 param_1) \
{ \