diff options
| author | Julgodis <> | 2021-03-31 23:22:32 +0200 |
|---|---|---|
| committer | Julgodis <> | 2021-03-31 23:22:38 +0200 |
| commit | b999714187d934636004d3d93e1ed1da792d6f80 (patch) | |
| tree | b89ce29aafb588cc0d191343c915ae1447d1c7a6 /libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp | |
| parent | a868b6ae56e5d586f31a445f47b45f5ac039c74a (diff) | |
.dead section fix
Diffstat (limited to 'libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp')
| -rw-r--r-- | libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp | 421 |
1 files changed, 352 insertions, 69 deletions
diff --git a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index 9331d4e08f..f313ab2981 100644 --- a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -1,83 +1,242 @@ -// +// // Generated By: dol2asm // Translation Unit: J3DShapeFactory -// +// -#include "JSystem/J3DGraphLoader/J3DShapeFactory.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "JSystem/J3DGraphLoader/J3DShapeFactory.h" -// +// // Types: -// +// -struct _GXVtxDescList {}; +struct _GXVtxDescList { +}; -struct J3DShapeBlock {}; +struct J3DShapeBlock { +}; struct J3DShapeFactory { - /* 80337350 */ J3DShapeFactory(J3DShapeBlock const&); - /* 80337400 */ void create(int, u32, _GXVtxDescList*); - /* 803375BC */ void newShapeMtx(u32, int, int) const; - /* 8033784C */ void newShapeDraw(int, int) const; - /* 803378D8 */ void allocVcdVatCmdBuffer(u32); - /* 80337944 */ void calcSize(int, u32); - /* 803379D8 */ void calcSizeVcdVatCmdBuffer(u32); - /* 803379E8 */ void calcSizeShapeMtx(u32, int, int) const; + /* 80337350 */ // False False +// J3DShapeBlock const& False +// J3DShapeBlock const False +// J3DShapeBlock False +J3DShapeFactory(J3DShapeBlock const&); + /* 80337400 */ // False False +// int False +// u32 False +// _GXVtxDescList* False +// _GXVtxDescList False +void create(int, u32, _GXVtxDescList*); + /* 803375BC */ // True False +// u32 False +// int False +// int False +void newShapeMtx(u32, int, int) const; + /* 8033784C */ // True False +// int False +// int False +void newShapeDraw(int, int) const; + /* 803378D8 */ // False False +// u32 False +void allocVcdVatCmdBuffer(u32); + /* 80337944 */ // False False +// int False +// u32 False +void calcSize(int, u32); + /* 803379D8 */ // False False +// u32 False +void calcSizeVcdVatCmdBuffer(u32); + /* 803379E8 */ // True False +// u32 False +// int False +// int False +void calcSizeShapeMtx(u32, int, int) const; }; struct J3DShapeDraw { - /* 80314ABC */ J3DShapeDraw(u8 const*, u32); + /* 80314ABC */ // False False +// u8 const* False +// u8 const False +// u8 False +// u32 False +J3DShapeDraw(u8 const*, u32); }; struct J3DShape { - /* 80314B48 */ void initialize(); + /* 80314B48 */ // False False +void initialize(); }; -// +// // Forward References: -// +// -static void JSUConvertOffsetToPtr__template74(void const*, u32); -static void JSUConvertOffsetToPtr__template75(void const*, u32); -static void JSUConvertOffsetToPtr__template76(void const*, u32); -static void JSUConvertOffsetToPtr__template77(void const*, u32); +// False True +// void const* False +// void const False +// void False +// u32 False +void JSUConvertOffsetToPtr__template74(void const*, u32); +// False True +// void const* False +// void const False +// void False +// u32 False +void JSUConvertOffsetToPtr__template75(void const*, u32); +// False True +// void const* False +// void const False +// void False +// u32 False +void JSUConvertOffsetToPtr__template76(void const*, u32); +// False True +// void const* False +// void const False +// void False +// u32 False +void JSUConvertOffsetToPtr__template77(void const*, u32); +// False False +// J3DShapeBlock const& False +// J3DShapeBlock const False +// J3DShapeBlock False extern "C" void __ct__15J3DShapeFactoryFRC13J3DShapeBlock(); +// False False +// int False +// u32 False +// _GXVtxDescList* False +// _GXVtxDescList False extern "C" void create__15J3DShapeFactoryFiUlP14_GXVtxDescList(); +// True False +// u32 False +// int False +// int False extern "C" void newShapeMtx__15J3DShapeFactoryCFUlii(); +// True False +// int False +// int False extern "C" void newShapeDraw__15J3DShapeFactoryCFii(); +// False False +// u32 False extern "C" void allocVcdVatCmdBuffer__15J3DShapeFactoryFUl(); +// False False +// int False +// u32 False extern "C" void calcSize__15J3DShapeFactoryFiUl(); +// False False +// u32 False extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl(); +// True False +// u32 False +// int False +// int False extern "C" void calcSizeShapeMtx__15J3DShapeFactoryCFUlii(); -extern "C" static void func_80337AE0(); -extern "C" static void func_80337AF8(); -extern "C" static void func_80337B10(); -extern "C" static void func_80337B28(); +// False True +// void const* False +// void const False +// void False +// u32 False +extern "C" void func_80337AE0(); +// False True +// void const* False +// void const False +// void False +// u32 False +extern "C" void func_80337AF8(); +// False True +// void const* False +// void const False +// void False +// u32 False +extern "C" void func_80337B10(); +// False True +// void const* False +// void const False +// void False +// u32 False +extern "C" void func_80337B28(); extern "C" extern char const* const J3DShapeFactory__stringBase0; -// +// // External References: -// +// +// False False +// void* False +// void False +// u32 False void* operator new(u32); +// False False +// void* False +// void False +// u32 False void* operator new[](u32); +// False False +// void* False +// void False +// u32 False +// int False void* operator new[](u32, int); +// False True +// void const* False +// void const False +// void False +// u32 False void JSUConvertOffsetToPtr__template71(void const*, u32); +// False True +// void const* False +// void const False +// void False +// u32 False void JSUConvertOffsetToPtr__template72(void const*, u32); +// False False extern "C" void OSReport(); +// False False +// void* False +// void False +// u32 False extern "C" void* __nw__FUl(); +// False False +// void* False +// void False +// u32 False extern "C" void* __nwa__FUl(); +// False False +// void* False +// void False +// u32 False +// int False extern "C" void* __nwa__FUli(); +// False False +// u8 const* False +// u8 const False +// u8 False +// u32 False extern "C" void __ct__12J3DShapeDrawFPCUcUl(); +// False False extern "C" void initialize__8J3DShapeFv(); +// False True +// void const* False +// void const False +// void False +// u32 False extern "C" void func_80336764(); +// False True +// void const* False +// void const False +// void False +// u32 False extern "C" void func_8033677C(); +// False False extern "C" void _savegpr_26(); +// False False extern "C" void _savegpr_29(); +// False False extern "C" void _restgpr_26(); +// False False extern "C" void _restgpr_29(); extern "C" extern void* __vt__28J3DShapeMtxYBBoardConcatView[10]; extern "C" extern void* __vt__27J3DShapeMtxBBoardConcatView[10]; @@ -87,144 +246,268 @@ extern "C" extern void* __vt__21J3DShapeMtxConcatView[10]; extern "C" extern void* __vt__11J3DShapeMtx[8 + 1 /* padding */]; extern "C" extern void* __vt__8J3DShape[6]; -// +// // Declarations: -// +// -/* 80337350-80337400 00B0+00 s=0 e=2 z=0 None .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock - */ +/* 80337350-80337400 00B0+00 s=0 e=2 z=0 None .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */ +// 80337374: 80336764 (func_80336764) +// 80337384: 8033677C (func_8033677C) +// 80337394: 80337B28 (func_80337B28) +// 803373A4: 8033677C (func_8033677C) +// 803373B4: 80337B10 (func_80337B10) +// 803373C4: 80337AF8 (func_80337AF8) +// 803373D4: 80337AE0 (func_80337AE0) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False +// J3DShapeBlock const& False +// J3DShapeBlock const False +// J3DShapeBlock False asm J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& param_0) { - nofralloc + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/__ct__15J3DShapeFactoryFRC13J3DShapeBlock.s" } #pragma pop -/* 80337400-803375BC 01BC+00 s=0 e=1 z=0 None .text - * create__15J3DShapeFactoryFiUlP14_GXVtxDescList */ + +/* 80337400-803375BC 01BC+00 s=0 e=1 z=0 None .text create__15J3DShapeFactoryFiUlP14_GXVtxDescList */ +// 80337410: 803621D0 (_savegpr_26) +// 80337424: 802CEC4C (__nw__FUl) +// 80337430: 803CDC78 (__vt__8J3DShape) +// 80337434: 803CDC78 (__vt__8J3DShape) +// 80337454: 80314B48 (initialize__8J3DShapeFv) +// 803374C0: 802CECC4 (__nwa__FUl) +// 803374D0: 802CECC4 (__nwa__FUl) +// 80337564: 803375BC (newShapeMtx__15J3DShapeFactoryCFUlii) +// 8033757C: 8033784C (newShapeDraw__15J3DShapeFactoryCFii) +// 803375A8: 8036221C (_restgpr_26) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False +// int False +// u32 False +// _GXVtxDescList* False +// _GXVtxDescList False asm void J3DShapeFactory::create(int param_0, u32 param_1, _GXVtxDescList* param_2) { - nofralloc + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/create__15J3DShapeFactoryFiUlP14_GXVtxDescList.s" } #pragma pop + /* ############################################################################################## */ -/* 803A2100-803A2130 002C+04 s=2 e=0 z=0 None .rodata @stringBase0 */ +/* 803A2100-803A2130 002C+04 s=2 e=0 z=0 None .rodata @stringBase0 */ #pragma push #pragma force_active on #pragma section ".dead" -SECTION_DEAD char const* const stringBase_803A2100 = "WRONG SHAPE MATRIX TYPE (J3DModelInit.cpp)\n"; +SECTION_DEAD char const* const stringBase_803A2100 = + "WRONG SHAPE MATRIX TYPE (J3DModelInit.cpp)\n"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_803A212C = "\0\0\0"; #pragma pop -/* 803375BC-8033784C 0290+00 s=1 e=0 z=0 None .text newShapeMtx__15J3DShapeFactoryCFUlii */ +/* 803375BC-8033784C 0290+00 s=1 e=0 z=0 None .text newShapeMtx__15J3DShapeFactoryCFUlii */ +// 803375CC: 803621DC (_savegpr_29) +// 80337654: 802CEC4C (__nw__FUl) +// 80337664: 803CDC44 (__vt__11J3DShapeMtx) +// 80337668: 803CDC44 (__vt__11J3DShapeMtx) +// 80337674: 803CDC1C (__vt__21J3DShapeMtxConcatView) +// 80337678: 803CDC1C (__vt__21J3DShapeMtxConcatView) +// 8033768C: 802CEC4C (__nw__FUl) +// 8033769C: 803CDC44 (__vt__11J3DShapeMtx) +// 803376A0: 803CDC44 (__vt__11J3DShapeMtx) +// 803376AC: 803CDC1C (__vt__21J3DShapeMtxConcatView) +// 803376B0: 803CDC1C (__vt__21J3DShapeMtxConcatView) +// 803376B8: 803CDBAC (__vt__27J3DShapeMtxBBoardConcatView) +// 803376BC: 803CDBAC (__vt__27J3DShapeMtxBBoardConcatView) +// 803376D0: 802CEC4C (__nw__FUl) +// 803376E0: 803CDC44 (__vt__11J3DShapeMtx) +// 803376E4: 803CDC44 (__vt__11J3DShapeMtx) +// 803376F0: 803CDC1C (__vt__21J3DShapeMtxConcatView) +// 803376F4: 803CDC1C (__vt__21J3DShapeMtxConcatView) +// 803376FC: 803CDB84 (__vt__28J3DShapeMtxYBBoardConcatView) +// 80337700: 803CDB84 (__vt__28J3DShapeMtxYBBoardConcatView) +// 80337714: 802CEC4C (__nw__FUl) +// 80337738: 803CDC44 (__vt__11J3DShapeMtx) +// 8033773C: 803CDC44 (__vt__11J3DShapeMtx) +// 80337748: 803CDC1C (__vt__21J3DShapeMtxConcatView) +// 8033774C: 803CDC1C (__vt__21J3DShapeMtxConcatView) +// 80337754: 803CDBD4 (__vt__26J3DShapeMtxMultiConcatView) +// 80337758: 803CDBD4 (__vt__26J3DShapeMtxMultiConcatView) +// 80337770: 803A2100 (J3DShapeFactory__stringBase0) +// 80337774: 803A2100 (J3DShapeFactory__stringBase0) +// 8033777C: 80006ABC (OSReport) +// 803377A4: 802CEC4C (__nw__FUl) +// 803377B4: 803CDC44 (__vt__11J3DShapeMtx) +// 803377B8: 803CDC44 (__vt__11J3DShapeMtx) +// 803377D0: 802CEC4C (__nw__FUl) +// 803377F4: 803CDC44 (__vt__11J3DShapeMtx) +// 803377F8: 803CDC44 (__vt__11J3DShapeMtx) +// 80337804: 803CDBFC (__vt__16J3DShapeMtxMulti) +// 80337808: 803CDBFC (__vt__16J3DShapeMtxMulti) +// 80337820: 803A2100 (J3DShapeFactory__stringBase0) +// 80337824: 803A2100 (J3DShapeFactory__stringBase0) +// 8033782C: 80006ABC (OSReport) +// 80337838: 80362228 (_restgpr_29) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False +// u32 False +// int False +// int False asm void J3DShapeFactory::newShapeMtx(u32 param_0, int param_1, int param_2) const { - nofralloc + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/newShapeMtx__15J3DShapeFactoryCFUlii.s" } #pragma pop -/* 8033784C-803378D8 008C+00 s=1 e=0 z=0 None .text newShapeDraw__15J3DShapeFactoryCFii */ + +/* 8033784C-803378D8 008C+00 s=1 e=0 z=0 None .text newShapeDraw__15J3DShapeFactoryCFii */ +// 80337898: 802CEC4C (__nw__FUl) +// 803378B4: 80314ABC (__ct__12J3DShapeDrawFPCUcUl) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False +// int False +// int False asm void J3DShapeFactory::newShapeDraw(int param_0, int param_1) const { - nofralloc + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/newShapeDraw__15J3DShapeFactoryCFii.s" } #pragma pop -/* 803378D8-80337944 006C+00 s=0 e=1 z=0 None .text allocVcdVatCmdBuffer__15J3DShapeFactoryFUl - */ + +/* 803378D8-80337944 006C+00 s=0 e=1 z=0 None .text allocVcdVatCmdBuffer__15J3DShapeFactoryFUl */ +// 803378FC: 802CECEC (__nwa__FUli) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False +// u32 False asm void J3DShapeFactory::allocVcdVatCmdBuffer(u32 param_0) { - nofralloc + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/allocVcdVatCmdBuffer__15J3DShapeFactoryFUl.s" } #pragma pop -/* 80337944-803379D8 0094+00 s=0 e=1 z=0 None .text calcSize__15J3DShapeFactoryFiUl */ + +/* 80337944-803379D8 0094+00 s=0 e=1 z=0 None .text calcSize__15J3DShapeFactoryFiUl */ +// 80337954: 803621D0 (_savegpr_26) +// 803379A4: 803379E8 (calcSizeShapeMtx__15J3DShapeFactoryCFUlii) +// 803379C4: 8036221C (_restgpr_26) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False +// int False +// u32 False asm void J3DShapeFactory::calcSize(int param_0, u32 param_1) { - nofralloc + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/calcSize__15J3DShapeFactoryFiUl.s" } #pragma pop -/* 803379D8-803379E8 0010+00 s=0 e=1 z=0 None .text calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl - */ + +/* 803379D8-803379E8 0010+00 s=0 e=1 z=0 None .text calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// False False +// u32 False asm void J3DShapeFactory::calcSizeVcdVatCmdBuffer(u32 param_0) { - nofralloc + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl.s" } #pragma pop -/* 803379E8-80337AE0 00F8+00 s=1 e=0 z=0 None .text calcSizeShapeMtx__15J3DShapeFactoryCFUlii - */ + +/* 803379E8-80337AE0 00F8+00 s=1 e=0 z=0 None .text calcSizeShapeMtx__15J3DShapeFactoryCFUlii */ +// 80337A78: 803A2100 (J3DShapeFactory__stringBase0) +// 80337A7C: 803A2100 (J3DShapeFactory__stringBase0) +// 80337A84: 80006ABC (OSReport) +// 80337AB8: 803A2100 (J3DShapeFactory__stringBase0) +// 80337ABC: 803A2100 (J3DShapeFactory__stringBase0) +// 80337AC4: 80006ABC (OSReport) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off +// True False +// u32 False +// int False +// int False asm void J3DShapeFactory::calcSizeShapeMtx(u32 param_0, int param_1, int param_2) const { - nofralloc + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/calcSizeShapeMtx__15J3DShapeFactoryCFUlii.s" } #pragma pop -/* 80337AE0-80337AF8 0018+00 s=1 e=0 z=0 None .text - * JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl */ + +/* 80337AE0-80337AF8 0018+00 s=1 e=0 z=0 None .text JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm static void JSUConvertOffsetToPtr__template74(void const* param_0, u32 param_1) { - nofralloc +// False True +// void const* False +// void const False +// void False +// u32 False +asm void JSUConvertOffsetToPtr__template74(void const* param_0, u32 param_1) { + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337AE0.s" } #pragma pop -/* 80337AF8-80337B10 0018+00 s=1 e=0 z=0 None .text - * JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl */ + +/* 80337AF8-80337B10 0018+00 s=1 e=0 z=0 None .text JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm static void JSUConvertOffsetToPtr__template75(void const* param_0, u32 param_1) { - nofralloc +// False True +// void const* False +// void const False +// void False +// u32 False +asm void JSUConvertOffsetToPtr__template75(void const* param_0, u32 param_1) { + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337AF8.s" } #pragma pop -/* 80337B10-80337B28 0018+00 s=1 e=0 z=0 None .text JSUConvertOffsetToPtr<Uc>__FPCvUl */ + +/* 80337B10-80337B28 0018+00 s=1 e=0 z=0 None .text JSUConvertOffsetToPtr<Uc>__FPCvUl */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm static void JSUConvertOffsetToPtr__template76(void const* param_0, u32 param_1) { - nofralloc +// False True +// void const* False +// void const False +// void False +// u32 False +asm void JSUConvertOffsetToPtr__template76(void const* param_0, u32 param_1) { + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337B10.s" } #pragma pop -/* 80337B28-80337B40 0018+00 s=1 e=0 z=0 None .text - * JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl */ + +/* 80337B28-80337B40 0018+00 s=1 e=0 z=0 None .text JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm static void JSUConvertOffsetToPtr__template77(void const* param_0, u32 param_1) { - nofralloc +// False True +// void const* False +// void const False +// void False +// u32 False +asm void JSUConvertOffsetToPtr__template77(void const* param_0, u32 param_1) { + nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337B28.s" } #pragma pop + + |
