diff options
| author | Julgodis <> | 2021-04-07 09:16:47 +0200 |
|---|---|---|
| committer | Julgodis <> | 2021-04-07 09:16:47 +0200 |
| commit | dca1d2a1c032f239c65aa1b7767132c12e89f628 (patch) | |
| tree | 103f2574cfa7c6b9f19df522447d0b58861b60ba /libs/JSystem/J3DGraphBase | |
| parent | ed1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (diff) | |
detect more floats/doubles, including from relocations
Diffstat (limited to 'libs/JSystem/J3DGraphBase')
| -rw-r--r-- | libs/JSystem/J3DGraphBase/J3DMatBlock.cpp | 12 | ||||
| -rw-r--r-- | libs/JSystem/J3DGraphBase/J3DShape.cpp | 2 | ||||
| -rw-r--r-- | libs/JSystem/J3DGraphBase/J3DSys.cpp | 14 | ||||
| -rw-r--r-- | libs/JSystem/J3DGraphBase/J3DTevs.cpp | 18 | ||||
| -rw-r--r-- | libs/JSystem/J3DGraphBase/J3DTransform.cpp | 8 |
5 files changed, 27 insertions, 27 deletions
diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp index 9a9f484ff0..5f8eac8270 100644 --- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -45,6 +45,8 @@ struct J3DTexMtx { /* 80323C0C */ void calcPostTexMtx(f32 const (*)[4]); }; +struct J3DTexCoord {}; + struct J3DNBTScale {}; struct J3DTexGenBlock { @@ -53,8 +55,6 @@ struct J3DTexGenBlock { /* 80317424 */ void setNBTScale(J3DNBTScale const*); }; -struct J3DTexCoord {}; - struct J3DTexGenBlockPatched { /* 80317180 */ ~J3DTexGenBlockPatched(); /* 80317644 */ void initialize(); @@ -117,10 +117,10 @@ struct J3DTevOrder {}; struct J3DIndTevStage {}; -struct J3DGXColor {}; - struct J3DGXColorS10 {}; +struct J3DGXColor {}; + struct J3DTevBlock { /* 8000DBC8 */ void patchTexNoAndTexCoordScale(); /* 8000DBD4 */ void patch(); @@ -450,10 +450,10 @@ struct J3DPEBlockOpa { struct J3DBlend {}; -struct J3DFog {}; - struct J3DAlphaComp {}; +struct J3DFog {}; + struct J3DPEBlock { /* 8000DBCC */ void patch(); /* 8000DF3C */ bool getZCompLoc() const; diff --git a/libs/JSystem/J3DGraphBase/J3DShape.cpp b/libs/JSystem/J3DGraphBase/J3DShape.cpp index eb440076ee..9011bb166f 100644 --- a/libs/JSystem/J3DGraphBase/J3DShape.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShape.cpp @@ -133,7 +133,7 @@ asm void J3DShape::initialize() { SECTION_RODATA static u8 const lit_697[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -SECTION_DEAD void* const cg_803A1E98 = (void*)(&lit_697); +COMPILER_STRIP_GATE(803A1E98, &lit_697); /* 80314BB8-80314CBC 30F4F8 0104+00 0/0 1/1 0/0 .text addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl */ #pragma push diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp index c85b26b72d..5466d16af6 100644 --- a/libs/JSystem/J3DGraphBase/J3DSys.cpp +++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp @@ -131,12 +131,12 @@ extern u8 mCurrentMtx__6J3DSys[48]; u8 mCurrentMtx__6J3DSys[48]; /* 80434C14-80434C20 061934 000C+00 0/0 6/6 0/0 .bss mCurrentS__6J3DSys */ -extern u8 mCurrentS__6J3DSys[12]; -u8 mCurrentS__6J3DSys[12]; +extern f32 mCurrentS__6J3DSys[3]; +f32 mCurrentS__6J3DSys[3]; /* 80434C20-80434C2C 061940 000C+00 0/0 5/5 0/0 .bss mParentS__6J3DSys */ -extern u8 mParentS__6J3DSys[12]; -u8 mParentS__6J3DSys[12]; +extern f32 mParentS__6J3DSys[3]; +f32 mParentS__6J3DSys[3]; /* 80434C2C-80434C70 06194C 0040+04 1/1 17/17 0/0 .bss sTexCoordScaleTable__6J3DSys */ extern u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */]; @@ -177,13 +177,13 @@ asm void J3DSys::loadNrmMtxIndx(int param_0, u16 param_1) const { SECTION_RODATA static u8 const lit_695[16] = { 0x00, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1DF8 = (void*)(&lit_695); +COMPILER_STRIP_GATE(803A1DF8, &lit_695); /* 803A1E08-803A1E18 02E468 0010+00 1/1 0/0 0/0 .rodata @696 */ SECTION_RODATA static u8 const lit_696[16] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1E08 = (void*)(&lit_696); +COMPILER_STRIP_GATE(803A1E08, &lit_696); /* 8030FF0C-803100BC 30A84C 01B0+00 1/1 0/0 0/0 .text setTexCacheRegion__6J3DSysF15_GXTexCacheSize */ @@ -202,7 +202,7 @@ SECTION_RODATA static u8 const lit_737[24] = { 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1E18 = (void*)(&lit_737); +COMPILER_STRIP_GATE(803A1E18, &lit_737); /* 803CD8A0-803CD8B0 02A9C0 0010+00 1/1 0/0 0/0 .data NullTexData */ SECTION_DATA static u8 NullTexData[16] = { diff --git a/libs/JSystem/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/J3DGraphBase/J3DTevs.cpp index 387f32807a..f151361001 100644 --- a/libs/JSystem/J3DGraphBase/J3DTevs.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTevs.cpp @@ -322,14 +322,14 @@ SECTION_RODATA extern u8 const j3dDefaultLightInfo[52] = { 0xFF, 0xFF, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1EC8 = (void*)(&j3dDefaultLightInfo); +COMPILER_STRIP_GATE(803A1EC8, &j3dDefaultLightInfo); /* 803A1EFC-803A1F1C 02E55C 0020+00 0/0 5/5 0/0 .rodata j3dDefaultTexCoordInfo */ SECTION_RODATA extern u8 const j3dDefaultTexCoordInfo[32] = { 0x01, 0x04, 0x3C, 0x00, 0x01, 0x05, 0x3C, 0x00, 0x01, 0x06, 0x3C, 0x00, 0x01, 0x07, 0x3C, 0x00, 0x01, 0x08, 0x3C, 0x00, 0x01, 0x09, 0x3C, 0x00, 0x01, 0x0A, 0x3C, 0x00, 0x01, 0x0B, 0x3C, 0x00, }; -SECTION_DEAD void* const cg_803A1EFC = (void*)(&j3dDefaultTexCoordInfo); +COMPILER_STRIP_GATE(803A1EFC, &j3dDefaultTexCoordInfo); /* 803A1F1C-803A1F80 02E57C 0064+00 0/0 1/1 0/0 .rodata j3dDefaultTexMtxInfo */ SECTION_RODATA extern u8 const j3dDefaultTexMtxInfo[100] = { @@ -341,27 +341,27 @@ SECTION_RODATA extern u8 const j3dDefaultTexMtxInfo[100] = { 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1F1C = (void*)(&j3dDefaultTexMtxInfo); +COMPILER_STRIP_GATE(803A1F1C, &j3dDefaultTexMtxInfo); /* 803A1F80-803A1F9C 02E5E0 001C+00 0/0 2/2 0/0 .rodata j3dDefaultIndTexMtxInfo */ SECTION_RODATA extern u8 const j3dDefaultIndTexMtxInfo[28] = { 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1F80 = (void*)(&j3dDefaultIndTexMtxInfo); +COMPILER_STRIP_GATE(803A1F80, &j3dDefaultIndTexMtxInfo); /* 803A1F9C-803A1FB0 02E5FC 0014+00 0/0 1/1 0/0 .rodata j3dDefaultTevStageInfo */ SECTION_RODATA extern u8 const j3dDefaultTevStageInfo[20] = { 0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1F9C = (void*)(&j3dDefaultTevStageInfo); +COMPILER_STRIP_GATE(803A1F9C, &j3dDefaultTevStageInfo); /* 803A1FB0-803A1FBC 02E610 000C+00 0/0 2/2 0/0 .rodata j3dDefaultIndTevStageInfo */ SECTION_RODATA extern u8 const j3dDefaultIndTevStageInfo[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1FB0 = (void*)(&j3dDefaultIndTevStageInfo); +COMPILER_STRIP_GATE(803A1FB0, &j3dDefaultIndTevStageInfo); /* 803A1FBC-803A1FE8 02E61C 002C+00 0/0 3/3 0/0 .rodata j3dDefaultFogInfo */ SECTION_RODATA extern u8 const j3dDefaultFogInfo[44] = { @@ -369,13 +369,13 @@ SECTION_RODATA extern u8 const j3dDefaultFogInfo[44] = { 0xCD, 0x46, 0x1C, 0x40, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1FBC = (void*)(&j3dDefaultFogInfo); +COMPILER_STRIP_GATE(803A1FBC, &j3dDefaultFogInfo); /* 803A1FE8-803A1FF8 02E648 0010+00 0/0 3/3 0/0 .rodata j3dDefaultNBTScaleInfo */ SECTION_RODATA extern u8 const j3dDefaultNBTScaleInfo[16] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1FE8 = (void*)(&j3dDefaultNBTScaleInfo); +COMPILER_STRIP_GATE(803A1FE8, &j3dDefaultNBTScaleInfo); /* 803A1FF8-803A2008 02E658 000B+05 1/1 0/0 0/0 .rodata @1197 */ SECTION_RODATA static u8 const lit_1197[11 + 5 /* padding */] = { @@ -397,7 +397,7 @@ SECTION_RODATA static u8 const lit_1197[11 + 5 /* padding */] = { 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1FF8 = (void*)(&lit_1197); +COMPILER_STRIP_GATE(803A1FF8, &lit_1197); /* 80434C98-80436A60 0619B8 1DC7+01 1/1 0/0 0/0 .bss j3dTexCoordTable */ static u8 j3dTexCoordTable[7623 + 1 /* padding */]; diff --git a/libs/JSystem/J3DGraphBase/J3DTransform.cpp b/libs/JSystem/J3DGraphBase/J3DTransform.cpp index 7d49346523..3e26529928 100644 --- a/libs/JSystem/J3DGraphBase/J3DTransform.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTransform.cpp @@ -94,13 +94,13 @@ SECTION_RODATA extern u8 const j3dDefaultTransformInfo[32] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1E30 = (void*)(&j3dDefaultTransformInfo); +COMPILER_STRIP_GATE(803A1E30, &j3dDefaultTransformInfo); /* 803A1E50-803A1E5C 02E4B0 000C+00 0/0 1/1 0/0 .rodata j3dDefaultScale */ SECTION_RODATA extern u8 const j3dDefaultScale[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1E50 = (void*)(&j3dDefaultScale); +COMPILER_STRIP_GATE(803A1E50, &j3dDefaultScale); /* 803A1E5C-803A1E8C 02E4BC 0030+00 0/0 8/8 7/7 .rodata j3dDefaultMtx */ SECTION_RODATA extern u8 const j3dDefaultMtx[48] = { @@ -108,13 +108,13 @@ SECTION_RODATA extern u8 const j3dDefaultMtx[48] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1E5C = (void*)(&j3dDefaultMtx); +COMPILER_STRIP_GATE(803A1E5C, &j3dDefaultMtx); /* 803A1E8C-803A1E98 02E4EC 000C+00 1/1 0/0 0/0 .rodata @443 */ SECTION_RODATA static u8 const lit_443[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_803A1E8C = (void*)(&lit_443); +COMPILER_STRIP_GATE(803A1E8C, &lit_443); /* 80311760-8031189C 30C0A0 013C+00 0/0 2/2 0/0 .text J3DCalcYBBoardMtx__FPA4_f */ #pragma push |
