Skip to content

Promote daKrpa_c as a genuine class TU #2002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewboudreau merged 5 commits into from
Aug 30, 2026
Merged

Promote daKrpa_c as a genuine class TU #2002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b7e086
Reconstruct daKrpa_c as a genuine class TU
andrewboudreau Aug 30, 2026
9ee9f8a
Promote daKrpa_c as a genuine class TU
andrewboudreau Aug 30, 2026
baa5d1a
Merge cpp/dakpfr-genuine-tu into cpp/dakrpa-genuine-tu
andrewboudreau Aug 30, 2026
90876b0
Merge remote-tracking branch 'origin/cpp/dakpfr-genuine-tu' into wt/k…
andrewboudreau Aug 30, 2026
d1a03ec
Restack on cpp/dakpfr-genuine-tu after main's post-#2011 re-merge
andrewboudreau Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion attribution.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,31 @@
"src/actors/daKpFr_c.cpp#func_ov070_02121fb0": "tangosdev",
"src/actors/daKpFr_c.cpp#func_ov070_02121fd0": "tangosdev",
"src/actors/daKpFr_c.cpp#func_ov070_0212200c": "tangosdev",
"src/actors/daKpFr_c.cpp#func_ov070_02122044": "ruspecial"
"src/actors/daKpFr_c.cpp#func_ov070_02122044": "ruspecial",
"src/actors/daKrpa_c.cpp#_ZN8daKrpa_c13InitResourcesEv": "tangosdev",
"src/actors/daKrpa_c.cpp#_ZN8daKrpa_c13OnYoshiTryEatEv": "andrewboudreau",
"src/actors/daKrpa_c.cpp#_ZN8daKrpa_c16CleanupResourcesEv": "tangosdev",
"src/actors/daKrpa_c.cpp#_ZN8daKrpa_c16OnPendingDestroyEv": "andrewboudreau",
"src/actors/daKrpa_c.cpp#_ZN8daKrpa_c6RenderEv": "tangosdev",
"src/actors/daKrpa_c.cpp#_ZN8daKrpa_c8BehaviorEv": "tangosdev",
"src/actors/daKrpa_c.cpp#_ZN8daKrpa_cD0Ev": "andrewboudreau",
"src/actors/daKrpa_c.cpp#_ZN8daKrpa_cD1Ev": "andrewboudreau",
"src/actors/daKrpa_c.cpp#daKrpa_c_Spawn": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_021211c4": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121298": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121310": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_021213cc": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121438": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_021214f8": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121548": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_0212156c": "lunavyqo",
"src/actors/daKrpa_c.cpp#func_ov070_021216b8": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121710": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_021217ac": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_0212180c": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121848": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121880": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121a64": "tangosdev",
"src/actors/daKrpa_c.cpp#func_ov070_02121ae0": "tangosdev"
}
}
104 changes: 4 additions & 100 deletions config/arm9/overlays/ov070/delinks.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,106 +188,6 @@ src/Amp_Spawn.c:
complete
.text start:0x021210ac end:0x02121118

src/_ZN8daKrpa_cD1Ev.cpp:
complete
.text start:0x02121118 end:0x02121160

src/_ZN8daKrpa_cD0Ev.cpp:
complete
.text start:0x02121160 end:0x021211bc

src/_ZN8daKrpa_c13OnYoshiTryEatEv.cpp:
complete
.text start:0x021211bc end:0x021211c4

src/func_ov070_021211c4.cpp:
complete
.text start:0x021211c4 end:0x02121298

src/func_ov070_02121298.cpp:
complete
.text start:0x02121298 end:0x02121310

src/func_ov070_02121310.cpp:
complete
.text start:0x02121310 end:0x021213cc

src/func_ov070_021213cc.c:
complete
.text start:0x021213cc end:0x02121438

src/func_ov070_02121438.cpp:
complete
.text start:0x02121438 end:0x021214f8

src/func_ov070_021214f8.cpp:
complete
.text start:0x021214f8 end:0x02121548

src/func_ov070_02121548.c:
complete
.text start:0x02121548 end:0x0212156c

src/func_ov070_0212156c.c:
complete
.text start:0x0212156c end:0x021216b8

src/func_ov070_021216b8.c:
complete
.text start:0x021216b8 end:0x02121710

src/func_ov070_02121710.cpp:
complete
.text start:0x02121710 end:0x021217ac

src/func_ov070_021217ac.c:
complete
.text start:0x021217ac end:0x0212180c

src/func_ov070_0212180c.cpp:
complete
.text start:0x0212180c end:0x02121848

src/func_ov070_02121848.cpp:
complete
.text start:0x02121848 end:0x02121880

src/func_ov070_02121880.c:
complete
.text start:0x02121880 end:0x0212189c

src/_ZN8daKrpa_c16CleanupResourcesEv.cpp:
complete
.text start:0x0212189c end:0x021218c0

src/_ZN8daKrpa_c16OnPendingDestroyEv.cpp:
complete
.text start:0x021218c0 end:0x021218c4

src/_ZN8daKrpa_c6RenderEv.cpp:
complete
.text start:0x021218c4 end:0x021218f4

src/_ZN8daKrpa_c8BehaviorEv.cpp:
complete
.text start:0x021218f4 end:0x02121914

src/_ZN8daKrpa_c13InitResourcesEv.cpp:
complete
.text start:0x02121914 end:0x02121a64

src/func_ov070_02121a64.c:
complete
.text start:0x02121a64 end:0x02121ae0

src/func_ov070_02121ae0.c:
complete
.text start:0x02121ae0 end:0x02121af8

src/daKrpa_c_Spawn.c:
complete
.text start:0x02121af8 end:0x02121b48

src/__sinit_ov070_02122afc.c:
complete
.init start:0x02122afc end:0x02122d80
Expand All @@ -304,6 +204,10 @@ src/__sinit_ov070_02123030.c:
complete
.init start:0x02123030 end:0x021230a4

src/actors/daKrpa_c.cpp:
complete
.text start:0x02121118 end:0x02121b48

src/actors/daKpFr_c.cpp:
complete
.text start:0x02121b48 end:0x02122244
7 changes: 7 additions & 0 deletions config/converted-backslide-exceptions.jsonl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,12 @@
{"path": "src/_ZN8daKpFr_c8BehaviorEv.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKpFr_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 21-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKpFr_cD0Ev.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKpFr_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 21-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKpFr_cD1Ev.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKpFr_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 21-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKrpa_c13OnYoshiTryEatEv.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKrpa_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 25-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKrpa_c16CleanupResourcesEv.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKrpa_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 25-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKrpa_c16OnPendingDestroyEv.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKrpa_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 25-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKrpa_c6RenderEv.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKrpa_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 25-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKrpa_c8BehaviorEv.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKrpa_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 25-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKrpa_cD0Ev.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKrpa_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 25-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN8daKrpa_cD1Ev.cpp", "reason": "Atomic promotion consolidated this banked one-function path into src/actors/daKrpa_c.cpp. Its compiler-owned symbol, exact bytes, and relocation identity remain verified in the promoted 25-function class TU; only the legacy path disappeared."}
{"path": "src/_ZN12daObjAbuku_cD0Ev.cpp", "reason": "TU promotion ov002/daObjAbuku_c (PR #1996) consolidated these two per-symbol files into src/actors/daObjAbuku_c.cpp. A reconstructed TU must spell vague-linkage symbols directly (_ZN7fBase_cnwEj, _ZN8dActor_cC2Ev, _ZN8dActor_cD2Ev) or its range will not link, so no_mangled_refs cannot pass for the absorbing file. Byte-match outranks readability; the code was not reverted and no byte changed."}
{"path": "src/_ZN12daObjAbuku_cD1Ev.cpp", "reason": "TU promotion ov002/daObjAbuku_c (PR #1996) consolidated these two per-symbol files into src/actors/daObjAbuku_c.cpp. A reconstructed TU must spell vague-linkage symbols directly (_ZN7fBase_cnwEj, _ZN8dActor_cC2Ev, _ZN8dActor_cD2Ev) or its range will not link, so no_mangled_refs cannot pass for the absorbing file. Byte-match outranks readability; the code was not reverted and no byte changed."}
9 changes: 1 addition & 8 deletions config/converted-baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"no_codegen_trick",
"no_mangled_refs"
],
"count": 2559,
"count": 2552,
"converted": [
"src/ARMMathLoadState.c",
"src/ARMMathSaveState.c",
Expand Down Expand Up @@ -2103,13 +2103,6 @@
"src/_ZN8daEyBm_c16OnPendingDestroyEv.cpp",
"src/_ZN8daEyBm_cD0Ev.cpp",
"src/_ZN8daEyBm_cD1Ev.cpp",
"src/_ZN8daKrpa_c13OnYoshiTryEatEv.cpp",
"src/_ZN8daKrpa_c16CleanupResourcesEv.cpp",
"src/_ZN8daKrpa_c16OnPendingDestroyEv.cpp",
"src/_ZN8daKrpa_c6RenderEv.cpp",
"src/_ZN8daKrpa_c8BehaviorEv.cpp",
"src/_ZN8daKrpa_cD0Ev.cpp",
"src/_ZN8daKrpa_cD1Ev.cpp",
"src/_ZN9Animation4CopyERKS_.cpp",
"src/_ZN9Animation7AdvanceEv.cpp",
"src/_ZN9Animation8FinishedEv.cpp",
Expand Down
142 changes: 136 additions & 6 deletions config/tu_manifest.d/ov070/daKrpa_c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"id": "ov070/daKrpa_c",
"module": "ov070",
"source": "src_tu/actors/daKrpa_c.cpp",
"source": "src/actors/daKrpa_c.cpp",
"promoted_source": "src/actors/daKrpa_c.cpp",
"status": "text-verified",
"status": "promoted",
"boundary_confidence": "high",
"boundary_evidence": [
"contiguous linker run: 0x2121118..0x2121b48, 25 function(s), from build/tu_map.json (tools/tu_map.py)",
Expand Down Expand Up @@ -196,10 +196,89 @@
],
"data": [],
"bss": [],
"compiler_only_output": [
{
"symbol": "_ZN7Vector3D1Ev",
"disposition": "deadstrip-duplicate",
"canonical_module": "arm9",
"canonical_address": "0x020072c0",
"reason": "The genuine Vector3 locals make mwcc emit the deliberately empty inline destructor as vague linkage. This object's copy is the exact four-byte `bx lr` body at its canonical arm9 home, and no surviving section references the discarded duplicate."
},
{
"symbol": "_ZTI7fBase_c",
"disposition": "deadstrip-data",
"canonical_module": "arm9",
"canonical_address": "0x02086d70",
"reason": "The key-function TU emits inherited fBase_c typeinfo as vague linkage; romdata_check proves the copy at its canonical arm9 home before text-only isolation discards it."
},
{
"symbol": "_ZTS7fBase_c",
"disposition": "deadstrip-data",
"canonical_module": "arm9",
"canonical_address": "0x02086e60",
"reason": "The key-function TU emits the inherited fBase_c type-name string as vague linkage; romdata_check proves its bytes at the canonical arm9 home."
},
{
"symbol": "_ZTS7dBase_c",
"disposition": "deadstrip-data",
"canonical_module": "arm9",
"canonical_address": "0x02086e54",
"reason": "The key-function TU emits the inherited dBase_c type-name string as vague linkage; romdata_check proves its bytes at the canonical arm9 home."
},
{
"symbol": "_ZTS8dActor_c",
"disposition": "deadstrip-data",
"canonical_module": "arm9",
"canonical_address": "0x0208e384",
"reason": "The key-function TU emits the inherited dActor_c type-name string as vague linkage; romdata_check proves its bytes at the canonical arm9 home."
},
{
"symbol": "_ZTS8daKrpa_c",
"disposition": "deadstrip-data",
"canonical_module": "ov070",
"canonical_address": "0x02123334",
"reason": "The key-function TU emits daKrpa_c's ROM-named type string; romdata_check proves its exact bytes at the canonical ov070 home before text-only isolation discards the copy."
},
{
"symbol": "_ZTI8daKrpa_c",
"disposition": "deadstrip-data",
"canonical_module": "ov070",
"canonical_address": "0x02123340",
"reason": "The key-function TU emits daKrpa_c's single-inheritance typeinfo; romdata_check proves its ABI kind, name relocation, and dActor_c base link at the canonical ov070 home."
},
{
"symbol": "_ZTI8dActor_c",
"disposition": "deadstrip-data",
"canonical_module": "arm9",
"canonical_address": "0x0208e390",
"reason": "The key-function TU emits inherited dActor_c typeinfo as vague linkage; romdata_check proves the copy at its canonical arm9 home."
},
{
"symbol": "_ZTI7dBase_c",
"disposition": "deadstrip-data",
"canonical_module": "arm9",
"canonical_address": "0x02086e78",
"reason": "The key-function TU emits inherited dBase_c typeinfo as vague linkage; romdata_check proves the copy at its canonical arm9 home."
},
{
"symbol": "daKrpa_c_SpawnInfo",
"disposition": "deadstrip-data",
"canonical_module": "ov070",
"canonical_address": "0x0212334c",
"reason": "The source reconstructs the 0x1c actor descriptor with its sole relocation to daKrpa_c_Spawn and exact priorities, flags, and culling words; romdata_check proves all emitted bytes at its ov070 home."
},
{
"symbol": "_ZTV8daKrpa_c",
"disposition": "deadstrip-data",
"canonical_module": "ov070",
"canonical_address": "0x02123370",
"reason": "The key-function TU emits the full daKrpa_c vtable storage; romdata_check applies the 8-byte ABI address-point bias and proves all 31 retail slots before text-only isolation discards it."
}
],
"notes": [
"Generated by tools/tubuild.py create. See the file's own header comment for what was and was not reconciled, and notes/translation-unit-reconstruction-plan.md section 7.3 for what this generator does and does not attempt to resolve automatically.",
"tubuild create warning: hand-assembled: raw concatenation in reverse ROM order; tubuild create refused this TU (extern \"C\"-wrapped legacy bodies)",
"25/25 MATCH, objisolate clean, reloc-destinations clean. Hand-assembled. Two different legacy shadow structs both named C (a PMF dispatch view and a Render vtable view) -- the Render one renamed TU-locally; decl_common.h's declarations win where they exist (0212180c char*, 02121880 void*); one destructor emits D0+D1; Spawn stores &_ZTV8daKrpa_c[2].",
"tubuild create warning: this TU began as a hand-assembled reverse-ROM-order concatenation because tubuild create refused the extern-C-wrapped legacy bodies; it has since been reconstructed around the genuine daKrpa_c class and typed owned subobjects.",
"25/25 MATCH, objisolate clean, reloc-destinations clean. Natural `new daKrpa_c` was rejected because it relocates to unresolved `_Znwm`; the typed actor-table factory explicitly retains retail `_ZN7fBase_cnwEj` plus the proven base/member constructors and vptr store. The inline virtual destructor makes mwcc emit retail D1 then D0 with no D2. Real Vector3 locals deliberately emit their exact canonical empty destructor duplicate, and the source emits the exact actor descriptor, RTTI, and complete vtable; every discarded object is fail-closed through a canonical-home policy in this text-only manifest.",
"Spawn symbol renamed with the class (FlameChomp[Fire]_Spawn -> daKrpa_c_Spawn); re-verified N/N MATCH after the rename."
],
"verification": {
Expand All @@ -213,9 +292,60 @@
"criteria": {
"every_declared_function_defined": "PASS",
"every_declared_function_bytes_match": "PASS",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 11 unlicensed section/symbol(s); see unlicensed_output_observed",
"functions_occur_in_expected_order": "PARTIAL -- ordinal pair(s) not in ROM order: [(0, 1)]",
"declared_function_set_equals_defined_function_set": "PASS",
"functions_occur_in_expected_order": "PASS",
"relocation_destinations_verified": "PASS"
},
"compilerOnlyOutput": {
"requested": [
"_ZN7Vector3D1Ev"
],
"deadstripped": [
"_ZN7Vector3D1Ev"
],
"droppedSections": [
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
42
],
"data": [
"_ZTI7fBase_c",
"_ZTS7fBase_c",
"_ZTS7dBase_c",
"_ZTS8dActor_c",
"_ZTS8daKrpa_c",
"_ZTI8daKrpa_c",
"_ZTI8dActor_c",
"_ZTI7dBase_c",
"daKrpa_c_SpawnInfo",
"_ZTV8daKrpa_c"
],
"dataExternalized": [
"_ZTI7dBase_c",
"_ZTI7fBase_c",
"_ZTI8dActor_c",
"_ZTI8daKrpa_c",
"_ZTS7dBase_c",
"_ZTS7fBase_c",
"_ZTS8dActor_c",
"_ZTS8daKrpa_c",
"_ZTV8daKrpa_c",
"daKrpa_c_SpawnInfo"
]
}
}
}
Loading
Loading