Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions config/arm9/overlays/ov010/delinks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ src/_ZN9LightBeam13InitResourcesEv.cpp:
complete
.text start:0x02111d20 end:0x02111dd0

src/LightBeam_Spawn.c:
src/daObjC1Hikari_c_classInit.c:
complete
.text start:0x02111dd0 end:0x02111e10

Expand Down Expand Up @@ -67,7 +67,7 @@ src/_ZN13PeachPainting13InitResourcesEv.cpp:
complete
.text start:0x02111fc0 end:0x02112004

src/PeachPainting_Spawn.c:
src/daObjC1Peach_c_classInit.c:
complete
.text start:0x02112004 end:0x0211203c

Expand Down
8 changes: 4 additions & 4 deletions config/arm9/overlays/ov010/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ _ZN9LightBeam16CleanupResourcesEv kind:function(arm,size=0x24) addr:0x02111a94
_ZN9LightBeam6RenderEv kind:function(arm,size=0x28) addr:0x02111ab8
_ZN9LightBeam8BehaviorEv kind:function(arm,size=0x240) addr:0x02111ae0
_ZN9LightBeam13InitResourcesEv kind:function(arm,size=0xb0) addr:0x02111d20
LightBeam_Spawn kind:function(arm,size=0x40) addr:0x02111dd0
daObjC1Hikari_c_classInit kind:function(arm,size=0x40) addr:0x02111dd0
_ZN13PeachPaintingD1Ev kind:function(arm,size=0x30) addr:0x02111e10
_ZN13PeachPaintingD0Ev kind:function(arm,size=0x44) addr:0x02111e40
_ZN13PeachPainting20UpdateModelTransformEv kind:function(arm,size=0x40) addr:0x02111e84
_ZN13PeachPainting16CleanupResourcesEv kind:function(arm,size=0x24) addr:0x02111ec4
_ZN13PeachPainting6RenderEv kind:function(arm,size=0x40) addr:0x02111ee8
_ZN13PeachPainting8BehaviorEv kind:function(arm,size=0x98) addr:0x02111f28
_ZN13PeachPainting13InitResourcesEv kind:function(arm,size=0x44) addr:0x02111fc0
PeachPainting_Spawn kind:function(arm,size=0x38) addr:0x02112004
daObjC1Peach_c_classInit kind:function(arm,size=0x38) addr:0x02112004
__sinit_ov010_0211203c kind:function(arm,size=0xe0) addr:0x0211203c
__sinit_ov010_0211211c kind:function(arm,size=0x40) addr:0x0211211c
__sinit_ov010_0211215c kind:function(arm,size=0x40) addr:0x0211215c
Expand Down Expand Up @@ -122,7 +122,7 @@ _ZTV14daObjC1_Trap_c kind:data(any) addr:0x02112ae4
data_ov010_02112b08 kind:data(any) addr:0x02112b08 ambiguous
_ZTI15daObjC1Hikari_c kind:data(any) addr:0x02112b64
_ZTS15daObjC1Hikari_c kind:data(any) addr:0x02112b70
LightBeam_SpawnInfo kind:data(any) addr:0x02112b84 ambiguous
g_profile_C1_HIKARI kind:data(any) addr:0x02112b84 ambiguous
_ZTV9LightBeam kind:data(any) addr:0x02112ba8
_ZTV15daObjC1Hikari_c kind:data(any) addr:0x02112ba8
data_ov010_02112bdc kind:data(any) addr:0x02112bdc ambiguous
Expand All @@ -131,7 +131,7 @@ data_ov010_02112c08 kind:data(any) addr:0x02112c08 ambiguous
data_ov010_02112c18 kind:data(any) addr:0x02112c18 ambiguous
_ZTI14daObjC1Peach_c kind:data(any) addr:0x02112c24
_ZTS14daObjC1Peach_c kind:data(any) addr:0x02112c30
PeachPainting_SpawnInfo kind:data(any) addr:0x02112c44 ambiguous
g_profile_C1_PEACH kind:data(any) addr:0x02112c44 ambiguous
data_ov010_02112c4c kind:data(any) addr:0x02112c4c ambiguous
data_ov010_02112c58 kind:data(any) addr:0x02112c58 ambiguous
_ZTV13PeachPainting kind:data(any) addr:0x02112c68
Expand Down
4 changes: 2 additions & 2 deletions config/arm9/overlays/ov014/delinks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ src/_ZN10ShutterBob13InitResourcesEv.cpp:
complete
.text start:0x02111294 end:0x021112cc

src/ShutterBob_Spawn.c:
src/daObjBSwdoor_c_classInit.c:
complete
.text start:0x021112cc end:0x02111308

Expand Down Expand Up @@ -171,7 +171,7 @@ src/_ZN15ChainChompFence13InitResourcesEv.cpp:
complete
.text start:0x02112ffc end:0x0211307c

src/ChainChompFence_Spawn.c:
src/daObjWanwanShutter_c_classInit.c:
complete
.text start:0x0211307c end:0x021130ac

Expand Down
8 changes: 4 additions & 4 deletions config/arm9/overlays/ov014/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ _ZN10ShutterBobD0Ev kind:function(arm,size=0x64) addr:0x021111f0
_ZN10ShutterBob16CleanupResourcesEv kind:function(arm,size=0x14) addr:0x02111254
_ZN10ShutterBob8BehaviorEv kind:function(arm,size=0x2c) addr:0x02111268
_ZN10ShutterBob13InitResourcesEv kind:function(arm,size=0x38) addr:0x02111294
ShutterBob_Spawn kind:function(arm,size=0x3c) addr:0x021112cc
daObjBSwdoor_c_classInit kind:function(arm,size=0x3c) addr:0x021112cc
_ZN10ChainChompD1Ev kind:function(arm,size=0xb4) addr:0x02111308
_ZN10ChainChompD0Ev kind:function(arm,size=0xc8) addr:0x021113bc
func_ov014_02111484 kind:function(arm,size=0x54) addr:0x02111484
Expand Down Expand Up @@ -40,7 +40,7 @@ _ZN15ChainChompFence16CleanupResourcesEv kind:function(arm,size=0x44) addr:0x021
_ZN15ChainChompFence6RenderEv kind:function(arm,size=0x40) addr:0x02112f80
_ZN15ChainChompFence8BehaviorEv kind:function(arm,size=0x3c) addr:0x02112fc0
_ZN15ChainChompFence13InitResourcesEv kind:function(arm,size=0x80) addr:0x02112ffc
ChainChompFence_Spawn kind:function(arm,size=0x30) addr:0x0211307c
daObjWanwanShutter_c_classInit kind:function(arm,size=0x30) addr:0x0211307c
__sinit_ov014_021130ac kind:function(arm,size=0x6c) addr:0x021130ac
__sinit_ov014_02113118 kind:function(arm,size=0x1e4) addr:0x02113118
__sinit_ov014_021132fc kind:function(arm,size=0x6c) addr:0x021132fc
Expand Down Expand Up @@ -158,7 +158,7 @@ data_ov014_02114598 kind:data(any) addr:0x02114598 ambiguous
_ZTI14daObjBSwdoor_c kind:data(any) addr:0x021145b8
data_ov014_021145c4 kind:data(any) addr:0x021145c4
_ZTS14daObjBSwdoor_c kind:data(any) addr:0x021145d0
ShutterBob_SpawnInfo kind:data(any) addr:0x021145e4 ambiguous
g_profile_SWITCHDOOR kind:data(any) addr:0x021145e4 ambiguous
_ZTV10ShutterBob kind:data(any) addr:0x02114608
data_ov014_0211462c kind:data(any) addr:0x0211462c ambiguous
data_ov014_02114688 kind:data(any) addr:0x02114688
Expand Down Expand Up @@ -192,7 +192,7 @@ data_ov014_02114860 kind:data(any) addr:0x02114860 ambiguous
_ZTI20daObjWanwanShutter_c kind:data(any) addr:0x02114868
_ZTS20daObjWanwanShutter_c kind:data(any) addr:0x02114874
data_ov014_0211487c kind:data(any) addr:0x0211487c ambiguous
ChainChompFence_SpawnInfo kind:data(any) addr:0x0211488c ambiguous
g_profile_WANWAN_SHUTTER kind:data(any) addr:0x0211488c ambiguous
data_ov014_02114898 kind:data(any) addr:0x02114898 ambiguous
_ZTV15ChainChompFence kind:data(any) addr:0x021148b0
data_ov014_021148b4 kind:data(any) addr:0x021148b4 ambiguous
Expand Down
2 changes: 1 addition & 1 deletion config/arm9/overlays/ov017/delinks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ src/_ZN9ShipWater13InitResourcesEv.cpp:
complete
.text start:0x021113c0 end:0x02111480

src/ShipWater_Spawn.c:
src/daObjKsWater_c_classInit.c:
complete
.text start:0x02111480 end:0x021114b8

Expand Down
4 changes: 2 additions & 2 deletions config/arm9/overlays/ov017/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _ZN9ShipWater16CleanupResourcesEv kind:function(arm,size=0x44) addr:0x0211124c
_ZN9ShipWater6RenderEv kind:function(arm,size=0x34) addr:0x02111290
_ZN9ShipWater8BehaviorEv kind:function(arm,size=0xfc) addr:0x021112c4
_ZN9ShipWater13InitResourcesEv kind:function(arm,size=0xc0) addr:0x021113c0
ShipWater_Spawn kind:function(arm,size=0x38) addr:0x02111480
daObjKsWater_c_classInit kind:function(arm,size=0x38) addr:0x02111480
data_ov017_021114b8 kind:data(any) addr:0x021114b8
data_ov017_021114bc kind:data(any) addr:0x021114bc
data_ov017_021114c0 kind:data(any) addr:0x021114c0
Expand Down Expand Up @@ -71,7 +71,7 @@ data_ov017_02111b74 kind:data(any) addr:0x02111b74 ambiguous
data_ov017_02111b88 kind:data(any) addr:0x02111b88 ambiguous
_ZTI14daObjKsWater_c kind:data(any) addr:0x02111bb4
_ZTS14daObjKsWater_c kind:data(any) addr:0x02111bc0
ShipWater_SpawnInfo kind:data(any) addr:0x02111bd4 ambiguous
g_profile_KS_MIZU kind:data(any) addr:0x02111bd4 ambiguous
data_ov017_02111be0 kind:data(any) addr:0x02111be0 ambiguous
_ZTV9ShipWater kind:data(any) addr:0x02111bf8
_ZTV14daObjKsWater_c kind:data(any) addr:0x02111bf8
Expand Down
17 changes: 13 additions & 4 deletions config/tu_manifest.d/ov010/LightBeam.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
"ordinal": 6
},
{
"symbol": "LightBeam_Spawn",
"symbol": "daObjC1Hikari_c_classInit",
"address": "0x02111dd0",
"size": "0x00000040",
"legacy_source": "src/LightBeam_Spawn.c",
"legacy_source": "src/daObjC1Hikari_c_classInit.c",
"ordinal": 7
}
],
Expand All @@ -80,7 +80,8 @@
"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: CONFLICT: extern declaration 'Matrix4x3_FromRotationY' differs between the legacy file that used to hold func_ov010_02111a54 and the one that held _ZN9LightBeam8BehaviorEv; kept the first, the other is commented out for review",
"8/8 MATCH, objisolate clean, reloc-destinations clean. TU-local C++ class; the 0x124 member is a 1-byte dCcAcPos_c stand-in carrying the evidenced _ZN10dCcAcPos_cD1Ev call -- the full header type would not fit the flat layout (next field at 0x125)."
"8/8 MATCH, objisolate clean, reloc-destinations clean. TU-local C++ class; the 0x124 member is a 1-byte dCcAcPos_c stand-in carrying the evidenced _ZN10dCcAcPos_cD1Ev call -- the full header type would not fit the flat layout (next field at 0x125).",
"Reconstructed source-style factory symbol daObjC1Hikari_c_classInit: class identity is ROM-proven by RTTI/allocation/vtable and profile identity by literal ROM ID C1_HIKARI; classInit spelling is later-EAD lineage reconstruction. Historical alias: LightBeam_Spawn."
],
"verification": {
"round": "tools/tubuild.py verify -- text-only, whole shadow TU compiled once",
Expand All @@ -93,9 +94,17 @@
"criteria": {
"every_declared_function_defined": "PASS",
"every_declared_function_bytes_match": "PASS",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 7 unlicensed section/symbol(s); see unlicensed_output_observed",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 7 unlicensed section/symbol(s), 2 compiler-only policy error(s)",
"functions_occur_in_expected_order": "PARTIAL -- ordinal pair(s) not in ROM order: [(0, 1)]",
"relocation_destinations_verified": "PASS"
},
"compilerOnlyOutput": {
"requested": [],
"unhandled": [
"_ZN7Vector3D1Ev",
"_ZN9LightBeamD2Ev"
],
"data": []
}
}
}
16 changes: 12 additions & 4 deletions config/tu_manifest.d/ov010/PeachPainting.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
"ordinal": 6
},
{
"symbol": "PeachPainting_Spawn",
"symbol": "daObjC1Peach_c_classInit",
"address": "0x02112004",
"size": "0x00000038",
"legacy_source": "src/PeachPainting_Spawn.c",
"legacy_source": "src/daObjC1Peach_c_classInit.c",
"ordinal": 7
}
],
Expand All @@ -80,7 +80,8 @@
"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: CONFLICT: local declaration ('struct', 'dActor_c') differs between the legacy file that used to hold _ZN13PeachPaintingD1Ev and the one that held _ZN13PeachPainting8BehaviorEv; kept the first, the other is commented out for review",
"8/8 MATCH, objisolate clean, reloc-destinations clean. TU-local C++ class per the WaterDiamond recipe; DistToCPlayer folded into the shadow base from a later member's view."
"8/8 MATCH, objisolate clean, reloc-destinations clean. TU-local C++ class per the WaterDiamond recipe; DistToCPlayer folded into the shadow base from a later member's view.",
"Reconstructed source-style factory symbol daObjC1Peach_c_classInit: class identity is ROM-proven by RTTI/allocation/vtable and profile identity by literal ROM ID C1_PEACH; classInit spelling is later-EAD lineage reconstruction. Historical alias: PeachPainting_Spawn."
],
"verification": {
"round": "tools/tubuild.py verify -- text-only, whole shadow TU compiled once",
Expand All @@ -93,9 +94,16 @@
"criteria": {
"every_declared_function_defined": "PASS",
"every_declared_function_bytes_match": "PASS",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 6 unlicensed section/symbol(s); see unlicensed_output_observed",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 6 unlicensed section/symbol(s), 1 compiler-only policy error(s)",
"functions_occur_in_expected_order": "PARTIAL -- ordinal pair(s) not in ROM order: [(0, 1)]",
"relocation_destinations_verified": "PASS"
},
"compilerOnlyOutput": {
"requested": [],
"unhandled": [
"_ZN13PeachPaintingD2Ev"
],
"data": []
}
}
}
17 changes: 13 additions & 4 deletions config/tu_manifest.d/ov014/ChainChompFence.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,19 @@
"ordinal": 6
},
{
"symbol": "ChainChompFence_Spawn",
"symbol": "daObjWanwanShutter_c_classInit",
"address": "0x0211307c",
"size": "0x00000030",
"legacy_source": "src/ChainChompFence_Spawn.c",
"legacy_source": "src/daObjWanwanShutter_c_classInit.c",
"ordinal": 7
}
],
"data": [],
"bss": [],
"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.",
"8/8 MATCH, objisolate clean, reloc-destinations clean. The legacy shadow embedded dBgW by value; the real class is abstract, so the member is a char[4] slot cast at the two call sites. One ~ChainChompFence() emits D0+D1; Spawn stores &_ZTV15ChainChompFence[2]."
"8/8 MATCH, objisolate clean, reloc-destinations clean. The legacy shadow embedded dBgW by value; the real class is abstract, so the member is a char[4] slot cast at the two call sites. One ~ChainChompFence() emits D0+D1; Spawn stores &_ZTV15ChainChompFence[2].",
"Reconstructed source-style factory symbol daObjWanwanShutter_c_classInit: class identity is ROM-proven by RTTI/allocation/vtable and profile identity by literal ROM ID WANWAN_SHUTTER; classInit spelling is later-EAD lineage reconstruction. Historical alias: ChainChompFence_Spawn."
],
"verification": {
"round": "tools/tubuild.py verify -- text-only, whole shadow TU compiled once",
Expand All @@ -92,9 +93,17 @@
"criteria": {
"every_declared_function_defined": "PASS",
"every_declared_function_bytes_match": "PASS",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 13 unlicensed section/symbol(s); see unlicensed_output_observed",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 13 unlicensed section/symbol(s), 2 compiler-only policy error(s)",
"functions_occur_in_expected_order": "PARTIAL -- ordinal pair(s) not in ROM order: [(0, 1)]",
"relocation_destinations_verified": "PASS"
},
"compilerOnlyOutput": {
"requested": [],
"unhandled": [
"_ZN15ChainChompFenceD2Ev",
"_ZN7Vector3D1Ev"
],
"data": []
}
}
}
16 changes: 12 additions & 4 deletions config/tu_manifest.d/ov014/ShutterBob.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,19 @@
"ordinal": 4
},
{
"symbol": "ShutterBob_Spawn",
"symbol": "daObjBSwdoor_c_classInit",
"address": "0x021112cc",
"size": "0x0000003c",
"legacy_source": "src/ShutterBob_Spawn.c",
"legacy_source": "src/daObjBSwdoor_c_classInit.c",
"ordinal": 5
}
],
"data": [],
"bss": [],
"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.",
"6/6 MATCH, objisolate clean, reloc-destinations clean. NEW FACT: #pragma long_calls is POSITIONAL in 2004/b56 (unlike opt_propagation/optimize_for_size) -- tubuild create DROPPED the legacy file's `#pragma long_calls on`, costing CleanupResources its pooled cross-overlay tail-call; restored in the TU, bracketed with `off`. Also: create's decl merge flipped the call's address semantics (char[] decay vs int value) -- caught by the byte gate, restored to the address view. Spawn stores &_ZTV10ShutterBob[2]."
"6/6 MATCH, objisolate clean, reloc-destinations clean. NEW FACT: #pragma long_calls is POSITIONAL in 2004/b56 (unlike opt_propagation/optimize_for_size) -- tubuild create DROPPED the legacy file's `#pragma long_calls on`, costing CleanupResources its pooled cross-overlay tail-call; restored in the TU, bracketed with `off`. Also: create's decl merge flipped the call's address semantics (char[] decay vs int value) -- caught by the byte gate, restored to the address view. Spawn stores &_ZTV10ShutterBob[2].",
"Reconstructed source-style factory symbol daObjBSwdoor_c_classInit: class identity is ROM-proven by RTTI/allocation/vtable and profile identity by literal ROM ID SWITCHDOOR; classInit spelling is later-EAD lineage reconstruction. Historical alias: ShutterBob_Spawn."
],
"verification": {
"round": "tools/tubuild.py verify -- text-only, whole shadow TU compiled once",
Expand All @@ -78,9 +79,16 @@
"criteria": {
"every_declared_function_defined": "PASS",
"every_declared_function_bytes_match": "PASS",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 14 unlicensed section/symbol(s); see unlicensed_output_observed",
"declared_function_set_equals_defined_function_set": "FAIL-BY-DESIGN -- 14 unlicensed section/symbol(s), 1 compiler-only policy error(s)",
"functions_occur_in_expected_order": "PARTIAL -- ordinal pair(s) not in ROM order: [(0, 1)]",
"relocation_destinations_verified": "PASS"
},
"compilerOnlyOutput": {
"requested": [],
"unhandled": [
"_ZN10ShutterBobD2Ev"
],
"data": []
}
}
}
Loading
Loading