mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-31 07:45:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dol2asm_fullsplitt' into new-disasm-codecopy

Browse Source
This commit is contained in:
lepelog
2021-04-08 15:15:40 +02:00
parent ad23c0e24b cad608c551
commit d9859d41ed
1751 changed files with 78241 additions and 66159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J2DGraph/J2DAnimation.cpp
+4 -2
View File
@@ -42,7 +42,9 @@ struct J3DTextureSRTInfo {};
struct J3DAnmKeyTableBase {};
struct J2DScreen {};
struct J2DScreen {
static u8 mDataManage[4 + 4 /* padding */];
};
struct J2DResReference {
/* 8030CF10 */ void getResReference(u16) const;
@@ -189,7 +191,7 @@ extern "C" extern void* __vt__10J2DAnmBase[4];
extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */];
extern "C" extern void* __vt__10JUTNameTab[3];
extern "C" extern void* __vt__14J2DAnmVtxColor[5];
extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
//
// Declarations:
libs/JSystem/J2DGraph/J2DAnmLoader.cpp
+2 -2
View File
@@ -73,12 +73,12 @@ struct J2DAnmLoader {
/* 8030A410 */ ~J2DAnmLoader();
};
struct J2DAnmColorKey {};
struct J2DAnmBase {
/* 800569B0 */ void searchUpdateMaterialID(J2DScreen*);
};
struct J2DAnmColorKey {};
struct J2DAnmKeyLoader_v15 {
/* 80309290 */ J2DAnmKeyLoader_v15();
/* 803092AC */ ~J2DAnmKeyLoader_v15();
libs/JSystem/J2DGraph/J2DMaterial.cpp
+10 -10
View File
@@ -82,10 +82,12 @@ struct J2DPEBlock {
/* 802F1840 */ void setGX();
};
struct J2DAnmTexPattern {
/* 8030BEE8 */ void getTexNo(u16, u16*) const;
/* 8030BF9C */ void getResTIMG(u16) const;
/* 8030BFF0 */ void getPalette(u16) const;
struct J2DAnmTextureSRTKey {
/* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
};
struct J2DAnmColor {
/* 802EB390 */ void getColor(u16, _GXColor*) const;
};
struct J2DAnmTevRegKey {
@@ -93,12 +95,10 @@ struct J2DAnmTevRegKey {
/* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
};
struct J2DAnmColor {
/* 802EB390 */ void getColor(u16, _GXColor*) const;
};
struct J2DAnmTextureSRTKey {
/* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
struct J2DAnmTexPattern {
/* 8030BEE8 */ void getTexNo(u16, u16*) const;
/* 8030BF9C */ void getResTIMG(u16) const;
/* 8030BFF0 */ void getPalette(u16) const;
};
struct J2DMaterial {
libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
+5 -1
View File
@@ -29,6 +29,10 @@ struct J2DTevStage {
/* 802F19A8 */ void setTevStageInfo(J2DTevStageInfo const&);
};
struct J2DScreen {
static u8 mDataManage[4 + 4 /* padding */];
};
struct J2DResReference {
/* 8030CF10 */ void getResReference(u16) const;
/* 8030CF44 */ void getName(u16) const;
@@ -146,7 +150,7 @@ extern "C" void strcpy();
extern "C" extern u8 const j2dDefaultTexCoordInfo[32];
extern "C" extern u8 const j2dDefaultIndTexMtxInfo[28];
extern "C" extern u8 const j2dDefaultIndTevStageInfo[12];
extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
extern "C" extern u32 j2dDefaultTevOrderInfoNull;
extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */];
extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */];
libs/JSystem/J2DGraph/J2DPane.cpp
+22 -15
View File
@@ -17,12 +17,12 @@ struct ResTIMG {};
struct ResFONT {};
struct JKRArchive {};
struct JSUInputStream {
/* 802DC298 */ void read(void*, s32);
};
struct JKRArchive {};
struct JUTResReference {
/* 802DE078 */ void getResource(JSUInputStream*, u32, JKRArchive*);
};
@@ -54,18 +54,12 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct J2DScreen {
static u8 mDataManage[4 + 4 /* padding */];
};
struct J2DRotateAxis {};
struct J2DBasePosition {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmBase {};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
@@ -75,10 +69,20 @@ struct J2DGrafContext {
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
};
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DBasePosition {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmTexPattern {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
@@ -143,6 +147,8 @@ struct J2DPane {
/* 802F83FC */ void setAnimationVC(J2DAnmVtxColor*);
/* 802F8464 */ void setConnectParent(bool);
/* 802F8474 */ void update();
static f32 static_mBounds[4];
};
struct J2DOrthoGraph {
@@ -211,6 +217,7 @@ extern "C" void setConnectParent__7J2DPaneFb();
extern "C" void update__7J2DPaneFv();
extern "C" void drawSelf__7J2DPaneFff();
extern "C" void __sinit_J2DPane_cpp();
extern "C" f32 static_mBounds__7J2DPane[4];
//
// External References:
@@ -258,7 +265,7 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__14J2DGrafContext[10];
extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
//
// Declarations:
@@ -524,7 +531,7 @@ asm void J2DPane::resize(f32 param_0, f32 param_1) {
/* ############################################################################################## */
/* 804349B0-804349C0 0616D0 0010+00 2/2 0/0 0/0 .bss static_mBounds__7J2DPane */
static f32 static_mBounds__7J2DPane[4];
f32 J2DPane::static_mBounds[4];
/* 802F7100-802F71DC 2F1A40 00DC+00 0/0 25/25 1/1 .text getBounds__7J2DPaneFv */
#pragma push
libs/JSystem/J2DGraph/J2DPicture.cpp
+8 -8
View File
@@ -73,24 +73,26 @@ struct J2DScreen {
/* 802F9640 */ void getNameResource(char const*);
};
struct J2DMirror {};
struct J2DBinding {};
struct J2DAnmBase {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVisibilityFull {};
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
@@ -134,8 +136,6 @@ struct J2DPane {
struct J2DMaterial {};
struct J2DMirror {};
struct J2DPicture {
/* 800202CC */ void setBlendRatio(f32, f32);
/* 802FF208 */ void append(JUTTexture*, f32);
libs/JSystem/J2DGraph/J2DPictureEx.cpp
+8 -8
View File
@@ -71,22 +71,20 @@ struct J2DScreen {
/* 802F9640 */ void getNameResource(char const*);
};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmBase {};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
struct J2DAnmBase {};
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -114,6 +112,8 @@ struct J2DPane {
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
libs/JSystem/J2DGraph/J2DPrint.cpp
+11 -4
View File
@@ -19,7 +19,9 @@ struct JUTFont {
/* 802DEDC4 */ void setGradColor(JUtility::TColor, JUtility::TColor);
};
struct JKRHeap {};
struct JKRHeap {
static u8 sSystemHeap[4];
};
struct J2DTextBoxVBinding {};
@@ -45,6 +47,9 @@ struct J2DPrint {
/* 802F594C */ void initchar();
/* 802F59C0 */ void getNumberS32(u8 const**, s32, s32, int);
/* 802F5AC4 */ void getNumberF32(u8 const**, f32, f32, int);
static u8 mStrBuff[4];
static u8 mStrBuffSize[4];
};
//
@@ -68,6 +73,8 @@ extern "C" void doEscapeCode__8J2DPrintFPPCUcUc();
extern "C" void initchar__8J2DPrintFv();
extern "C" void getNumberS32__8J2DPrintFPPCUclli();
extern "C" void getNumberF32__8J2DPrintFPPCUcffi();
extern "C" u8 mStrBuff__8J2DPrint[4];
extern "C" u8 mStrBuffSize__8J2DPrint[4];
//
// External References:
@@ -90,7 +97,7 @@ extern "C" void vsnprintf();
extern "C" void strlen();
extern "C" void strtol();
extern "C" void strtoul();
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
//
// Declarations:
@@ -98,13 +105,13 @@ extern "C" extern u8 sSystemHeap__7JKRHeap[4];
/* ############################################################################################## */
/* 80451580-80451584 000A80 0004+00 3/3 0/0 0/0 .sbss mStrBuff__8J2DPrint */
static u8 mStrBuff__8J2DPrint[4];
u8 J2DPrint::mStrBuff[4];
/* 80451584-80451588 000A84 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80451584[4];
/* 80451588-8045158C 000A88 0004+00 3/3 0/0 0/0 .sbss mStrBuffSize__8J2DPrint */
static u8 mStrBuffSize__8J2DPrint[4];
u8 J2DPrint::mStrBuffSize[4];
/* 8045158C-80451590 000A8C 0004+00 2/2 0/0 0/0 .sbss None */
static u8 data_8045158C[4];
libs/JSystem/J2DGraph/J2DScreen.cpp
+11 -9
View File
@@ -52,15 +52,15 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct J2DAnmBase {};
struct J2DAnmVisibilityFull {};
struct J2DAnmVtxColor {};
struct J2DAnmBase {};
struct J2DAnmTransform {};
struct J2DGrafContext {};
struct J2DAnmVisibilityFull {};
struct J2DAnmVtxColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
@@ -91,13 +91,13 @@ struct J2DPane {
/* 802F8478 */ void drawSelf(f32, f32);
};
struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTevRegKey {};
struct J2DAnmTexPattern {};
struct J2DMaterial {
/* 802EA1AC */ J2DMaterial();
@@ -165,6 +165,8 @@ struct J2DScreen {
/* 802F9A20 */ void calcMtx();
/* 802F9A74 */ void setAnimationVF(J2DAnmVisibilityFull*);
/* 802F9A78 */ void setAnimationVC(J2DAnmVtxColor*);
static u8 mDataManage[4 + 4 /* padding */];
};
struct J2DResReference {};
@@ -232,6 +234,7 @@ extern "C" void calcMtx__9J2DScreenFv();
extern "C" void setAnimation__9J2DScreenFP10J2DAnmBase();
extern "C" void setAnimationVF__9J2DScreenFP20J2DAnmVisibilityFull();
extern "C" void setAnimationVC__9J2DScreenFP14J2DAnmVtxColor();
extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
//
// External References:
@@ -605,8 +608,7 @@ asm void J2DScreen::isUsed(ResFONT const* param_0) {
/* ############################################################################################## */
/* 80451590-80451598 000A90 0004+04 1/1 3/3 0/0 .sbss mDataManage__9J2DScreen */
extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
u8 J2DScreen::mDataManage[4 + 4 /* padding */];
/* 802F9640-802F9690 2F3F80 0050+00 0/0 6/6 0/0 .text getNameResource__9J2DScreenFPCc */
#pragma push
libs/JSystem/J2DGraph/J2DTextBox.cpp
+6 -6
View File
@@ -53,22 +53,22 @@ struct J2DTextBoxVBinding {};
struct J2DTextBoxHBinding {};
struct J2DAnmBase {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVisibilityFull {};
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
+10 -10
View File
@@ -38,22 +38,22 @@ struct J2DTextBoxVBinding {};
struct J2DTextBoxHBinding {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmBase {};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
struct J2DTevStage {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
struct J2DAnmBase {};
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -77,10 +77,10 @@ struct J2DPane {
/* 802F8474 */ void update();
};
struct J2DTevStage {};
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
libs/JSystem/J2DGraph/J2DWindow.cpp
+6 -6
View File
@@ -57,22 +57,22 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct J2DAnmBase {};
struct J2DAnmColor {};
struct J2DAnmTevRegKey {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DAnmBase {};
struct J2DAnmTransform {};
struct J2DAnmVtxColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmVisibilityFull {};
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
libs/JSystem/J2DGraph/J2DWindowEx.cpp
+20 -20
View File
@@ -41,34 +41,24 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
struct J2DTevStage {};
struct J2DAnmVtxColor {
/* 8030363C */ void getColor(u8, u16, _GXColor*) const;
};
struct J2DAnmTextureSRTKey {};
struct J2DWindow {
struct TMaterial {};
/* 802F9A7C */ J2DWindow();
/* 802FA880 */ ~J2DWindow();
/* 802FB000 */ void resize(f32, f32);
/* 802FB1D8 */ void drawSelf(f32, f32);
/* 802FBF98 */ s32 getTypeID() const;
};
struct J2DAnmColor {};
struct J2DAnmBase {};
struct J2DAnmTevRegKey {};
struct J2DAnmTransform {};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
struct J2DAnmBase {};
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -95,10 +85,20 @@ struct J2DPane {
/* 802F8474 */ void update();
};
struct J2DTevStage {};
struct J2DAnmTexPattern {};
struct J2DAnmColor {};
struct J2DWindow {
struct TMaterial {};
/* 802F9A7C */ J2DWindow();
/* 802FA880 */ ~J2DWindow();
/* 802FB000 */ void resize(f32, f32);
/* 802FB1D8 */ void drawSelf(f32, f32);
/* 802FBF98 */ s32 getTypeID() const;
};
struct J2DMaterial {
/* 802EA38C */ void setGX();
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
libs/JSystem/J3DGraphAnimator/J3DCluster.cpp
+7 -3
View File
@@ -11,12 +11,14 @@
// Types:
//
struct JMath {
static f32 asinAcosTable_[1032];
};
struct J3DVertexBuffer {};
struct J3DModel {};
struct J3DCluster {};
struct J3DAnmCluster {};
struct J3DDeformData {
@@ -29,6 +31,8 @@ struct J3DDeformData {
struct J3DClusterKey {};
struct J3DCluster {};
struct J3DDeformer {
/* 8032E39C */ J3DDeformer(J3DDeformData*);
/* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*);
@@ -70,7 +74,7 @@ extern "C" void _restgpr_21();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" extern f32 asinAcosTable___5JMath[1032];
extern "C" f32 asinAcosTable___5JMath[1032];
//
// Declarations:
libs/JSystem/J3DGraphAnimator/J3DJoint.cpp
+27 -10
View File
@@ -15,6 +15,12 @@ struct Vec {};
struct J3DTransformInfo {};
struct J3DSys {
static u8 mCurrentMtx[48];
static f32 mCurrentS[3];
static f32 mParentS[3];
};
struct J3DMtxCalcJ3DSysInitMaya {
/* 8032ECAC */ void init(Vec const&, f32 const (&)[3][4]);
};
@@ -35,6 +41,11 @@ struct J3DMtxCalcCalcTransformBasic {
/* 8032ED30 */ void calcTransform(J3DTransformInfo const&);
};
struct J3DMtxCalc {
static u8 mMtxBuffer[4];
static u8 mJoint[4];
};
struct J3DMaterial {
/* 80316AB0 */ void setCurrentMtx();
};
@@ -44,6 +55,12 @@ struct J3DJoint {
/* 8032F170 */ J3DJoint();
/* 8032F254 */ void entryIn();
/* 8032F3F8 */ void recursiveCalc();
static u8 mCurrentMtxCalc[4 + 4 /* padding */];
};
struct J3DDrawBuffer {
static u8 entryNum[4 + 4 /* padding */];
};
//
@@ -59,6 +76,9 @@ extern "C" void appendChild__8J3DJointFP8J3DJoint();
extern "C" void __ct__8J3DJointFv();
extern "C" void entryIn__8J3DJointFv();
extern "C" void recursiveCalc__8J3DJointFv();
extern "C" u8 mMtxBuffer__10J3DMtxCalc[4];
extern "C" u8 mJoint__10J3DMtxCalc[4];
extern "C" u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
//
// External References:
@@ -74,10 +94,10 @@ extern "C" void _savegpr_27();
extern "C" void _restgpr_27();
extern "C" extern u8 const j3dDefaultTransformInfo[32];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mCurrentMtx__6J3DSys[48];
extern "C" extern f32 mCurrentS__6J3DSys[3];
extern "C" extern f32 mParentS__6J3DSys[3];
extern "C" extern u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" f32 mCurrentS__6J3DSys[3];
extern "C" f32 mParentS__6J3DSys[3];
extern "C" u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
//
// Declarations:
@@ -121,12 +141,10 @@ asm void J3DMtxCalcJ3DSysInitMaya::init(Vec const& param_0, f32 const (&param_1)
/* ############################################################################################## */
/* 804515F0-804515F4 000AF0 0004+00 3/3 1/1 0/0 .sbss mMtxBuffer__10J3DMtxCalc */
extern u8 mMtxBuffer__10J3DMtxCalc[4];
u8 mMtxBuffer__10J3DMtxCalc[4];
u8 J3DMtxCalc::mMtxBuffer[4];
/* 804515F4-804515F8 000AF4 0004+00 4/4 9/9 2/2 .sbss mJoint__10J3DMtxCalc */
extern u8 mJoint__10J3DMtxCalc[4];
u8 mJoint__10J3DMtxCalc[4];
u8 J3DMtxCalc::mJoint[4];
/* 804564A0-804564A4 004AA0 0004+00 3/3 0/0 0/0 .sdata2 @922 */
SECTION_SDATA2 static f32 lit_922 = 1.0f;
@@ -218,8 +236,7 @@ asm void J3DJoint::entryIn() {
/* ############################################################################################## */
/* 804515F8-80451600 000AF8 0004+04 1/1 1/1 0/0 .sbss mCurrentMtxCalc__8J3DJoint */
extern u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
u8 J3DJoint::mCurrentMtxCalc[4 + 4 /* padding */];
/* 8032F3F8-8032F5A8 329D38 01B0+00 0/0 1/1 0/0 .text recursiveCalc__8J3DJointFv */
#pragma push
libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp
+6 -2
View File
@@ -19,6 +19,8 @@ struct J3DMtxBuffer {};
struct J3DMtxCalc {
/* 80325D1C */ void setMtxBuffer(J3DMtxBuffer*);
static u8 mMtxBuffer[4];
};
struct J3DModelHierarchy {};
@@ -28,6 +30,8 @@ struct J3DMaterialTable {};
struct J3DJoint {
/* 8032F13C */ void appendChild(J3DJoint*);
/* 8032F3F8 */ void recursiveCalc();
static u8 mCurrentMtxCalc[4 + 4 /* padding */];
};
struct J3DJointTree {
@@ -67,8 +71,8 @@ extern "C" void appendChild__8J3DJointFP8J3DJoint();
extern "C" void recursiveCalc__8J3DJointFv();
extern "C" void _savegpr_23();
extern "C" void _restgpr_23();
extern "C" extern u8 mMtxBuffer__10J3DMtxCalc[4];
extern "C" extern u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
extern "C" u8 mMtxBuffer__10J3DMtxCalc[4];
extern "C" u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
//
// Declarations:
libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
+2 -2
View File
@@ -25,10 +25,10 @@ struct J3DTevKColorAnm {};
struct J3DTevColorAnm {};
struct J3DMaterial {};
struct J3DMatColorAnm {};
struct J3DMaterial {};
struct J3DMaterialAnm {
/* 800A4820 */ ~J3DMaterialAnm();
/* 8032C320 */ void initialize();
libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
+2 -2
View File
@@ -23,12 +23,12 @@ struct J3DTevKColorAnm {};
struct J3DTevColorAnm {};
struct J3DAnmTevRegKey {};
struct J3DAnmColor {};
struct J3DAnmTexPattern {};
struct J3DAnmTevRegKey {};
struct J3DAnmTextureSRTKey {};
struct J3DMaterialTable {
libs/JSystem/J3DGraphAnimator/J3DModel.cpp
+6 -6
View File
@@ -13,11 +13,16 @@
struct Vec {};
struct J3DModel;
struct J3DDeformData {
/* 8032E230 */ void offAllFlag(u32);
/* 8032E274 */ void deform(J3DModel*);
};
struct J3DModelData {
/* 803260F8 */ void syncJ3DSysFlags() const;
};
struct J3DModel;
struct J3DSkinDeform {
/* 8032C9B0 */ void initSkinInfo(J3DModelData*);
/* 8032CF44 */ void initMtxIndexArray(J3DModelData*);
@@ -26,11 +31,6 @@ struct J3DSkinDeform {
/* 8032DFDC */ void deform(J3DModel*);
};
struct J3DDeformData {
/* 8032E230 */ void offAllFlag(u32);
/* 8032E274 */ void deform(J3DModel*);
};
struct J3DModel {
/* 80327100 */ void initialize();
/* 80327184 */ void entryModelData(J3DModelData*, u32, u32);
libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
+13 -4
View File
@@ -31,6 +31,11 @@ struct J3DMtxBuffer {
/* 80326ACC */ void calcDrawMtx(u32, Vec const&, f32 const (&)[3][4]);
/* 80326D3C */ void calcNrmMtx();
/* 80326EF0 */ void calcBBoardMtx();
static u8 sNoUseDrawMtx[48];
static u8 sNoUseNrmMtx[36 + 4 /* padding */];
static void* sNoUseDrawMtxPtr;
static void* sNoUseNrmMtxPtr;
};
//
@@ -49,6 +54,10 @@ extern "C" void calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf();
extern "C" void calcNrmMtx__12J3DMtxBufferFv();
extern "C" void calcBBoardMtx__12J3DMtxBufferFv();
extern "C" void J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f();
extern "C" u8 sNoUseDrawMtx__12J3DMtxBuffer[48];
extern "C" u8 sNoUseNrmMtx__12J3DMtxBuffer[36 + 4 /* padding */];
extern "C" void* sNoUseDrawMtxPtr__12J3DMtxBuffer;
extern "C" void* sNoUseNrmMtxPtr__12J3DMtxBuffer;
//
// External References:
@@ -123,16 +132,16 @@ asm void J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* param_0) {
/* ############################################################################################## */
/* 804371C0-804371F0 063EE0 0030+00 1/0 0/0 0/0 .bss sNoUseDrawMtx__12J3DMtxBuffer */
static u8 sNoUseDrawMtx__12J3DMtxBuffer[48];
u8 J3DMtxBuffer::sNoUseDrawMtx[48];
/* 804371F0-80437218 063F10 0024+04 1/0 0/0 0/0 .bss sNoUseNrmMtx__12J3DMtxBuffer */
static u8 sNoUseNrmMtx__12J3DMtxBuffer[36 + 4 /* padding */];
u8 J3DMtxBuffer::sNoUseNrmMtx[36 + 4 /* padding */];
/* 80450970-80450974 -00001 0004+00 1/1 0/0 0/0 .sdata sNoUseDrawMtxPtr__12J3DMtxBuffer */
SECTION_SDATA static void* sNoUseDrawMtxPtr__12J3DMtxBuffer = (void*)&sNoUseDrawMtx__12J3DMtxBuffer;
SECTION_SDATA void* J3DMtxBuffer::sNoUseDrawMtxPtr = (void*)&J3DMtxBuffer::sNoUseDrawMtx;
/* 80450974-80450978 -00001 0004+00 1/1 0/0 0/0 .sdata sNoUseNrmMtxPtr__12J3DMtxBuffer */
SECTION_SDATA static void* sNoUseNrmMtxPtr__12J3DMtxBuffer = (void*)&sNoUseNrmMtx__12J3DMtxBuffer;
SECTION_SDATA void* J3DMtxBuffer::sNoUseNrmMtxPtr = (void*)&J3DMtxBuffer::sNoUseNrmMtx;
/* 8032648C-803264B8 320DCC 002C+00 1/1 0/0 0/0 .text setNoUseDrawMtx__12J3DMtxBufferFv
*/
libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
+13 -6
View File
@@ -27,10 +27,10 @@ struct J3DSkinNList {
/* 8032C8E4 */ void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*);
};
struct J3DMtxBuffer {};
struct J3DModelData {};
struct J3DMtxBuffer {};
struct J3DSkinDeform {
/* 8032C96C */ J3DSkinDeform();
/* 8032C9B0 */ void initSkinInfo(J3DModelData*);
@@ -45,9 +45,13 @@ struct J3DSkinDeform {
/* 8032DC74 */ void deformVtxPos_S16(J3DVertexBuffer*, J3DMtxBuffer*) const;
/* 8032DDB8 */ void deformVtxNrm_F32(J3DVertexBuffer*) const;
/* 8032DEBC */ void deformVtxNrm_S16(J3DVertexBuffer*) const;
/* 8032E064 */ void deform(J3DVertexBuffer*, J3DMtxBuffer*);
/* 8032DFDC */ void deform(J3DModel*);
/* 8032E064 */ void deform(J3DVertexBuffer*, J3DMtxBuffer*);
/* 8032E1B0 */ ~J3DSkinDeform();
static u8 sWorkArea_WEvlpMixMtx[4096];
static u8 sWorkArea_WEvlpMixWeight[4096];
static u8 sWorkArea_MtxReg[2048 + 8 /* padding */];
};
struct J3DShape {
@@ -81,6 +85,9 @@ extern "C" void deform__13J3DSkinDeformFP15J3DVertexBufferP12J3DMtxBuffer();
extern "C" void calc__15J3DVtxColorCalcFP8J3DModel();
extern "C" void __dt__13J3DSkinDeformFv();
extern "C" extern char const* const J3DSkinDeform__stringBase0;
extern "C" u8 sWorkArea_WEvlpMixMtx__13J3DSkinDeform[4096];
extern "C" u8 sWorkArea_WEvlpMixWeight__13J3DSkinDeform[4096];
extern "C" u8 sWorkArea_MtxReg__13J3DSkinDeform[2048 + 8 /* padding */];
//
// External References:
@@ -197,10 +204,10 @@ asm J3DSkinDeform::J3DSkinDeform() {
/* ############################################################################################## */
/* 80437218-80438218 063F38 1000+00 1/1 0/0 0/0 .bss sWorkArea_WEvlpMixMtx__13J3DSkinDeform */
static u8 sWorkArea_WEvlpMixMtx__13J3DSkinDeform[4096];
u8 J3DSkinDeform::sWorkArea_WEvlpMixMtx[4096];
/* 80438218-80439218 064F38 1000+00 1/1 0/0 0/0 .bss sWorkArea_WEvlpMixWeight__13J3DSkinDeform */
static u8 sWorkArea_WEvlpMixWeight__13J3DSkinDeform[4096];
u8 J3DSkinDeform::sWorkArea_WEvlpMixWeight[4096];
/* 80456468-8045646C 004A68 0004+00 1/1 0/0 0/0 .sdata2 @1110 */
SECTION_SDATA2 static f32 lit_1110 = 1.0f;
@@ -225,7 +232,7 @@ COMPILER_STRIP_GATE(803A2008, &lit_1142);
/* 80439218-80439A20 065F38 0800+08 1/1 0/0 0/0 .bss sWorkArea_MtxReg__13J3DSkinDeform
*/
static u8 sWorkArea_MtxReg__13J3DSkinDeform[2048 + 8 /* padding */];
u8 J3DSkinDeform::sWorkArea_MtxReg[2048 + 8 /* padding */];
/* 8032CF44-8032D378 327884 0434+00 0/0 1/1 0/0 .text
* initMtxIndexArray__13J3DSkinDeformFP12J3DModelData */
libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+10 -5
View File
@@ -37,6 +37,10 @@ struct J3DDrawBuffer {
/* 803254AC */ void draw() const;
/* 80325500 */ void drawHead() const;
/* 80325578 */ void drawTail() const;
static u8 sortFuncTable[72];
static u8 drawFuncTable[24];
static u8 entryNum[4 + 4 /* padding */];
};
//
@@ -58,7 +62,9 @@ extern "C" void draw__13J3DDrawBufferCFv();
extern "C" void drawHead__13J3DDrawBufferCFv();
extern "C" void drawTail__13J3DDrawBufferCFv();
extern "C" void __sinit_J3DDrawBuffer_cpp();
extern "C" extern u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
extern "C" u8 sortFuncTable__13J3DDrawBuffer[72];
extern "C" u8 drawFuncTable__13J3DDrawBuffer[24];
extern "C" u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
//
// External References:
@@ -267,7 +273,7 @@ SECTION_DATA static void* lit_997[3] = {
#pragma pop
/* 803CEC30-803CEC78 02BD50 0048+00 0/1 1/1 0/0 .data sortFuncTable__13J3DDrawBuffer */
SECTION_DATA extern u8 sortFuncTable__13J3DDrawBuffer[72] = {
SECTION_DATA u8 J3DDrawBuffer::sortFuncTable[72] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -296,7 +302,7 @@ SECTION_DATA static void* lit_999[3] = {
#pragma pop
/* 803CEC90-803CECA8 02BDB0 0018+00 1/2 0/0 0/0 .data drawFuncTable__13J3DDrawBuffer */
SECTION_DATA static u8 drawFuncTable__13J3DDrawBuffer[24] = {
SECTION_DATA u8 J3DDrawBuffer::drawFuncTable[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
@@ -348,5 +354,4 @@ SECTION_CTORS void* const _ctors_803255F0 = (void*)__sinit_J3DDrawBuffer_cpp;
/* ############################################################################################## */
/* 804515E0-804515E8 000AE0 0004+04 0/0 1/1 0/0 .sbss entryNum__13J3DDrawBuffer */
extern u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
u8 J3DDrawBuffer::entryNum[4 + 4 /* padding */];
libs/JSystem/J3DGraphBase/J3DMatBlock.cpp
+5 -1
View File
@@ -427,6 +427,10 @@ struct J3DTevBlock1 {
/* 803228F4 */ ~J3DTevBlock1();
};
struct J3DSys {
static u8 sTexCoordScaleTable[64 + 4 /* padding */];
};
struct J3DPEBlockXlu {
/* 80317BF4 */ s32 countDLSize();
/* 8031E98C */ void load();
@@ -1265,7 +1269,7 @@ extern "C" extern void* __vt__11J3DIndBlock[19];
extern "C" extern void* __vt__14J3DTexGenBlock[27];
extern "C" extern void* __vt__13J3DColorBlock[36];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */];
extern "C" u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */];
extern "C" extern u8 j3dTevSwapTableTable[1024];
extern "C" extern u8 j3dAlphaCmpTable[768];
extern "C" extern u8 j3dZModeTable[96];
libs/JSystem/J3DGraphBase/J3DMaterial.cpp
+4 -4
View File
@@ -30,12 +30,12 @@ struct J3DTexGenBlock4 {
/* 80317674 */ void initialize();
};
struct J3DNBTScale {};
struct J3DTexCoord {
/* 8000E464 */ J3DTexCoord();
};
struct J3DNBTScale {};
struct J3DTexGenBlock {
/* 8000DFD8 */ bool getTexMtx(u32);
/* 8000DFE0 */ bool getTexCoord(u32);
@@ -109,10 +109,10 @@ struct J3DPEBlockFogOff {
struct J3DBlend {};
struct J3DFog {};
struct J3DAlphaComp {};
struct J3DFog {};
struct J3DPEBlock {
/* 8000DBCC */ void patch();
/* 8000DF3C */ bool getZCompLoc() const;
libs/JSystem/J3DGraphBase/J3DPacket.cpp
+21 -8
View File
@@ -27,9 +27,13 @@ struct J3DShapePacket {
struct J3DShape {
/* 80315300 */ void loadPreDrawSetting() const;
static u8 sOldVcdVatCmd[4];
};
struct J3DDrawBuffer {};
struct J3DDrawBuffer {
static u8 sortFuncTable[72];
};
struct J3DPacket {
/* 8000E680 */ ~J3DPacket();
@@ -72,6 +76,14 @@ struct J3DDisplayListObj {
/* 80312698 */ void endDL();
/* 803126F4 */ void beginPatch();
/* 80312714 */ void endPatch();
static u8 sGDLObj[16];
static u8 sInterruptFlag[4 + 4 /* padding */];
};
struct J3DDifferedTexMtx {
static u8 sTexGenBlock[4];
static u8 sTexMtxObj[4];
};
//
@@ -111,6 +123,8 @@ extern "C" void draw__14J3DShapePacketFv();
extern "C" void drawFast__14J3DShapePacketFv();
extern "C" void draw__9J3DPacketFv();
extern "C" void entry__12J3DMatPacketFP13J3DDrawBuffer();
extern "C" u8 sGDLObj__17J3DDisplayListObj[16];
extern "C" u8 sInterruptFlag__17J3DDisplayListObj[4 + 4 /* padding */];
//
// External References:
@@ -134,12 +148,12 @@ extern "C" void GDPadCurr32();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" extern u8 sortFuncTable__13J3DDrawBuffer[72];
extern "C" u8 sortFuncTable__13J3DDrawBuffer[72];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 struct_804515B0[4];
extern "C" extern u8 sTexGenBlock__17J3DDifferedTexMtx[4];
extern "C" extern u8 sTexMtxObj__17J3DDifferedTexMtx[4];
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" u8 sTexGenBlock__17J3DDifferedTexMtx[4];
extern "C" u8 sTexMtxObj__17J3DDifferedTexMtx[4];
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" extern u8 __GDCurrentDL[4];
//
@@ -211,12 +225,11 @@ asm void J3DDisplayListObj::callDL() const {
/* ############################################################################################## */
/* 80434C70-80434C80 061990 0010+00 2/2 3/3 0/0 .bss sGDLObj__17J3DDisplayListObj */
extern u8 sGDLObj__17J3DDisplayListObj[16];
u8 sGDLObj__17J3DDisplayListObj[16];
u8 J3DDisplayListObj::sGDLObj[16];
/* 804515A0-804515A8 000AA0 0004+04 3/3 0/0 0/0 .sbss sInterruptFlag__17J3DDisplayListObj
*/
static u8 sInterruptFlag__17J3DDisplayListObj[4 + 4 /* padding */];
u8 J3DDisplayListObj::sInterruptFlag[4 + 4 /* padding */];
/* 80312644-80312698 30CF84 0054+00 2/2 1/1 0/0 .text beginDL__17J3DDisplayListObjFv */
#pragma push
libs/JSystem/J3DGraphBase/J3DShape.cpp
+11 -5
View File
@@ -21,6 +21,10 @@ struct Vec {};
struct J3DShapeMtx {
/* 803130A8 */ void resetMtxLoadCache();
static u8 sCurrentPipeline[4];
static u8 sCurrentScaleFlag[4];
static u8 sTexMtxLoadType[4];
};
struct J3DShapeDraw {
@@ -44,6 +48,8 @@ struct J3DShape {
/* 803155E0 */ void draw() const;
/* 80315628 */ void simpleDraw() const;
/* 803156AC */ void simpleDrawCache() const;
static u8 sOldVcdVatCmd[4];
};
//
@@ -68,6 +74,7 @@ extern "C" void draw__8J3DShapeCFv();
extern "C" void simpleDraw__8J3DShapeCFv();
extern "C" void simpleDrawCache__8J3DShapeCFv();
extern "C" extern void* __vt__8J3DShape[6];
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
//
// External References:
@@ -100,10 +107,10 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 j3dDefaultViewNo[4 + 4 /* padding */];
extern "C" extern u8 sCurrentPipeline__11J3DShapeMtx[4];
extern "C" extern u8 sCurrentScaleFlag__11J3DShapeMtx[4];
extern "C" u8 sCurrentPipeline__11J3DShapeMtx[4];
extern "C" u8 sCurrentScaleFlag__11J3DShapeMtx[4];
extern "C" extern u8 struct_804515B0[4];
extern "C" extern u8 sTexMtxLoadType__11J3DShapeMtx[4];
extern "C" u8 sTexMtxLoadType__11J3DShapeMtx[4];
extern "C" extern u8 __GDCurrentDL[4];
//
@@ -245,8 +252,7 @@ asm void J3DShape::makeVcdVatCmd() {
/* ############################################################################################## */
/* 804515D0-804515D4 000AD0 0004+00 5/5 25/25 9/9 .sbss sOldVcdVatCmd__8J3DShape */
extern u8 sOldVcdVatCmd__8J3DShape[4];
u8 sOldVcdVatCmd__8J3DShape[4];
u8 J3DShape::sOldVcdVatCmd[4];
/* 80315300-80315398 30FC40 0098+00 2/2 6/6 3/3 .text loadPreDrawSetting__8J3DShapeCFv */
#pragma push
libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+33 -15
View File
@@ -56,6 +56,10 @@ struct J3DShapeMtxConcatView {
/* 80314598 */ void loadNrmMtx(int, u16) const;
/* 80314730 */ ~J3DShapeMtxConcatView();
/* 8031478C */ void getType() const;
static u8 sMtxLoadPipeline[48];
static u8 sMtxLoadLODPipeline[48];
static u8 sMtxPtrTbl[8];
};
struct J3DShapeMtxBBoardConcatView {
@@ -76,10 +80,19 @@ struct J3DShapeMtx {
/* 8031459C */ void getUseMtxIndex(u16) const;
/* 80314798 */ ~J3DShapeMtx();
/* 803147E0 */ void getType() const;
static u8 sMtxLoadPipeline[48];
static u8 sMtxLoadCache[20 + 4 /* padding */];
static u8 sCurrentPipeline[4];
static u8 sCurrentScaleFlag[4];
static u8 sTexMtxLoadType[4];
};
struct J3DDifferedTexMtx {
/* 8031322C */ void loadExecute(f32 const (*)[4]);
static u8 sTexGenBlock[4];
static u8 sTexMtxObj[4];
};
//
@@ -127,6 +140,16 @@ extern "C" void getType__21J3DShapeMtxConcatViewCFv();
extern "C" void __dt__11J3DShapeMtxFv();
extern "C" void getType__11J3DShapeMtxCFv();
extern "C" void __sinit_J3DShapeMtx_cpp();
extern "C" u8 sMtxLoadPipeline__11J3DShapeMtx[48];
extern "C" u8 sMtxLoadPipeline__21J3DShapeMtxConcatView[48];
extern "C" u8 sMtxLoadLODPipeline__21J3DShapeMtxConcatView[48];
extern "C" u8 sMtxLoadCache__11J3DShapeMtx[20 + 4 /* padding */];
extern "C" u8 sCurrentPipeline__11J3DShapeMtx[4];
extern "C" u8 sCurrentScaleFlag__11J3DShapeMtx[4];
extern "C" u8 sTexMtxLoadType__11J3DShapeMtx[4];
extern "C" u8 sMtxPtrTbl__21J3DShapeMtxConcatView[8];
extern "C" u8 sTexGenBlock__17J3DDifferedTexMtx[4];
extern "C" u8 sTexMtxObj__17J3DDifferedTexMtx[4];
//
// External References:
@@ -175,7 +198,7 @@ extern "C" extern u8 j3dSys[284];
/* ############################################################################################## */
/* 80434C80-80434C98 0619A0 0014+04 2/2 0/0 0/0 .bss sMtxLoadCache__11J3DShapeMtx */
static u8 sMtxLoadCache__11J3DShapeMtx[20 + 4 /* padding */];
u8 J3DShapeMtx::sMtxLoadCache[20 + 4 /* padding */];
/* 803130A8-803130E4 30D9E8 003C+00 0/0 1/1 0/0 .text resetMtxLoadCache__11J3DShapeMtxFv
*/
@@ -267,7 +290,7 @@ SECTION_DATA static void* lit_835[3] = {
#pragma pop
/* 803CD9C0-803CD9F0 02AAE0 0030+00 2/3 0/0 0/0 .data sMtxLoadPipeline__11J3DShapeMtx */
SECTION_DATA static u8 sMtxLoadPipeline__11J3DShapeMtx[48] = {
SECTION_DATA u8 J3DShapeMtx::sMtxLoadPipeline[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -314,7 +337,7 @@ SECTION_DATA static void* lit_839[3] = {
#pragma pop
/* 803CDA20-803CDA50 02AB40 0030+00 2/3 0/0 0/0 .data sMtxLoadPipeline__21J3DShapeMtxConcatView */
SECTION_DATA static u8 sMtxLoadPipeline__21J3DShapeMtxConcatView[48] = {
SECTION_DATA u8 J3DShapeMtxConcatView::sMtxLoadPipeline[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -362,7 +385,7 @@ SECTION_DATA static void* lit_843[3] = {
/* 803CDA80-803CDAB0 02ABA0 0030+00 1/2 0/0 0/0 .data sMtxLoadLODPipeline__21J3DShapeMtxConcatView
*/
SECTION_DATA static u8 sMtxLoadLODPipeline__21J3DShapeMtxConcatView[48] = {
SECTION_DATA u8 J3DShapeMtxConcatView::sMtxLoadLODPipeline[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -415,12 +438,10 @@ SECTION_DATA static void* lit_1034[12] = {
};
/* 804515A8-804515AC 000AA8 0004+00 4/4 2/2 0/0 .sbss sCurrentPipeline__11J3DShapeMtx */
extern u8 sCurrentPipeline__11J3DShapeMtx[4];
u8 sCurrentPipeline__11J3DShapeMtx[4];
u8 J3DShapeMtx::sCurrentPipeline[4];
/* 804515AC-804515B0 000AAC 0004+00 3/3 1/1 0/0 .sbss sCurrentScaleFlag__11J3DShapeMtx */
extern u8 sCurrentScaleFlag__11J3DShapeMtx[4];
u8 sCurrentScaleFlag__11J3DShapeMtx[4];
u8 J3DShapeMtx::sCurrentScaleFlag[4];
/* 804515B0-804515B4 -00001 0004+00 5/5 3/3 0/0 .sbss None */
/* 804515B0 0001+00 data_804515B0 None */
@@ -429,21 +450,18 @@ extern u8 struct_804515B0[4];
u8 struct_804515B0[4];
/* 804515B4-804515B8 000AB4 0004+00 4/4 1/1 0/0 .sbss sTexMtxLoadType__11J3DShapeMtx */
extern u8 sTexMtxLoadType__11J3DShapeMtx[4];
u8 sTexMtxLoadType__11J3DShapeMtx[4];
u8 J3DShapeMtx::sTexMtxLoadType[4];
/* 804515B8-804515C0 000AB8 0008+00 2/2 0/0 0/0 .sbss sMtxPtrTbl__21J3DShapeMtxConcatView
*/
static u8 sMtxPtrTbl__21J3DShapeMtxConcatView[8];
u8 J3DShapeMtxConcatView::sMtxPtrTbl[8];
/* 804515C0-804515C4 000AC0 0004+00 6/6 2/2 0/0 .sbss sTexGenBlock__17J3DDifferedTexMtx
*/
extern u8 sTexGenBlock__17J3DDifferedTexMtx[4];
u8 sTexGenBlock__17J3DDifferedTexMtx[4];
u8 J3DDifferedTexMtx::sTexGenBlock[4];
/* 804515C4-804515C8 000AC4 0004+00 1/1 2/2 0/0 .sbss sTexMtxObj__17J3DDifferedTexMtx */
extern u8 sTexMtxObj__17J3DDifferedTexMtx[4];
u8 sTexMtxObj__17J3DDifferedTexMtx[4];
u8 J3DDifferedTexMtx::sTexMtxObj[4];
/* 80456398-8045639C 004998 0004+00 2/2 0/0 0/0 .sdata2 @1032 */
SECTION_SDATA2 static u8 lit_1032[4] = {
libs/JSystem/J3DGraphBase/J3DSys.cpp
+13 -8
View File
@@ -29,6 +29,11 @@ struct J3DSys {
/* 80310A3C */ void reinitTevStages();
/* 80310D44 */ void reinitIndStages();
/* 80310E3C */ void reinitPixelProc();
static u8 mCurrentMtx[48];
static f32 mCurrentS[3];
static f32 mParentS[3];
static u8 sTexCoordScaleTable[64 + 4 /* padding */];
};
//
@@ -49,6 +54,10 @@ extern "C" void reinitTevStages__6J3DSysFv();
extern "C" void reinitIndStages__6J3DSysFv();
extern "C" void reinitPixelProc__6J3DSysFv();
extern "C" void __sinit_J3DSys_cpp();
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" f32 mCurrentS__6J3DSys[3];
extern "C" f32 mParentS__6J3DSys[3];
extern "C" u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */];
extern "C" extern u8 j3dDefaultViewNo[4 + 4 /* padding */];
//
@@ -127,20 +136,16 @@ extern u8 j3dSys[284];
u8 j3dSys[284];
/* 80434BE4-80434C14 061904 0030+00 0/0 17/17 154/154 .bss mCurrentMtx__6J3DSys */
extern u8 mCurrentMtx__6J3DSys[48];
u8 mCurrentMtx__6J3DSys[48];
u8 J3DSys::mCurrentMtx[48];
/* 80434C14-80434C20 061934 000C+00 0/0 6/6 0/0 .bss mCurrentS__6J3DSys */
extern f32 mCurrentS__6J3DSys[3];
f32 mCurrentS__6J3DSys[3];
f32 J3DSys::mCurrentS[3];
/* 80434C20-80434C2C 061940 000C+00 0/0 5/5 0/0 .bss mParentS__6J3DSys */
extern f32 mParentS__6J3DSys[3];
f32 mParentS__6J3DSys[3];
f32 J3DSys::mParentS[3];
/* 80434C2C-80434C70 06194C 0040+04 1/1 17/17 0/0 .bss sTexCoordScaleTable__6J3DSys */
extern u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */];
u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */];
u8 J3DSys::sTexCoordScaleTable[64 + 4 /* padding */];
/* 8030FDE8-8030FEC0 30A728 00D8+00 1/1 0/0 0/0 .text __ct__6J3DSysFv */
#pragma push
libs/JSystem/J3DGraphBase/J3DTevs.cpp
+5 -1
View File
@@ -50,6 +50,10 @@ struct J3DTexMtx {
struct J3DTexCoord {};
struct J3DSys {
static u8 sTexCoordScaleTable[64 + 4 /* padding */];
};
struct J3DNBTScale {};
struct J3DLightObj {
@@ -123,7 +127,7 @@ extern "C" void _savegpr_28();
extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */];
extern "C" u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */];
extern "C" extern u8 __GDCurrentDL[4];
//
libs/JSystem/J3DGraphBase/J3DTransform.cpp
+5 -1
View File
@@ -13,6 +13,10 @@
struct Vec {};
struct JMath {
static u8 sincosTable_[65536];
};
struct J3DTransformInfo {};
struct J3DTextureSRTInfo {};
@@ -43,7 +47,7 @@ extern "C" extern u8 PSMulUnit01[8];
//
extern "C" void PSVECNormalize();
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+4 -4
View File
@@ -108,16 +108,16 @@ struct J3DAnmKeyLoader_v15 {
/* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
};
struct J3DAnmClusterFull {};
struct J3DAnmClusterFullData {};
struct J3DAnmColorFull {
/* 8032A93C */ J3DAnmColorFull();
};
struct J3DAnmClusterFullData {};
struct J3DAnmColorFullData {};
struct J3DAnmClusterFull {};
struct J3DAnmFullLoader_v15 {
/* 80338468 */ J3DAnmFullLoader_v15();
/* 80338484 */ ~J3DAnmFullLoader_v15();
libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+8 -8
View File
@@ -37,12 +37,12 @@ struct J3DTexGenBlockNull {
/* 80332AD0 */ ~J3DTexGenBlockNull();
};
struct J3DNBTScale {};
struct J3DTexCoord {
/* 8000E464 */ J3DTexCoord();
};
struct J3DNBTScale {};
struct J3DTexGenBlock {
/* 8000DFD8 */ bool getTexMtx(u32);
/* 8000DFE0 */ bool getTexCoord(u32);
@@ -162,10 +162,10 @@ struct J3DPEBlockNull {
/* 803329B0 */ ~J3DPEBlockNull();
};
struct J3DAlphaComp {};
struct J3DBlend {};
struct J3DAlphaComp {};
struct J3DFog {};
struct J3DPEBlock {
@@ -197,6 +197,10 @@ struct J3DPEBlock {
/* 80317394 */ void setFogOffset(u32);
};
struct J3DMaterialDLBlock {};
struct J3DMaterialBlock {};
struct J3DMaterial {
/* 803157A0 */ void createColorBlock(u32);
/* 803159A0 */ void createTexGenBlock(u32);
@@ -212,10 +216,6 @@ struct J3DMaterial {
/* 80332B94 */ ~J3DMaterial();
};
struct J3DMaterialDLBlock {};
struct J3DMaterialBlock {};
struct J3DMaterialFactory {
struct MaterialType {};
libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
+2 -2
View File
@@ -22,6 +22,8 @@ struct J3DTevStage {
/* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
};
struct J3DMaterialBlock_v21 {};
struct J3DMaterial {
/* 803157A0 */ void createColorBlock(u32);
/* 803159A0 */ void createTexGenBlock(u32);
@@ -31,8 +33,6 @@ struct J3DMaterial {
/* 80316240 */ void initialize();
};
struct J3DMaterialBlock_v21 {};
struct J3DMaterialFactory_v21 {
/* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
/* 80332F84 */ void countUniqueMaterials();
libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+17 -8
View File
@@ -27,6 +27,8 @@ struct JUTNameTab {
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
static u8 sCurrentHeap[4];
};
struct J3DVertexData {};
@@ -41,6 +43,11 @@ struct J3DTexture {
/* 803366A4 */ ~J3DTexture();
};
struct J3DSys {
static u8 mCurrentMtx[48];
static f32 mCurrentS[3];
};
struct J3DDrawMtxData {};
struct J3DShapeTable {
@@ -93,6 +100,8 @@ struct J3DMtxCalc {
/* 80014E9C */ bool getAnmTransform();
/* 80014EA4 */ void setWeight(u8, f32);
/* 80014EA8 */ void getWeight(u8) const;
static u8 mJoint[4];
};
struct J3DMaterialBlock {};
@@ -117,15 +126,15 @@ struct J3DModelLoaderDataBase {
/* 803346BC */ void load(void const*, u32);
};
struct J3DDrawBlock {};
struct J3DJointBlock {};
struct J3DMaterialDLBlock {};
struct J3DEnvelopeBlock {};
struct J3DModelInfoBlock {};
struct J3DMaterialDLBlock {};
struct J3DJointBlock {};
struct J3DDrawBlock {};
struct J3DModelLoader {
/* 8033468C */ J3DModelLoader();
@@ -329,10 +338,10 @@ extern "C" extern void* data_803A3360[11];
extern "C" extern void* __vt__19J3DMtxCalcNoAnmBase[11];
extern "C" extern void* __vt__10J3DMtxCalc[11 + 1 /* padding */];
extern "C" extern void* __vt__11J3DMaterial[12];
extern "C" extern u8 mCurrentMtx__6J3DSys[48];
extern "C" extern f32 mCurrentS__6J3DSys[3];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" extern u8 mJoint__10J3DMtxCalc[4];
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" f32 mCurrentS__6J3DSys[3];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 mJoint__10J3DMtxCalc[4];
//
// Declarations:
libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+4 -4
View File
@@ -28,15 +28,15 @@ struct J3DModelLoader_v26 {
/* 80336F60 */ void calcSizeMaterialTable(J3DMaterialBlock const*, u32);
};
struct J3DDrawBlock {};
struct J3DJointBlock {};
struct J3DMaterialDLBlock {};
struct J3DEnvelopeBlock {};
struct J3DModelInfoBlock {};
struct J3DMaterialDLBlock {};
struct J3DJointBlock {};
struct J3DDrawBlock {};
struct J3DModelLoader {
/* 80336794 */ void countMaterialNum(void const*);
libs/JSystem/JAudio2/JAISeMgr.cpp
+2 -2
View File
@@ -77,10 +77,10 @@ struct JAISeqDataRegion {};
struct JAISeqDataMgr {};
struct JAISeCategoryArrangement {};
struct JAIAudience {};
struct JAISeCategoryArrangement {};
struct JAISeMgr {
/* 802A0074 */ JAISeMgr(bool);
/* 802A0168 */ void isUsingSeqData(JAISeqDataRegion const&);
libs/JSystem/JAudio2/JAISeqMgr.cpp
+1 -1
View File
@@ -66,9 +66,9 @@ struct JAISound {
/* 802A24DC */ void stop(u32);
};
struct JAISeqMgr;
struct JAIAudience {};
struct JAISeqMgr;
struct JAISeq {
/* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr<JAISeq>*);
/* 802A0B64 */ void JAISeqMgr_startID_(JAISoundID, JGeometry::TVec3<f32> const*, JAIAudience*,
libs/JSystem/JAudio2/JAIStream.cpp
+4 -4
View File
@@ -49,16 +49,16 @@ struct JASAramStream {
struct JAIStreamMgr {};
struct JAISoundActivity {};
struct JAISoundID {};
struct JAIAudience {};
template <typename A0>
struct JAISoundStrategyMgr {};
/* JAISoundStrategyMgr<JAIStream> */
struct JAISoundStrategyMgr__template2 {};
struct JAIAudience {};
struct JAISoundID {};
struct JAISoundActivity {};
struct JAIStream {
/* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr<JAIStream>*);
libs/JSystem/JAudio2/JAIStreamMgr.cpp
+2 -2
View File
@@ -60,14 +60,14 @@ struct JAIStreamMgr {
/* 802A4174 */ void newStream_();
};
struct JAISoundActivity {};
struct JAIAudience {};
template <typename A0>
struct JAISoundStrategyMgr {};
/* JAISoundStrategyMgr<JAIStream> */
struct JAISoundStrategyMgr__template2 {};
struct JAIAudience {};
struct JAISoundActivity {};
struct JAIStream {
/* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr<JAIStream>*);
libs/JSystem/JAudio2/JASAiCtrl.cpp
+55 -18
View File
@@ -28,6 +28,8 @@ struct JASMixMode {};
struct JASLfo {
/* 8029BDD8 */ void incCounter(f32);
static u8 sFreeRunLfo[24];
};
struct JASDsp {
@@ -56,6 +58,22 @@ struct JASDriver {
/* 8029CCD4 */ void getSubFrameCounter();
/* 8029E2A8 */ void subframeCallback();
/* 8029E2D0 */ void DSPSyncCallback();
static void* const sMixFuncs[4];
static u8 sDmaDacBuffer[12 + 4 /* padding */];
static u32 sMixMode;
static f32 sDacRate;
static u32 sSubFrames;
static u8 sDspDacBuffer[4];
static u8 sDspDacWriteBuffer[4];
static u8 sDspDacReadBuffer[4];
static u8 sDspStatus[4];
static u8 sDspDacCallback[4];
static u8 lastRspMadep[4];
static u8 dacCallbackFunc[4];
static u8 extMixCallback[4];
static u8 sOutputRate[4];
static u8 sSubFrameCounter[4];
};
struct JASDSPChannel {
@@ -77,6 +95,10 @@ struct JASCalc {
void func_8028F69C(s32);
};
struct JASAudioThread {
static u8 snIntCount[4 + 4 /* padding */];
};
//
// Forward References:
//
@@ -99,7 +121,22 @@ extern "C" void mixMonoTrackWide__9JASDriverFPsUlPFl_Ps();
extern "C" void mixExtraTrack__9JASDriverFPsUlPFl_Ps();
extern "C" void mixInterleaveTrack__9JASDriverFPsUlPFl_Ps();
extern "C" void getSubFrameCounter__9JASDriverFv();
extern "C" void* const sMixFuncs__9JASDriver[4];
extern "C" extern char const* const JASAiCtrl__stringBase0;
extern "C" u8 sDmaDacBuffer__9JASDriver[12 + 4 /* padding */];
extern "C" u32 sMixMode__9JASDriver;
extern "C" f32 sDacRate__9JASDriver;
extern "C" u32 sSubFrames__9JASDriver;
extern "C" u8 sDspDacBuffer__9JASDriver[4];
extern "C" u8 sDspDacWriteBuffer__9JASDriver[4];
extern "C" u8 sDspDacReadBuffer__9JASDriver[4];
extern "C" u8 sDspStatus__9JASDriver[4];
extern "C" u8 sDspDacCallback__9JASDriver[4];
extern "C" u8 lastRspMadep__9JASDriver[4];
extern "C" u8 dacCallbackFunc__9JASDriver[4];
extern "C" u8 extMixCallback__9JASDriver[4];
extern "C" u8 sOutputRate__9JASDriver[4];
extern "C" u8 sSubFrameCounter__9JASDriver[4];
//
// External References:
@@ -141,9 +178,9 @@ extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sFreeRunLfo__6JASLfo[24];
extern "C" u8 sFreeRunLfo__6JASLfo[24];
extern "C" extern u8 JASDram[4];
extern "C" extern u8 snIntCount__14JASAudioThread[4 + 4 /* padding */];
extern "C" u8 snIntCount__14JASAudioThread[4 + 4 /* padding */];
//
// Declarations:
@@ -151,37 +188,37 @@ extern "C" extern u8 snIntCount__14JASAudioThread[4 + 4 /* padding */];
/* ############################################################################################## */
/* 80431C58-80431C68 05E978 000C+04 2/2 0/0 0/0 .bss sDmaDacBuffer__9JASDriver */
static u8 sDmaDacBuffer__9JASDriver[12 + 4 /* padding */];
u8 JASDriver::sDmaDacBuffer[12 + 4 /* padding */];
/* 804507A8-804507AC 000228 0004+00 3/3 0/0 0/0 .sdata None */
SECTION_SDATA static u32 data_804507A8 = 0x03000000;
/* 804512A0-804512A4 0007A0 0004+00 3/3 0/0 0/0 .sbss sDspDacBuffer__9JASDriver */
static u8 sDspDacBuffer__9JASDriver[4];
u8 JASDriver::sDspDacBuffer[4];
/* 804512A4-804512A8 0007A4 0004+00 3/3 0/0 0/0 .sbss sDspDacWriteBuffer__9JASDriver */
static u8 sDspDacWriteBuffer__9JASDriver[4];
u8 JASDriver::sDspDacWriteBuffer[4];
/* 804512A8-804512AC 0007A8 0004+00 3/3 0/0 0/0 .sbss sDspDacReadBuffer__9JASDriver */
static u8 sDspDacReadBuffer__9JASDriver[4];
u8 JASDriver::sDspDacReadBuffer[4];
/* 804512AC-804512B0 0007AC 0004+00 3/3 0/0 0/0 .sbss sDspStatus__9JASDriver */
static u8 sDspStatus__9JASDriver[4];
u8 JASDriver::sDspStatus[4];
/* 804512B0-804512B4 0007B0 0004+00 1/1 0/0 0/0 .sbss sDspDacCallback__9JASDriver */
static u8 sDspDacCallback__9JASDriver[4];
u8 JASDriver::sDspDacCallback[4];
/* 804512B4-804512B8 0007B4 0004+00 1/1 0/0 0/0 .sbss lastRspMadep__9JASDriver */
static u8 lastRspMadep__9JASDriver[4];
u8 JASDriver::lastRspMadep[4];
/* 804512B8-804512BC 0007B8 0004+00 1/1 0/0 0/0 .sbss dacCallbackFunc__9JASDriver */
static u8 dacCallbackFunc__9JASDriver[4];
u8 JASDriver::dacCallbackFunc[4];
/* 804512BC-804512C0 0007BC 0004+00 2/2 0/0 0/0 .sbss extMixCallback__9JASDriver */
static u8 extMixCallback__9JASDriver[4];
u8 JASDriver::extMixCallback[4];
/* 804512C0-804512C4 0007C0 0004+00 2/2 0/0 0/0 .sbss sOutputRate__9JASDriver */
static u8 sOutputRate__9JASDriver[4];
u8 JASDriver::sOutputRate[4];
/* 8029C388-8029C4E4 296CC8 015C+00 0/0 1/1 0/0 .text initAI__9JASDriverFPFv_v */
#pragma push
@@ -215,13 +252,13 @@ asm void JASDriver::stopDMA() {
/* ############################################################################################## */
/* 804507AC-804507B0 00022C 0004+00 2/2 0/0 0/0 .sdata sMixMode__9JASDriver */
SECTION_SDATA static u32 sMixMode__9JASDriver = 0x00000002;
SECTION_SDATA u32 JASDriver::sMixMode = 0x00000002;
/* 804507B0-804507B4 000230 0004+00 2/2 0/0 0/0 .sdata sDacRate__9JASDriver */
SECTION_SDATA static f32 sDacRate__9JASDriver = 32028.5f;
SECTION_SDATA f32 JASDriver::sDacRate = 32028.5f;
/* 804507B4-804507B8 000234 0004+00 4/4 0/0 0/0 .sdata sSubFrames__9JASDriver */
SECTION_SDATA static u32 sSubFrames__9JASDriver = 0x00000007;
SECTION_SDATA u32 JASDriver::sSubFrames = 0x00000007;
/* 80455720-80455724 003D20 0004+00 1/1 0/0 0/0 .sdata2 @233 */
SECTION_SDATA2 static f32 lit_233 = 32000.0f;
@@ -244,16 +281,16 @@ asm void JASDriver::setOutputRate(JASOutputRate param_0) {
/* ############################################################################################## */
/* 8039B2E0-8039B2F0 -00001 0010+00 1/1 0/0 0/0 .rodata sMixFuncs__9JASDriver */
SECTION_RODATA static void* const sMixFuncs__9JASDriver[4] = {
SECTION_RODATA void* const JASDriver::sMixFuncs[4] = {
(void*)mixMonoTrack__9JASDriverFPsUlPFl_Ps,
(void*)mixMonoTrackWide__9JASDriverFPsUlPFl_Ps,
(void*)mixExtraTrack__9JASDriverFPsUlPFl_Ps,
(void*)mixInterleaveTrack__9JASDriverFPsUlPFl_Ps,
};
COMPILER_STRIP_GATE(8039B2E0, &sMixFuncs__9JASDriver);
COMPILER_STRIP_GATE(8039B2E0, &JASDriver::sMixFuncs);
/* 804512C4-804512C8 0007C4 0004+00 2/2 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */
static u8 sSubFrameCounter__9JASDriver[4];
u8 JASDriver::sSubFrameCounter[4];
/* 804512C8-804512CC 0007C8 0004+00 1/1 0/0 0/0 .sbss dacp$239 */
static u8 dacp[4];
libs/JSystem/JAudio2/JASAramStream.cpp
+13 -5
View File
@@ -87,6 +87,11 @@ struct JASAramStream {
/* 802974AC */ void channelProc();
/* 80297658 */ void channelStart();
/* 80297870 */ void channelStop(u16);
static u8 sLoadThread[4];
static u8 sReadBuffer[4];
static u8 sBlockSize[4];
static u8 sChannelMax[4];
};
//
@@ -117,6 +122,10 @@ extern "C" void channelProc__13JASAramStreamFv();
extern "C" void channelStart__13JASAramStreamFv();
extern "C" void channelStop__13JASAramStreamFUs();
extern "C" void func_802978DC();
extern "C" u8 sLoadThread__13JASAramStream[4];
extern "C" u8 sReadBuffer__13JASAramStream[4];
extern "C" u8 sBlockSize__13JASAramStream[4];
extern "C" u8 sChannelMax__13JASAramStream[4];
//
// External References:
@@ -166,17 +175,16 @@ extern "C" extern u8 JASDram[4];
/* ############################################################################################## */
/* 80451250-80451254 000750 0004+00 6/6 0/0 0/0 .sbss sLoadThread__13JASAramStream */
static u8 sLoadThread__13JASAramStream[4];
u8 JASAramStream::sLoadThread[4];
/* 80451254-80451258 000754 0004+00 3/3 0/0 0/0 .sbss sReadBuffer__13JASAramStream */
static u8 sReadBuffer__13JASAramStream[4];
u8 JASAramStream::sReadBuffer[4];
/* 80451258-8045125C 000758 0004+00 6/6 1/1 0/0 .sbss sBlockSize__13JASAramStream */
extern u8 sBlockSize__13JASAramStream[4];
u8 sBlockSize__13JASAramStream[4];
u8 JASAramStream::sBlockSize[4];
/* 8045125C-80451260 00075C 0004+00 1/1 0/0 0/0 .sbss sChannelMax__13JASAramStream */
static u8 sChannelMax__13JASAramStream[4];
u8 JASAramStream::sChannelMax[4];
/* 80451260-80451268 -00001 0008+00 8/8 4/4 0/0 .sbss None */
/* 80451260 0001+00 data_80451260 None */
libs/JSystem/JAudio2/JASAudioThread.cpp
+10 -5
View File
@@ -11,7 +11,10 @@
// Types:
//
struct JKRHeap {};
struct JKRHeap {
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
};
struct JKRThread {
/* 802D1610 */ JKRThread(JKRHeap*, u32, int, int);
@@ -63,6 +66,8 @@ struct JASAudioThread {
/* 8029CF68 */ void DMACallback();
/* 8029CFBC */ void DSPCallback(void*);
/* 8029D028 */ ~JASAudioThread();
static u8 snIntCount[4 + 4 /* padding */];
};
//
@@ -77,6 +82,7 @@ extern "C" void DMACallback__14JASAudioThreadFv();
extern "C" void DSPCallback__14JASAudioThreadFPv();
extern "C" void __dt__14JASAudioThreadFv();
extern "C" extern char const* const JASAudioThread__stringBase0;
extern "C" u8 snIntCount__14JASAudioThread[4 + 4 /* padding */];
//
// External References:
@@ -118,8 +124,8 @@ extern "C" extern u8 data_80431B34[16 + 4 /* padding */];
extern "C" extern u8 data_80450B8C[4];
extern "C" extern u8 JASDram[4];
extern "C" extern u8 struct_80451260[8];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
//
// Declarations:
@@ -169,8 +175,7 @@ asm void JASAudioThread::stop() {
static u8 lit_205[12 + 4 /* padding */];
/* 804512D8-804512E0 0007D8 0004+04 1/1 2/2 0/0 .sbss snIntCount__14JASAudioThread */
extern u8 snIntCount__14JASAudioThread[4 + 4 /* padding */];
u8 snIntCount__14JASAudioThread[4 + 4 /* padding */];
u8 JASAudioThread::snIntCount[4 + 4 /* padding */];
/* 8029CDEC-8029CF68 29772C 017C+00 1/0 0/0 0/0 .text run__14JASAudioThreadFv */
#pragma push
libs/JSystem/JAudio2/JASBNKParser.cpp
+4 -1
View File
@@ -82,6 +82,8 @@ struct JASBNKParser {
/* 80299538 */ void createBank(void const*, JKRHeap*);
/* 80299558 */ void createBasicBank(void const*, JKRHeap*);
static u8 sUsedHeapSize[4];
};
//
@@ -104,6 +106,7 @@ extern "C" void func_8029A000(void const*, u32);
extern "C" void func_8029A018(void const*, u32);
extern "C" void func_8029A030(void const*, u32);
extern "C" void __sinit_JASBNKParser_cpp();
extern "C" u8 sUsedHeapSize__12JASBNKParser[4];
//
// External References:
@@ -155,7 +158,7 @@ asm void JASBNKParser::createBank(void const* param_0, JKRHeap* param_1) {
/* ############################################################################################## */
/* 80451288-8045128C 000788 0004+00 1/1 0/0 0/0 .sbss sUsedHeapSize__12JASBNKParser */
static u8 sUsedHeapSize__12JASBNKParser[4];
u8 JASBNKParser::sUsedHeapSize[4];
/* 80299558-80299600 293E98 00A8+00 1/1 0/0 0/0 .text createBasicBank__12JASBNKParserFPCvP7JKRHeap
*/
libs/JSystem/JAudio2/JASBasicWaveBank.cpp
+8 -3
View File
@@ -13,7 +13,9 @@
struct JKRHeap {};
struct JASWaveInfo {};
struct JASWaveInfo {
static u32 one[1 + 1 /* padding */];
};
struct JASWaveHandle {
/* 80298BD0 */ ~JASWaveHandle();
@@ -61,6 +63,8 @@ struct JASBasicWaveBank {
/* 80298910 */ void setWaveInfo(JASBasicWaveBank::TWaveGroup*, int, u16, JASWaveInfo const&);
/* 80298C6C */ void getWaveArc(u32);
/* 80298C8C */ void getArcCount() const;
static u8 mNoLoad[4 + 4 /* padding */];
};
//
@@ -92,6 +96,7 @@ extern "C" void __ct__Q216JASBasicWaveBank14TGroupWaveInfoFv();
extern "C" void getWaveInfo__Q216JASBasicWaveBank11TWaveHandleCFv();
extern "C" void getWaveArc__16JASBasicWaveBankFUl();
extern "C" void getArcCount__16JASBasicWaveBankCFv();
extern "C" u8 mNoLoad__16JASBasicWaveBank[4 + 4 /* padding */];
//
// External References:
@@ -114,7 +119,7 @@ extern "C" void _savegpr_29();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_29();
extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */];
extern "C" u32 one__11JASWaveInfo[1 + 1 /* padding */];
//
// Declarations:
@@ -241,7 +246,7 @@ asm void JASBasicWaveBank::incWaveTable(JASBasicWaveBank::TWaveGroup const* para
/* ############################################################################################## */
/* 80451278-80451280 000778 0004+04 2/2 0/0 0/0 .sbss mNoLoad__16JASBasicWaveBank */
static u8 mNoLoad__16JASBasicWaveBank[4 + 4 /* padding */];
u8 JASBasicWaveBank::mNoLoad[4 + 4 /* padding */];
/* 8029883C-802988DC 29317C 00A0+00 1/1 0/0 0/0 .text
* decWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup */
libs/JSystem/JAudio2/JASCalc.cpp
+5 -2
View File
@@ -22,6 +22,8 @@ struct JASCalc {
void clamp(/* ... */);
/* 8028F69C */ /* JASCalc::clamp<s16, s32> */
void func_8028F69C(s32);
static u8 const CUTOFF_TO_IIR_TABLE[1024];
};
//
@@ -35,6 +37,7 @@ extern "C" void bzerofast__7JASCalcFPvUl();
extern "C" void bzero__7JASCalcFPvUl();
extern "C" void pow2__7JASCalcFf();
extern "C" void func_8028F69C(s32);
extern "C" u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024];
//
// External References:
@@ -99,7 +102,7 @@ asm void JASCalc::bzero(void* param_0, u32 param_1) {
/* ############################################################################################## */
/* 8039ABB8-8039AFB8 027218 0400+00 0/0 4/4 0/0 .rodata CUTOFF_TO_IIR_TABLE__7JASCalc */
SECTION_RODATA extern u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024] = {
SECTION_RODATA u8 const JASCalc::CUTOFF_TO_IIR_TABLE[1024] = {
0x0F, 0x5C, 0x0A, 0x3D, 0x46, 0x65, 0x1E, 0x73, 0x0F, 0x5E, 0x0A, 0x3D, 0x46, 0x64, 0x1E, 0x73,
0x0F, 0x63, 0x0A, 0x3C, 0x46, 0x61, 0x1E, 0x71, 0x0F, 0x6C, 0x0A, 0x3C, 0x46, 0x5B, 0x1E, 0x6F,
0x0F, 0x79, 0x0A, 0x3A, 0x46, 0x53, 0x1E, 0x6B, 0x0F, 0x89, 0x0A, 0x39, 0x46, 0x49, 0x1E, 0x67,
@@ -165,7 +168,7 @@ SECTION_RODATA extern u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024] = {
0x7A, 0xBD, 0x00, 0x7A, 0x03, 0x49, 0x01, 0x6C, 0x7C, 0x7A, 0x00, 0x52, 0x02, 0x33, 0x00, 0xF4,
0x7E, 0x3B, 0x00, 0x29, 0x01, 0x1B, 0x00, 0x7A, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039ABB8, &CUTOFF_TO_IIR_TABLE__7JASCalc);
COMPILER_STRIP_GATE(8039ABB8, &JASCalc::CUTOFF_TO_IIR_TABLE);
/* 8039AFB8-8039AFD0 027618 0018+00 1/1 0/0 0/0 .rodata __two_to_x$982 */
SECTION_RODATA static f32 const __two_to_x[6] = {
libs/JSystem/JAudio2/JASChannel.cpp
+22 -7
View File
@@ -11,7 +11,13 @@
// Types:
//
struct JASWaveInfo {};
struct JMath {
static u8 sincosTable_[65536];
};
struct JASWaveInfo {
static u32 one[1 + 1 /* padding */];
};
struct JASOscillator {
struct Data {};
@@ -99,6 +105,11 @@ struct JASChannel {
/* 8029BC0C */ void initBankDisposeMsgQueue();
/* 8029BC48 */ void receiveBankDisposeMsg();
/* 8029BCC0 */ void checkBankDispose() const;
static u8 sBankDisposeMsgQ[32];
static u8 sBankDisposeMsg[64];
static u8 sBankDisposeList[64];
static u8 sBankDisposeListSize[4 + 4 /* padding */];
};
struct JASCalc {
@@ -131,6 +142,10 @@ extern "C" void free__10JASChannelFv();
extern "C" void initBankDisposeMsgQueue__10JASChannelFv();
extern "C" void receiveBankDisposeMsg__10JASChannelFv();
extern "C" void checkBankDispose__10JASChannelCFv();
extern "C" u8 sBankDisposeMsgQ__10JASChannel[32];
extern "C" u8 sBankDisposeMsg__10JASChannel[64];
extern "C" u8 sBankDisposeList__10JASChannel[64];
extern "C" u8 sBankDisposeListSize__10JASChannel[4 + 4 /* padding */];
//
// External References:
@@ -181,8 +196,8 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 data_80431B34[16 + 4 /* padding */];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u32 one__11JASWaveInfo[1 + 1 /* padding */];
extern "C" extern u8 struct_80451260[8];
//
@@ -221,13 +236,13 @@ asm JASChannel::JASChannel(void (*)(u32, JASChannel*, JASDsp::TChannel*, void*),
/* ############################################################################################## */
/* 80431B90-80431BB0 05E8B0 0020+00 2/2 0/0 0/0 .bss sBankDisposeMsgQ__10JASChannel */
static u8 sBankDisposeMsgQ__10JASChannel[32];
u8 JASChannel::sBankDisposeMsgQ[32];
/* 80431BB0-80431BF0 05E8D0 0040+00 1/1 0/0 0/0 .bss sBankDisposeMsg__10JASChannel */
static u8 sBankDisposeMsg__10JASChannel[64];
u8 JASChannel::sBankDisposeMsg[64];
/* 80431BF0-80431C30 05E910 0040+00 2/2 0/3 0/0 .bss sBankDisposeList__10JASChannel */
static u8 sBankDisposeList__10JASChannel[64];
u8 JASChannel::sBankDisposeList[64];
/* 80431C30-80431C40 05E950 000C+04 1/1 0/2 0/0 .bss @556 */
static u8 lit_556[12 + 4 /* padding */];
@@ -515,7 +530,7 @@ asm void JASChannel::free() {
/* ############################################################################################## */
/* 80451298-804512A0 000798 0004+04 3/3 0/0 0/0 .sbss sBankDisposeListSize__10JASChannel
*/
static u8 sBankDisposeListSize__10JASChannel[4 + 4 /* padding */];
u8 JASChannel::sBankDisposeListSize[4 + 4 /* padding */];
/* 8029BC0C-8029BC48 29654C 003C+00 0/0 1/1 0/0 .text initBankDisposeMsgQueue__10JASChannelFv */
#pragma push
libs/JSystem/JAudio2/JASCmdStack.cpp
+7 -2
View File
@@ -27,6 +27,9 @@ struct JASPortCmd {
};
/* 80291060 */ void execAllCommand();
static u8 sCommandListOnce[12];
static u8 sCommandListStay[12];
};
//
@@ -38,6 +41,8 @@ extern "C" void execCommandOnce__Q210JASPortCmd9TPortHeadFv();
extern "C" void execCommandStay__Q210JASPortCmd9TPortHeadFv();
extern "C" void __sinit_JASCmdStack_cpp();
extern "C" void __dt__Q210JASPortCmd9TPortHeadFv();
extern "C" u8 sCommandListOnce__10JASPortCmd[12];
extern "C" u8 sCommandListStay__10JASPortCmd[12];
//
// External References:
@@ -62,7 +67,7 @@ extern "C" void _restgpr_29();
static u8 lit_80[12];
/* 80431684-80431690 05E3A4 000C+00 1/2 0/0 0/0 .bss sCommandListOnce__10JASPortCmd */
static u8 sCommandListOnce__10JASPortCmd[12];
u8 JASPortCmd::sCommandListOnce[12];
/* 80431690-8043169C 05E3B0 000C+00 0/1 0/0 0/0 .bss @82 */
#pragma push
@@ -71,7 +76,7 @@ static u8 lit_82[12];
#pragma pop
/* 8043169C-804316A8 05E3BC 000C+00 1/2 0/0 0/0 .bss sCommandListStay__10JASPortCmd */
static u8 sCommandListStay__10JASPortCmd[12];
u8 JASPortCmd::sCommandListStay[12];
/* 80291060-80291094 28B9A0 0034+00 0/0 1/1 0/0 .text execAllCommand__10JASPortCmdFv */
#pragma push
libs/JSystem/JAudio2/JASDSPChannel.cpp
+4 -1
View File
@@ -43,6 +43,8 @@ struct JASDSPChannel {
/* 8029D89C */ void updateAll();
/* 8029D910 */ void killActiveChannel();
/* 8029D948 */ void getHandle(u32);
static u8 sDspChannels[4 + 4 /* padding */];
};
//
@@ -63,6 +65,7 @@ extern "C" void updateProc__13JASDSPChannelFv();
extern "C" void updateAll__13JASDSPChannelFv();
extern "C" void killActiveChannel__13JASDSPChannelFv();
extern "C" void getHandle__13JASDSPChannelFUl();
extern "C" u8 sDspChannels__13JASDSPChannel[4 + 4 /* padding */];
//
// External References:
@@ -129,7 +132,7 @@ asm void JASDSPChannel::drop() {
/* ############################################################################################## */
/* 804512E0-804512E8 0007E0 0004+04 5/5 0/0 0/0 .sbss sDspChannels__13JASDSPChannel */
static u8 sDspChannels__13JASDSPChannel[4 + 4 /* padding */];
u8 JASDSPChannel::sDspChannels[4 + 4 /* padding */];
/* 8029D3C8-8029D44C 297D08 0084+00 0/0 1/1 0/0 .text initAll__13JASDSPChannelFv */
#pragma push
libs/JSystem/JAudio2/JASDSPInterface.cpp
+26 -11
View File
@@ -13,7 +13,9 @@
struct JKRHeap {};
struct JASWaveInfo {};
struct JASWaveInfo {
static u32 one[1 + 1 /* padding */];
};
struct JASDsp {
struct FxlineConfig_ {};
@@ -55,6 +57,13 @@ struct JASDsp {
/* 8029DAA0 */ void invalChannelAll();
/* 8029DAC8 */ void initBuffer();
/* 8029DB78 */ void setFXLine(u8, s16*, JASDsp::FxlineConfig_*);
static u8 const DSPADPCM_FILTER[64];
static void* const DSPRES_FILTER[320];
static u8 SEND_TABLE[24 + 24 /* padding */];
static u8 CH_BUF[4];
static u8 FX_BUF[4];
static f32 sDSPVolume;
};
struct JASCalc {
@@ -100,7 +109,13 @@ extern "C" void setFIR8FilterParam__Q26JASDsp8TChannelFPs();
extern "C" void setDistFilter__Q26JASDsp8TChannelFs();
extern "C" void setBusConnect__Q26JASDsp8TChannelFUcUc();
extern "C" void DSP_CreateMap2__FUl();
extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */];
extern "C" u8 const DSPADPCM_FILTER__6JASDsp[64];
extern "C" void* const DSPRES_FILTER__6JASDsp[320];
extern "C" u8 SEND_TABLE__6JASDsp[24 + 24 /* padding */];
extern "C" u32 one__11JASWaveInfo[1 + 1 /* padding */];
extern "C" u8 CH_BUF__6JASDsp[4];
extern "C" u8 FX_BUF__6JASDsp[4];
extern "C" f32 sDSPVolume__6JASDsp;
//
// External References:
@@ -131,13 +146,13 @@ extern "C" extern u8 JASDram[4];
/* ############################################################################################## */
/* 804512E8-804512EC 0007E8 0004+00 5/5 0/0 0/0 .sbss CH_BUF__6JASDsp */
static u8 CH_BUF__6JASDsp[4];
u8 JASDsp::CH_BUF[4];
/* 804512EC-804512F0 0007EC 0004+00 3/3 0/0 0/0 .sbss FX_BUF__6JASDsp */
static u8 FX_BUF__6JASDsp[4];
u8 JASDsp::FX_BUF[4];
/* 804512F0-804512F4 0007F0 0004+00 2/2 0/0 0/0 .sbss sDSPVolume__6JASDsp */
static f32 sDSPVolume__6JASDsp;
f32 JASDsp::sDSPVolume;
/* 804512F4-804512F8 -00001 0004+00 1/1 0/0 0/0 .sbss None */
/* 804512F4 0001+00 data_804512F4 None */
@@ -250,16 +265,16 @@ asm void JASDsp::invalChannelAll() {
/* ############################################################################################## */
/* 8039B360-8039B3A0 0279C0 0040+00 1/1 0/0 0/0 .rodata DSPADPCM_FILTER__6JASDsp */
SECTION_RODATA static u8 const DSPADPCM_FILTER__6JASDsp[64] = {
SECTION_RODATA u8 const JASDsp::DSPADPCM_FILTER[64] = {
0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x04, 0x00,
0x10, 0x00, 0xF8, 0x00, 0x0E, 0x00, 0xFA, 0x00, 0x0C, 0x00, 0xFC, 0x00, 0x12, 0x00, 0xF6, 0x00,
0x10, 0x68, 0xF7, 0x38, 0x12, 0xC0, 0xF7, 0x04, 0x14, 0x00, 0xF4, 0x00, 0x08, 0x00, 0xF8, 0x00,
0x04, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0x04, 0x00, 0xFC, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B360, &DSPADPCM_FILTER__6JASDsp);
COMPILER_STRIP_GATE(8039B360, &JASDsp::DSPADPCM_FILTER);
/* 8039B3A0-8039B8A0 -00001 0500+00 1/1 0/0 0/0 .rodata DSPRES_FILTER__6JASDsp */
SECTION_RODATA static void* const DSPRES_FILTER__6JASDsp[320] = {
SECTION_RODATA void* const JASDsp::DSPRES_FILTER[320] = {
(void*)0x0C3966AD,
(void*)0x0D46FFDF,
(void*)0x0B396696,
@@ -581,7 +596,7 @@ SECTION_RODATA static void* const DSPRES_FILTER__6JASDsp[320] = {
(void*)0x7FD87FE9,
(void*)0x7FF57FFD,
};
COMPILER_STRIP_GATE(8039B3A0, &DSPRES_FILTER__6JASDsp);
COMPILER_STRIP_GATE(8039B3A0, &JASDsp::DSPRES_FILTER);
/* 8029DAC8-8029DB78 298408 00B0+00 0/0 1/1 0/0 .text initBuffer__6JASDspFv */
#pragma push
@@ -595,7 +610,7 @@ asm void JASDsp::initBuffer() {
/* ############################################################################################## */
/* 803C78F0-803C7920 024A10 0018+18 1/1 0/0 0/0 .data SEND_TABLE__6JASDsp */
SECTION_DATA static u8 SEND_TABLE__6JASDsp[24 + 24 /* padding */] = {
SECTION_DATA u8 JASDsp::SEND_TABLE[24 + 24 /* padding */] = {
0x0D,
0x00,
0x0D,
@@ -917,7 +932,7 @@ asm void DSP_CreateMap2(u32 param_0) {
/* ############################################################################################## */
/* 804507B8-804507C0 000238 0004+04 0/0 5/5 0/0 .sdata one__11JASWaveInfo */
SECTION_SDATA extern u32 one__11JASWaveInfo[1 + 1 /* padding */] = {
SECTION_SDATA u32 JASWaveInfo::one[1 + 1 /* padding */] = {
0x00000001,
/* padding */
0x00000000,
libs/JSystem/JAudio2/JASDriverIF.cpp
+16 -5
View File
@@ -30,6 +30,12 @@ struct JASDriver {
/* 8029E2A8 */ void subframeCallback();
/* 8029E2D0 */ void DSPSyncCallback();
/* 8029E2F8 */ void updateDacCallback();
static u8 sDspSyncCallback[256];
static u8 sSubFrameCallback[256];
static u8 sUpdateDacCallback[256 + 8 /* padding */];
static u16 MAX_MIXERLEVEL[1 + 1 /* padding */];
static u32 JAS_SYSTEM_OUTPUT_MODE;
};
struct JASCallbackMgr {
@@ -60,6 +66,11 @@ extern "C" void DSPSyncCallback__9JASDriverFv();
extern "C" void updateDacCallback__9JASDriverFv();
extern "C" void __sinit_JASDriverIF_cpp();
extern "C" void __ct__Q214JASCallbackMgr9TCallbackFv();
extern "C" u8 sDspSyncCallback__9JASDriver[256];
extern "C" u8 sSubFrameCallback__9JASDriver[256];
extern "C" u8 sUpdateDacCallback__9JASDriver[256 + 8 /* padding */];
extern "C" u16 MAX_MIXERLEVEL__9JASDriver[1 + 1 /* padding */];
extern "C" u32 JAS_SYSTEM_OUTPUT_MODE__9JASDriver;
//
// External References:
@@ -92,7 +103,7 @@ asm void JASDriver::setDSPLevel(f32 param_0) {
/* ############################################################################################## */
/* 804507C0-804507C4 000240 0002+02 1/1 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */
SECTION_SDATA static u16 MAX_MIXERLEVEL__9JASDriver[1 + 1 /* padding */] = {
SECTION_SDATA u16 JASDriver::MAX_MIXERLEVEL[1 + 1 /* padding */] = {
0x2EE0,
/* padding */
0x0000,
@@ -122,7 +133,7 @@ asm void JASDriver::getDSPLevel() {
/* ############################################################################################## */
/* 804507C4-804507C8 000244 0004+00 2/2 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver
*/
SECTION_SDATA static u32 JAS_SYSTEM_OUTPUT_MODE__9JASDriver = 0x00000001;
SECTION_SDATA u32 JASDriver::JAS_SYSTEM_OUTPUT_MODE = 0x00000001;
/* 8029E178-8029E180 298AB8 0008+00 0/0 2/2 0/0 .text setOutputMode__9JASDriverFUl */
#pragma push
@@ -156,13 +167,13 @@ asm void JASDriver::waitSubFrame() {
/* ############################################################################################## */
/* 80431C78-80431D78 05E998 0100+00 4/4 0/0 0/0 .bss sDspSyncCallback__9JASDriver */
static u8 sDspSyncCallback__9JASDriver[256];
u8 JASDriver::sDspSyncCallback[256];
/* 80431D78-80431E78 05EA98 0100+00 2/4 0/0 0/0 .bss sSubFrameCallback__9JASDriver */
static u8 sSubFrameCallback__9JASDriver[256];
u8 JASDriver::sSubFrameCallback[256];
/* 80431E78-80431F80 05EB98 0100+08 1/3 0/0 0/0 .bss sUpdateDacCallback__9JASDriver */
static u8 sUpdateDacCallback__9JASDriver[256 + 8 /* padding */];
u8 JASDriver::sUpdateDacCallback[256 + 8 /* padding */];
/* 8029E1C4-8029E240 298B04 007C+00 0/0 2/2 0/0 .text rejectCallback__9JASDriverFPFPv_lPv
*/
libs/JSystem/JAudio2/JASDvdThread.cpp
+10 -4
View File
@@ -11,7 +11,10 @@
// Types:
//
struct JKRHeap {};
struct JKRHeap {
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
};
struct JASTaskThread {
/* 8028F6C4 */ JASTaskThread(int, int, u32);
@@ -20,6 +23,8 @@ struct JASTaskThread {
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
/* 8028FF04 */ void createThread(s32, int, u32);
static u8 sThread[4 + 4 /* padding */];
};
//
@@ -28,6 +33,7 @@ struct JASDvd {
extern "C" void getThreadPointer__6JASDvdFv();
extern "C" void createThread__6JASDvdFliUl();
extern "C" u8 sThread__6JASDvd[4 + 4 /* padding */];
//
// External References:
@@ -39,8 +45,8 @@ extern "C" void OSResumeThread();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern u8 JASDram[4];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
//
// Declarations:
@@ -48,7 +54,7 @@ extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
/* ############################################################################################## */
/* 80451208-80451210 000708 0004+04 2/2 0/0 0/0 .sbss sThread__6JASDvd */
static u8 sThread__6JASDvd[4 + 4 /* padding */];
u8 JASDvd::sThread[4 + 4 /* padding */];
/* 8028FEFC-8028FF04 28A83C 0008+00 0/0 6/6 0/0 .text getThreadPointer__6JASDvdFv */
#pragma push
libs/JSystem/JAudio2/JASHeapCtrl.cpp
+17 -6
View File
@@ -25,7 +25,9 @@ struct JSUPtrList {
struct JKRSolidHeap {};
struct JKRHeap {};
struct JKRHeap {
static u8 sSystemHeap[4];
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
@@ -37,6 +39,11 @@ struct JASKernel {
/* 80290AC8 */ void getCommandHeap();
/* 80290AD0 */ void setupAramHeap(u32, u32);
/* 80290B08 */ void getAramHeap();
static u8 audioAramHeap[68];
static u8 sAramBase[4];
static u8 sSystemHeap[4];
static u8 sCommandHeap[4];
};
struct JASDisposer {
@@ -90,6 +97,10 @@ extern "C" void getAramHeap__9JASKernelFv();
extern "C" void __sinit_JASHeapCtrl_cpp();
extern "C" void __dt__7JASHeapFv();
extern "C" void onDispose__11JASDisposerFv();
extern "C" u8 audioAramHeap__9JASKernel[68];
extern "C" u8 sAramBase__9JASKernel[4];
extern "C" u8 sSystemHeap__9JASKernel[4];
extern "C" u8 sCommandHeap__9JASKernel[4];
//
// External References:
@@ -118,7 +129,7 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
//
// Declarations:
@@ -274,13 +285,13 @@ asm void JASGenericMemPool::free(void* param_0, u32 param_1) {
/* ############################################################################################## */
/* 80451214-80451218 000714 0004+00 1/1 0/0 0/0 .sbss sAramBase__9JASKernel */
static u8 sAramBase__9JASKernel[4];
u8 JASKernel::sAramBase[4];
/* 80451218-8045121C 000718 0004+00 2/2 0/0 0/0 .sbss sSystemHeap__9JASKernel */
static u8 sSystemHeap__9JASKernel[4];
u8 JASKernel::sSystemHeap[4];
/* 8045121C-80451220 00071C 0004+00 2/2 0/0 0/0 .sbss sCommandHeap__9JASKernel */
static u8 sCommandHeap__9JASKernel[4];
u8 JASKernel::sCommandHeap[4];
/* 802909B8-80290AC0 28B2F8 0108+00 0/0 1/1 0/0 .text setupRootHeap__9JASKernelFP12JKRSolidHeapUl
*/
@@ -318,7 +329,7 @@ asm void JASKernel::getCommandHeap() {
static u8 lit_313[12];
/* 804315DC-80431620 05E2FC 0044+00 3/3 0/0 0/0 .bss audioAramHeap__9JASKernel */
static u8 audioAramHeap__9JASKernel[68];
u8 JASKernel::audioAramHeap[68];
/* 80290AD0-80290B08 28B410 0038+00 0/0 1/1 0/0 .text setupAramHeap__9JASKernelFUlUl */
#pragma push
libs/JSystem/JAudio2/JASLfo.cpp
+9 -3
View File
@@ -11,11 +11,17 @@
// Types:
//
struct JMath {
static u8 sincosTable_[65536];
};
struct JASLfo {
/* 8029BD14 */ JASLfo();
/* 8029BD44 */ void getValue() const;
/* 8029BDD8 */ void incCounter(f32);
/* 8029BE2C */ void resetCounter();
static u8 sFreeRunLfo[24];
};
//
@@ -27,12 +33,13 @@ extern "C" void getValue__6JASLfoCFv();
extern "C" void incCounter__6JASLfoFf();
extern "C" void resetCounter__6JASLfoFv();
extern "C" void __sinit_JASLfo_cpp();
extern "C" u8 sFreeRunLfo__6JASLfo[24];
//
// External References:
//
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
@@ -97,8 +104,7 @@ asm void JASLfo::incCounter(f32 param_0) {
/* ############################################################################################## */
/* 80431C40-80431C58 05E960 0018+00 2/2 1/1 0/0 .bss sFreeRunLfo__6JASLfo */
extern u8 sFreeRunLfo__6JASLfo[24];
u8 sFreeRunLfo__6JASLfo[24];
u8 JASLfo::sFreeRunLfo[24];
/* 8029BE2C-8029BE6C 29676C 0040+00 0/0 1/1 0/0 .text resetCounter__6JASLfoFv */
#pragma push
libs/JSystem/JAudio2/JASOscillator.cpp
+21 -12
View File
@@ -21,6 +21,11 @@ struct JASOscillator {
/* 8029BFE4 */ void release();
/* 8029C0E0 */ void update();
/* 8029C2C0 */ void updateCurrentValue(f32);
static u8 const sCurveTableLinear[68];
static u8 const sCurveTableSampleCell[68];
static u8 const sCurveTableSqRoot[68];
static u8 const sCurveTableSquare[68];
};
//
@@ -34,6 +39,10 @@ extern "C" void getValue__13JASOscillatorCFv();
extern "C" void release__13JASOscillatorFv();
extern "C" void update__13JASOscillatorFv();
extern "C" void updateCurrentValue__13JASOscillatorFf();
extern "C" u8 const sCurveTableLinear__13JASOscillator[68];
extern "C" u8 const sCurveTableSampleCell__13JASOscillator[68];
extern "C" u8 const sCurveTableSqRoot__13JASOscillator[68];
extern "C" u8 const sCurveTableSquare__13JASOscillator[68];
//
// External References:
@@ -132,53 +141,53 @@ asm void JASOscillator::update() {
/* ############################################################################################## */
/* 8039B1D0-8039B214 027830 0044+00 1/0 0/0 0/0 .rodata sCurveTableLinear__13JASOscillator
*/
SECTION_RODATA static u8 const sCurveTableLinear__13JASOscillator[68] = {
SECTION_RODATA u8 const JASOscillator::sCurveTableLinear[68] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x70, 0x00, 0x00, 0x3F, 0x60, 0x00, 0x00, 0x3F, 0x50,
0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, 0x3F, 0x30, 0x00, 0x00, 0x3F, 0x20, 0x00, 0x00,
0x3F, 0x10, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3E, 0xE0, 0x00, 0x00, 0x3E, 0xC0,
0x00, 0x00, 0x3E, 0xA0, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, 0x3E, 0x40, 0x00, 0x00,
0x3E, 0x00, 0x00, 0x00, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B1D0, &sCurveTableLinear__13JASOscillator);
COMPILER_STRIP_GATE(8039B1D0, &JASOscillator::sCurveTableLinear);
/* 8039B214-8039B258 027874 0044+00 1/0 0/0 0/0 .rodata sCurveTableSampleCell__13JASOscillator */
SECTION_RODATA static u8 const sCurveTableSampleCell__13JASOscillator[68] = {
SECTION_RODATA u8 const JASOscillator::sCurveTableSampleCell[68] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x78, 0x71, 0xF8, 0x3F, 0x48, 0x01, 0x93, 0x3F, 0x0B,
0xD9, 0x12, 0x3E, 0xCC, 0xB1, 0x89, 0x3E, 0x94, 0x21, 0x18, 0x3E, 0x59, 0x31, 0xCA,
0x3E, 0x21, 0x41, 0x63, 0x3D, 0xE6, 0xA1, 0xA5, 0x3D, 0xA7, 0x81, 0x4E, 0x3D, 0x6D,
0x81, 0xE4, 0x3D, 0x32, 0xC1, 0x6E, 0x3C, 0xFC, 0x81, 0xFC, 0x3C, 0xC2, 0x41, 0x8E,
0x3C, 0x7A, 0x02, 0x25, 0x3C, 0x16, 0x01, 0x29, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B214, &sCurveTableSampleCell__13JASOscillator);
COMPILER_STRIP_GATE(8039B214, &JASOscillator::sCurveTableSampleCell);
/* 8039B258-8039B29C 0278B8 0044+00 1/0 0/0 0/0 .rodata sCurveTableSqRoot__13JASOscillator
*/
SECTION_RODATA static u8 const sCurveTableSqRoot__13JASOscillator[68] = {
SECTION_RODATA u8 const JASOscillator::sCurveTableSqRoot[68] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x60, 0xFF, 0xFC, 0x3F, 0x44, 0x00, 0x00, 0x3F, 0x28,
0xFF, 0xFC, 0x3F, 0x10, 0x00, 0x00, 0x3E, 0xF1, 0xFF, 0xF8, 0x3E, 0xC8, 0x00, 0x00,
0x3E, 0xA1, 0xFF, 0xF8, 0x3E, 0x80, 0x00, 0x00, 0x3E, 0x43, 0xFF, 0xEF, 0x3E, 0x10,
0x00, 0x00, 0x3D, 0xC7, 0xFF, 0xF9, 0x3D, 0x80, 0x00, 0x00, 0x3D, 0x0F, 0xFF, 0xF3,
0x3C, 0x80, 0x00, 0x00, 0x3B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B258, &sCurveTableSqRoot__13JASOscillator);
COMPILER_STRIP_GATE(8039B258, &JASOscillator::sCurveTableSqRoot);
/* 8039B29C-8039B2E0 0278FC 0044+00 1/0 0/0 0/0 .rodata sCurveTableSquare__13JASOscillator
*/
SECTION_RODATA static u8 const sCurveTableSquare__13JASOscillator[68] = {
SECTION_RODATA u8 const JASOscillator::sCurveTableSquare[68] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x77, 0xDE, 0xF8, 0x3F, 0x6F, 0x77, 0x4B, 0x3F, 0x66,
0xC1, 0x5D, 0x3F, 0x5D, 0xB3, 0xD0, 0x3F, 0x54, 0x43, 0x91, 0x3F, 0x4A, 0x62, 0xBB,
0x3F, 0x40, 0x00, 0x00, 0x3F, 0x35, 0x04, 0xF7, 0x3F, 0x29, 0x54, 0x00, 0x3F, 0x1C,
0xC4, 0x69, 0x3F, 0x0F, 0x1B, 0xBD, 0x3F, 0x00, 0x00, 0x00, 0x3E, 0xDD, 0xB3, 0xE1,
0x3E, 0xB5, 0x04, 0xE6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B29C, &sCurveTableSquare__13JASOscillator);
COMPILER_STRIP_GATE(8039B29C, &JASOscillator::sCurveTableSquare);
/* 803C78A8-803C78B8 -00001 0010+00 1/1 0/0 0/0 .data table_list$151 */
SECTION_DATA static void* table_list[4] = {
(void*)&sCurveTableLinear__13JASOscillator,
(void*)&sCurveTableSquare__13JASOscillator,
(void*)&sCurveTableSqRoot__13JASOscillator,
(void*)&sCurveTableSampleCell__13JASOscillator,
(void*)&JASOscillator::sCurveTableLinear,
(void*)&JASOscillator::sCurveTableSquare,
(void*)&JASOscillator::sCurveTableSqRoot,
(void*)&JASOscillator::sCurveTableSampleCell,
};
/* 80455710-80455718 003D10 0004+04 1/1 0/0 0/0 .sdata2 @154 */
libs/JSystem/JAudio2/JASProbe.cpp
+4 -1
View File
@@ -16,6 +16,8 @@ struct JASProbe {
/* 80290D74 */ void start(char const*);
/* 80290DC4 */ void stop();
/* 80290F24 */ void stop(s32);
static u8 sProbeTable[64];
};
//
@@ -26,6 +28,7 @@ extern "C" void start__8JASProbeFPCc();
extern "C" void stop__8JASProbeFv();
extern "C" void start__8JASProbeFlPCc();
extern "C" void stop__8JASProbeFl();
extern "C" u8 sProbeTable__8JASProbe[64];
//
// External References:
@@ -78,7 +81,7 @@ asm void JASProbe::stop() {
/* ############################################################################################## */
/* 80431620-80431660 05E340 0040+00 2/2 0/0 0/0 .bss sProbeTable__8JASProbe */
static u8 sProbeTable__8JASProbe[64];
u8 JASProbe::sProbeTable[64];
/* 80290EE4-80290F24 28B824 0040+00 0/0 7/7 0/0 .text start__8JASProbeFlPCc */
#pragma push
libs/JSystem/JAudio2/JASSeqCtrl.cpp
+4 -1
View File
@@ -38,6 +38,8 @@ struct JASSeqCtrl {
/* 80293B28 */ void findIntr();
/* 80293B78 */ void checkIntr();
/* 80293BE8 */ void timerProcess();
static u8 sDefaultParser[4 + 4 /* padding */];
};
//
@@ -57,6 +59,7 @@ extern "C" void checkIntr__10JASSeqCtrlFv();
extern "C" void timerProcess__10JASSeqCtrlFv();
extern "C" void __sinit_JASSeqCtrl_cpp();
extern "C" void __dt__12JASSeqParserFv();
extern "C" u8 sDefaultParser__10JASSeqCtrl[4 + 4 /* padding */];
//
// External References:
@@ -75,7 +78,7 @@ extern "C" extern void* __vt__12JASSeqParser[8];
/* ############################################################################################## */
/* 80451238-80451240 000738 0004+04 3/3 0/0 0/0 .sbss sDefaultParser__10JASSeqCtrl */
static u8 sDefaultParser__10JASSeqCtrl[4 + 4 /* padding */];
u8 JASSeqCtrl::sDefaultParser[4 + 4 /* padding */];
/* 802938BC-80293924 28E1FC 0068+00 0/0 1/1 0/0 .text __ct__10JASSeqCtrlFv */
#pragma push
libs/JSystem/JAudio2/JASSeqParser.cpp
+15 -5
View File
@@ -130,6 +130,10 @@ struct JASSeqParser {
/* 802956B0 */ void parseCommand(JASTrack*, u8, u16);
/* 80295864 */ void parseRegCommand(JASTrack*, int);
/* 802958D4 */ void parse(JASTrack*);
static u8 sCmdInfo[1536];
static u8 sExtCmdInfo[4080];
static u8 sCallBackFunc[4];
};
struct JASSeqCtrl {
@@ -146,6 +150,10 @@ struct JASRegisterParam {
/* 802937B8 */ void read(JASRegisterParam::RegID);
};
struct JASCalc {
static u8 const CUTOFF_TO_IIR_TABLE[1024];
};
//
// Forward References:
//
@@ -220,7 +228,10 @@ extern "C" void parseRegCommand__12JASSeqParserFP8JASTracki();
extern "C" void parse__12JASSeqParserFP8JASTrack();
extern "C" void __sinit_JASSeqParser_cpp();
extern "C" extern char const* const JASSeqParser__stringBase0;
extern "C" u8 sCmdInfo__12JASSeqParser[1536];
extern "C" u8 sExtCmdInfo__12JASSeqParser[4080];
extern "C" extern void* __vt__12JASSeqParser[8];
extern "C" u8 sCallBackFunc__12JASSeqParser[4];
//
// External References:
@@ -274,7 +285,7 @@ extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024];
extern "C" u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024];
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
//
@@ -851,7 +862,7 @@ SECTION_DATA static void* lit_541[3] = {
#pragma pop
/* 803C5E80-803C6480 022FA0 0600+00 1/2 0/0 0/0 .data sCmdInfo__12JASSeqParser */
SECTION_DATA static u8 sCmdInfo__12JASSeqParser[1536] = {
SECTION_DATA u8 JASSeqParser::sCmdInfo[1536] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -961,7 +972,7 @@ SECTION_DATA static void* lit_542[3] = {
#pragma pop
/* 803C648C-803C747C 0235AC 0FF0+00 1/2 0/0 0/0 .data sExtCmdInfo__12JASSeqParser */
SECTION_DATA static u8 sExtCmdInfo__12JASSeqParser[4080] = {
SECTION_DATA u8 JASSeqParser::sExtCmdInfo[4080] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1769,8 +1780,7 @@ asm void JASSeqParser::cmdIntTimer(JASTrack* param_0, u32* param_1) {
/* ############################################################################################## */
/* 80451240-80451244 000740 0004+00 1/1 1/1 0/0 .sbss sCallBackFunc__12JASSeqParser */
extern u8 sCallBackFunc__12JASSeqParser[4];
u8 sCallBackFunc__12JASSeqParser[4];
u8 JASSeqParser::sCallBackFunc[4];
/* 80294A3C-80294AA4 28F37C 0068+00 1/0 0/0 0/0 .text cmdSyncCPU__12JASSeqParserFP8JASTrackPUl */
#pragma push
libs/JSystem/JAudio2/JASSimpleWaveBank.cpp
+4 -2
View File
@@ -13,7 +13,9 @@
struct JKRHeap {};
struct JASWaveInfo {};
struct JASWaveInfo {
static u32 one[1 + 1 /* padding */];
};
struct JASWaveArc {
/* 80298FA0 */ void onLoadDone();
@@ -74,7 +76,7 @@ extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__13JASWaveHandle[5];
extern "C" extern void* __vt__11JASWaveBank[6];
extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */];
extern "C" u32 one__11JASWaveInfo[1 + 1 /* padding */];
//
// Declarations:
libs/JSystem/JAudio2/JASTaskThread.cpp
+4 -2
View File
@@ -11,7 +11,9 @@
// Types:
//
struct JKRHeap {};
struct JKRHeap {
static u8 sSystemHeap[4];
};
struct JKRThread {
/* 802D1610 */ JKRThread(JKRHeap*, u32, int, int);
@@ -78,7 +80,7 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" extern u8 JASDram[4];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
//
// Declarations:
libs/JSystem/JAudio2/JASTrack.cpp
+23 -9
View File
@@ -55,6 +55,8 @@ struct JASDsp {
/* 8029E06C */ void setFIR8FilterParam(s16*);
/* 8029E094 */ void setDistFilter(s16);
};
static u32 FILTER_MODE_IIR;
};
struct JASTrack {
@@ -129,6 +131,12 @@ struct JASTrack {
/* 80292D88 */ void getRootTrack();
/* 80292DA0 */ void tickProc();
/* 80292E9C */ void seqMain();
static u8 const sAdsTable[24];
static u8 const sEnvOsc[24];
static u8 const sPitchEnvOsc[24];
static u8 sDefaultBankTable[1036];
static u8 sTrackList[16];
};
struct JASSeqCtrl {
@@ -258,6 +266,12 @@ extern "C" void __sinit_JASTrack_cpp();
extern "C" void __dt__Q28JASTrack5TListFv();
extern "C" void __dt__19JASDefaultBankTableFv();
extern "C" void func_80293528(u32);
extern "C" u8 const sAdsTable__8JASTrack[24];
extern "C" u8 const sEnvOsc__8JASTrack[24];
extern "C" u8 const sPitchEnvOsc__8JASTrack[24];
extern "C" u8 sDefaultBankTable__8JASTrack[1036];
extern "C" u8 sTrackList__8JASTrack[16];
extern "C" u32 FILTER_MODE_IIR__6JASDsp;
//
// External References:
@@ -346,7 +360,7 @@ asm JASTrack::JASTrack() {
static u8 lit_431[12];
/* 804316B4-80431AC0 05E3D4 040C+00 1/2 0/0 0/0 .bss sDefaultBankTable__8JASTrack */
static u8 sDefaultBankTable__8JASTrack[1036];
u8 JASTrack::sDefaultBankTable[1036];
/* 80431AC0-80431ACC 05E7E0 000C+00 0/1 0/0 0/0 .bss @433 */
#pragma push
@@ -355,7 +369,7 @@ static u8 lit_433[12];
#pragma pop
/* 80431ACC-80431ADC 05E7EC 0010+00 1/2 0/0 0/0 .bss sTrackList__8JASTrack */
static u8 sTrackList__8JASTrack[16];
u8 JASTrack::sTrackList[16];
/* 80431ADC-80431AE8 05E7FC 000C+00 3/3 0/0 0/0 .bss @470 */
static u8 lit_470[12];
@@ -396,27 +410,27 @@ asm void JASTrack::setChannelMgrCount(u32 param_0) {
/* ############################################################################################## */
/* 8039AFD0-8039AFE8 027630 0018+00 1/1 0/0 0/0 .rodata sAdsTable__8JASTrack */
SECTION_RODATA static u8 const sAdsTable__8JASTrack[24] = {
SECTION_RODATA u8 const JASTrack::sAdsTable[24] = {
0x00, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039AFD0, &sAdsTable__8JASTrack);
COMPILER_STRIP_GATE(8039AFD0, &JASTrack::sAdsTable);
/* 8039AFE8-8039B000 027648 0018+00 1/2 0/0 0/0 .rodata sEnvOsc__8JASTrack */
SECTION_RODATA static u8 const sEnvOsc__8JASTrack[24] = {
SECTION_RODATA u8 const JASTrack::sEnvOsc[24] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039AFE8, &sEnvOsc__8JASTrack);
COMPILER_STRIP_GATE(8039AFE8, &JASTrack::sEnvOsc);
/* 8039B000-8039B018 027660 0018+00 0/1 0/0 0/0 .rodata sPitchEnvOsc__8JASTrack */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const sPitchEnvOsc__8JASTrack[24] = {
SECTION_RODATA u8 const JASTrack::sPitchEnvOsc[24] = {
0x00, 0x00, 0x00, 0x01, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B000, &sPitchEnvOsc__8JASTrack);
COMPILER_STRIP_GATE(8039B000, &JASTrack::sPitchEnvOsc);
#pragma pop
/* 804555A4-804555A8 003BA4 0004+00 9/9 0/0 0/0 .sdata2 @679 */
@@ -767,7 +781,7 @@ asm void JASTrack::setOscAdsr(s16 param_0, s16 param_1, s16 param_2, s16 param_3
/* ############################################################################################## */
/* 804555D0-804555D4 003BD0 0004+00 2/2 0/0 0/0 .sdata2 FILTER_MODE_IIR__6JASDsp */
SECTION_SDATA2 static u32 FILTER_MODE_IIR__6JASDsp = 0x00000020;
SECTION_SDATA2 u32 JASDsp::FILTER_MODE_IIR = 0x00000020;
/* 8029285C-8029289C 28D19C 0040+00 0/0 2/2 0/0 .text setFIR__8JASTrackFPCs */
#pragma push
libs/JSystem/JAudio2/JASVoiceBank.cpp
+8 -3
View File
@@ -17,6 +17,9 @@ struct JASVoiceBank {
/* 80297F74 */ void getInstParam(int, int, int, JASInstParam*) const;
/* 80297FAC */ ~JASVoiceBank();
/* 80298008 */ void getType() const;
static u8 const sOscData[24];
static u8 sOscTable[4 + 4 /* padding */];
};
//
@@ -26,6 +29,8 @@ struct JASVoiceBank {
extern "C" void getInstParam__12JASVoiceBankCFiiiP12JASInstParam();
extern "C" void __dt__12JASVoiceBankFv();
extern "C" void getType__12JASVoiceBankCFv();
extern "C" u8 const sOscData__12JASVoiceBank[24];
extern "C" u8 sOscTable__12JASVoiceBank[4 + 4 /* padding */];
//
// External References:
@@ -40,14 +45,14 @@ extern "C" extern void* __vt__7JASBank[5];
/* ############################################################################################## */
/* 8039B1B8-8039B1D0 027818 0018+00 1/1 0/0 0/0 .rodata sOscData__12JASVoiceBank */
SECTION_RODATA static u8 const sOscData__12JASVoiceBank[24] = {
SECTION_RODATA u8 const JASVoiceBank::sOscData[24] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039B1B8, &sOscData__12JASVoiceBank);
COMPILER_STRIP_GATE(8039B1B8, &JASVoiceBank::sOscData);
/* 80451268-80451270 000768 0004+04 1/1 0/0 0/0 .sbss sOscTable__12JASVoiceBank */
static u8 sOscTable__12JASVoiceBank[4 + 4 /* padding */];
u8 JASVoiceBank::sOscTable[4 + 4 /* padding */];
/* 80297F74-80297FAC 2928B4 0038+00 1/0 0/0 0/0 .text
* getInstParam__12JASVoiceBankCFiiiP12JASInstParam */
libs/JSystem/JAudio2/JASWSParser.cpp
+8 -3
View File
@@ -15,7 +15,9 @@ struct JKRHeap {
/* 802CE72C */ void getFreeSize();
};
struct JASWaveInfo {};
struct JASWaveInfo {
static u32 one[1 + 1 /* padding */];
};
struct JASWaveArc {
/* 8029A70C */ void setFileName(char const*);
@@ -26,6 +28,8 @@ struct JASWSParser {
/* 80298FD8 */ void createWaveBank(void const*, JKRHeap*);
/* 80299034 */ void createBasicWaveBank(void const*, JKRHeap*);
/* 80299264 */ void createSimpleWaveBank(void const*, JKRHeap*);
static u8 sUsedHeapSize[4 + 4 /* padding */];
};
struct JASSimpleWaveBank {
@@ -61,6 +65,7 @@ extern "C" void func_802994D8(void const*, u32);
extern "C" void func_802994F0(void const*, u32);
extern "C" void func_80299508(void const*, u32);
extern "C" void func_80299520(void const*, u32);
extern "C" u8 sUsedHeapSize__11JASWSParser[4 + 4 /* padding */];
//
// External References:
@@ -83,7 +88,7 @@ extern "C" void _savegpr_20();
extern "C" void _savegpr_23();
extern "C" void _restgpr_20();
extern "C" void _restgpr_23();
extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */];
extern "C" u32 one__11JASWaveInfo[1 + 1 /* padding */];
extern "C" extern u8 JASDram[4];
//
@@ -113,7 +118,7 @@ asm void JASWSParser::createWaveBank(void const* param_0, JKRHeap* param_1) {
/* ############################################################################################## */
/* 80451280-80451288 000780 0004+04 2/2 0/0 0/0 .sbss sUsedHeapSize__11JASWSParser */
static u8 sUsedHeapSize__11JASWSParser[4 + 4 /* padding */];
u8 JASWSParser::sUsedHeapSize[4 + 4 /* padding */];
/* 80299034-80299264 293974 0230+00 1/1 0/0 0/0 .text
* createBasicWaveBank__11JASWSParserFPCvP7JKRHeap */
libs/JSystem/JAudio2/JASWaveArcLoader.cpp
+7 -2
View File
@@ -31,6 +31,9 @@ struct JASWaveArcLoader {
/* 8029A0A0 */ void getRootHeap();
/* 8029A0D0 */ void setCurrentDir(char const*);
/* 8029A130 */ void getCurrentDir();
static u8 sCurrentDir[64];
static u8 sAramHeap[4 + 4 /* padding */];
};
struct JASDisposer {
@@ -95,6 +98,8 @@ extern "C" void onDispose__10JASWaveArcFv();
extern "C" void setEntryNum__10JASWaveArcFl();
extern "C" void setFileName__10JASWaveArcFPCc();
extern "C" void __dt__11JASDisposerFv();
extern "C" u8 sCurrentDir__16JASWaveArcLoader[64];
extern "C" u8 sAramHeap__16JASWaveArcLoader[4 + 4 /* padding */];
//
// External References:
@@ -135,7 +140,7 @@ extern "C" void strlen();
/* ############################################################################################## */
/* 80451290-80451298 000790 0004+04 1/1 0/0 0/0 .sbss sAramHeap__16JASWaveArcLoader */
static u8 sAramHeap__16JASWaveArcLoader[4 + 4 /* padding */];
u8 JASWaveArcLoader::sAramHeap[4 + 4 /* padding */];
/* 8029A0A0-8029A0D0 2949E0 0030+00 2/2 0/0 0/0 .text getRootHeap__16JASWaveArcLoaderFv
*/
@@ -150,7 +155,7 @@ asm void JASWaveArcLoader::getRootHeap() {
/* ############################################################################################## */
/* 803C77E0-803C7820 024900 0040+00 2/2 0/0 0/0 .data sCurrentDir__16JASWaveArcLoader */
SECTION_DATA static u8 sCurrentDir__16JASWaveArcLoader[64] = {
SECTION_DATA u8 JASWaveArcLoader::sCurrentDir[64] = {
0x2F, 0x41, 0x75, 0x64, 0x69, 0x6F, 0x52, 0x65, 0x73, 0x2F, 0x57, 0x61, 0x76, 0x65, 0x73, 0x2F,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
libs/JSystem/JAudio2/JAUInitializer.cpp
+8 -2
View File
@@ -15,6 +15,8 @@ struct JKRThread {};
struct JKRThreadSwitch {
/* 802D1A70 */ void enter(JKRThread*, int);
static u8 sManager[4];
};
struct JKRSolidHeap {};
@@ -23,6 +25,10 @@ struct JKRHeap {
/* 802CE72C */ void getFreeSize();
};
struct JKRAram {
static u8 sAramObject[4];
};
struct JAU_JASInitializer {
/* 802A4AD0 */ JAU_JASInitializer();
/* 802A4B28 */ void initJASystem(JKRSolidHeap*);
@@ -150,8 +156,8 @@ extern "C" extern u8 data_80451310[8];
extern "C" extern u8 data_80451318[8];
extern "C" extern u8 data_80451320[8];
extern "C" extern u8 data_80451328[8];
extern "C" extern u8 sManager__15JKRThreadSwitch[4];
extern "C" extern u8 sAramObject__7JKRAram[4];
extern "C" u8 sManager__15JKRThreadSwitch[4];
extern "C" u8 sAramObject__7JKRAram[4];
//
// Declarations:
libs/JSystem/JAudio2/JAUSectionHeap.cpp
+2 -2
View File
@@ -84,11 +84,11 @@ struct JAUSeqCollection {
/* 802A66AC */ void init(void const*);
};
struct JAISeqData {};
struct JAISoundID {};
struct JAISeqDataUser {};
struct JAISoundID {};
struct JAISeqData {};
struct JAUSectionHeap {
struct TSectionHeapData {
libs/JSystem/JAudio2/JAUSeqCollection.cpp
+2 -2
View File
@@ -11,11 +11,11 @@
// Types:
//
struct JAISeqData {};
struct JAISoundID {};
struct JAISeqDataUser {};
struct JAISoundID {};
struct JAISeqData {};
struct JAUSeqDataMgr_SeqCollection {
/* 802A677C */ JAUSeqDataMgr_SeqCollection();
libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
+4 -4
View File
@@ -28,12 +28,12 @@ struct JSULink__template1 {};
struct JKRArchive {};
struct JAISoundID {};
struct JAUSeqDataBlock {
/* 802A68F4 */ JAUSeqDataBlock();
};
struct JAISoundID {};
struct JAUSeqDataBlocks {
/* 802A6928 */ void getSeqData(JAISoundID);
/* 802A6974 */ void seekFreeBlock(u32);
@@ -42,10 +42,10 @@ struct JAUSeqDataBlocks {
/* 802A6A18 */ void hasFailedBlock(JAISoundID);
};
struct JAISeqData {};
struct JAISeqDataUser {};
struct JAISeqData {};
struct JAUDynamicSeqDataBlocks {
/* 802A6A58 */ JAUDynamicSeqDataBlocks();
/* 802A6AA0 */ void setSeqDataArchive(JKRArchive*);
libs/JSystem/JFramework/JFWDisplay.cpp
+32 -11
View File
@@ -26,6 +26,8 @@ struct JUTXfb {
/* 802E53B8 */ void createManager(JKRHeap*, JUTXfb::EXfbNumber);
/* 802E5424 */ void destroyManager();
static u8 sManager[4 + 4 /* padding */];
};
struct JUTVideo {
@@ -33,6 +35,10 @@ struct JUTVideo {
/* 802E50B0 */ void dummyNoDrawWait();
/* 802E5198 */ void setRenderMode(_GXRenderModeObj const*);
/* 802E5210 */ void waitRetraceIfNeed();
static u8 sManager[4];
static u8 sVideoLastTick[4];
static u8 sVideoInterval[4];
};
struct JUTProcBar {
@@ -40,6 +46,8 @@ struct JUTProcBar {
/* 802E5A28 */ void destroy();
/* 802E5A60 */ void clear();
/* 802E5E08 */ void draw();
static u8 sManager[4];
};
struct JUTFader {
@@ -48,14 +56,20 @@ struct JUTFader {
struct JUTDirectPrint {
/* 802E456C */ void changeFrameBuffer(void*, u16, u16);
static u8 sDirectPrint[4 + 4 /* padding */];
};
struct JUTDbPrint {
/* 802E02A4 */ void flush();
static u8 sDebugPrint[4 + 4 /* padding */];
};
struct JUTConsoleManager {
/* 802E8384 */ void draw() const;
static u8 sManager[4];
};
struct JUTAssertion {
@@ -104,6 +118,12 @@ struct JFWDisplay {
/* 80272F2C */ void clearEfb();
/* 80272F58 */ void clearEfb(_GXColor);
/* 8027331C */ void calcCombinationRatio();
static u8 sManager[4];
};
struct JFWAlarm {
static u8 sList[12];
};
struct J2DOrthoGraph {
@@ -145,6 +165,8 @@ extern "C" static void diagnoseGpHang__Fv();
extern "C" void __sinit_JFWDisplay_cpp();
extern "C" void func_80273724();
extern "C" extern char const* const JFWDisplay__stringBase0;
extern "C" u8 sList__8JFWAlarm[12];
extern "C" u8 sManager__10JFWDisplay[4];
//
// External References:
@@ -257,14 +279,14 @@ extern "C" void _restgpr_29();
extern "C" void __cvt_dbl_usll();
extern "C" extern void* __vt__14J2DGrafContext[10];
extern "C" extern void* __vt__13J2DOrthoGraph[10];
extern "C" extern u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */];
extern "C" extern u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */];
extern "C" extern u8 sManager__8JUTVideo[4];
extern "C" extern u8 sVideoLastTick__8JUTVideo[4];
extern "C" extern u8 sVideoInterval__8JUTVideo[4];
extern "C" extern u8 sManager__6JUTXfb[4 + 4 /* padding */];
extern "C" extern u8 sManager__10JUTProcBar[4];
extern "C" extern u8 sManager__17JUTConsoleManager[4];
extern "C" u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */];
extern "C" u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */];
extern "C" u8 sManager__8JUTVideo[4];
extern "C" u8 sVideoLastTick__8JUTVideo[4];
extern "C" u8 sVideoInterval__8JUTVideo[4];
extern "C" u8 sManager__6JUTXfb[4 + 4 /* padding */];
extern "C" u8 sManager__10JUTProcBar[4];
extern "C" u8 sManager__17JUTConsoleManager[4];
//
// Declarations:
@@ -403,8 +425,7 @@ asm JFWDisplay::~JFWDisplay() {
/* ############################################################################################## */
/* 804511C0-804511C4 0006C0 0004+00 2/2 40/40 1/1 .sbss sManager__10JFWDisplay */
extern u8 sManager__10JFWDisplay[4];
u8 sManager__10JFWDisplay[4];
u8 JFWDisplay::sManager[4];
/* 802721DC-80272260 26CB1C 0084+00 0/0 1/1 0/0 .text
* createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb */
@@ -593,7 +614,7 @@ static asm void waitForTick(u32 param_0, u16 param_1) {
static u8 lit_2184[12];
/* 80430FE4-80430FF0 05DD04 000C+00 4/4 0/0 0/0 .bss sList__8JFWAlarm */
static u8 sList__8JFWAlarm[12];
u8 JFWAlarm::sList[12];
/* 80272DD0-80272E10 26D710 0040+00 1/1 0/0 0/0 .text JFWThreadAlarmHandler__FP7OSAlarmP9OSContext
*/
libs/JSystem/JFramework/JFWSystem.cpp
+58 -21
View File
@@ -79,8 +79,30 @@ struct JKRAram {
};
struct JFWSystem {
struct CSetUpParam {
static u32 maxStdHeaps;
static u32 sysHeapSize;
static u32 fifoBufSize;
static u32 aramAudioBufSize;
static u32 aramGraphBufSize;
static u32 streamPriority;
static u32 decompPriority;
static u32 aPiecePriority;
static void* systemFontRes;
static void* renderMode;
static u32 exConsoleBufferSize[1 + 1 /* padding */];
};
/* 80271CD0 */ void firstInit();
/* 80271D18 */ void init();
static u8 rootHeap[4];
static u8 systemHeap[4];
static u8 mainThread[4];
static u8 debugPrint[4];
static u8 systemFont[4];
static u8 systemConsoleManager[4];
static u8 systemConsole[4];
};
//
@@ -89,6 +111,24 @@ struct JFWSystem {
extern "C" void firstInit__9JFWSystemFv();
extern "C" void init__9JFWSystemFv();
extern "C" u32 maxStdHeaps__Q29JFWSystem11CSetUpParam;
extern "C" u32 sysHeapSize__Q29JFWSystem11CSetUpParam;
extern "C" u32 fifoBufSize__Q29JFWSystem11CSetUpParam;
extern "C" u32 aramAudioBufSize__Q29JFWSystem11CSetUpParam;
extern "C" u32 aramGraphBufSize__Q29JFWSystem11CSetUpParam;
extern "C" u32 streamPriority__Q29JFWSystem11CSetUpParam;
extern "C" u32 decompPriority__Q29JFWSystem11CSetUpParam;
extern "C" u32 aPiecePriority__Q29JFWSystem11CSetUpParam;
extern "C" void* systemFontRes__Q29JFWSystem11CSetUpParam;
extern "C" void* renderMode__Q29JFWSystem11CSetUpParam;
extern "C" u32 exConsoleBufferSize__Q29JFWSystem11CSetUpParam[1 + 1 /* padding */];
extern "C" u8 rootHeap__9JFWSystem[4];
extern "C" u8 systemHeap__9JFWSystem[4];
extern "C" u8 mainThread__9JFWSystem[4];
extern "C" u8 debugPrint__9JFWSystem[4];
extern "C" u8 systemFont__9JFWSystem[4];
extern "C" u8 systemConsoleManager__9JFWSystem[4];
extern "C" u8 systemConsole__9JFWSystem[4];
//
// External References:
@@ -126,17 +166,16 @@ extern "C" extern u8 GXNtsc480IntDf[60];
/* ############################################################################################## */
/* 80450770-80450774 0001F0 0004+00 1/1 1/1 0/0 .sdata maxStdHeaps__Q29JFWSystem11CSetUpParam */
SECTION_SDATA extern u32 maxStdHeaps__Q29JFWSystem11CSetUpParam = 0x00000002;
SECTION_SDATA u32 JFWSystem::CSetUpParam::maxStdHeaps = 0x00000002;
/* 80450774-80450778 0001F4 0004+00 1/1 1/1 0/0 .sdata sysHeapSize__Q29JFWSystem11CSetUpParam */
SECTION_SDATA extern u32 sysHeapSize__Q29JFWSystem11CSetUpParam = 0x00400000;
SECTION_SDATA u32 JFWSystem::CSetUpParam::sysHeapSize = 0x00400000;
/* 804511A0-804511A4 0006A0 0004+00 2/2 0/0 0/0 .sbss rootHeap__9JFWSystem */
static u8 rootHeap__9JFWSystem[4];
u8 JFWSystem::rootHeap[4];
/* 804511A4-804511A8 0006A4 0004+00 2/2 1/1 0/0 .sbss systemHeap__9JFWSystem */
extern u8 systemHeap__9JFWSystem[4];
u8 systemHeap__9JFWSystem[4];
u8 JFWSystem::systemHeap[4];
/* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */
#pragma push
@@ -150,58 +189,56 @@ asm void JFWSystem::firstInit() {
/* ############################################################################################## */
/* 80450778-8045077C 0001F8 0004+00 1/1 1/1 0/0 .sdata fifoBufSize__Q29JFWSystem11CSetUpParam */
SECTION_SDATA extern u32 fifoBufSize__Q29JFWSystem11CSetUpParam = 0x00040000;
SECTION_SDATA u32 JFWSystem::CSetUpParam::fifoBufSize = 0x00040000;
/* 8045077C-80450780 0001FC 0004+00 1/1 1/1 0/0 .sdata aramAudioBufSize__Q29JFWSystem11CSetUpParam
*/
SECTION_SDATA extern u32 aramAudioBufSize__Q29JFWSystem11CSetUpParam = 0x00800000;
SECTION_SDATA u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x00800000;
/* 80450780-80450784 000200 0004+00 1/1 1/1 0/0 .sdata aramGraphBufSize__Q29JFWSystem11CSetUpParam
*/
SECTION_SDATA extern u32 aramGraphBufSize__Q29JFWSystem11CSetUpParam = 0x00600000;
SECTION_SDATA u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x00600000;
/* 80450784-80450788 000204 0004+00 1/1 0/0 0/0 .sdata streamPriority__Q29JFWSystem11CSetUpParam
*/
SECTION_SDATA static u32 streamPriority__Q29JFWSystem11CSetUpParam = 0x00000008;
SECTION_SDATA u32 JFWSystem::CSetUpParam::streamPriority = 0x00000008;
/* 80450788-8045078C 000208 0004+00 1/1 0/0 0/0 .sdata decompPriority__Q29JFWSystem11CSetUpParam
*/
SECTION_SDATA static u32 decompPriority__Q29JFWSystem11CSetUpParam = 0x00000007;
SECTION_SDATA u32 JFWSystem::CSetUpParam::decompPriority = 0x00000007;
/* 8045078C-80450790 00020C 0004+00 1/1 0/0 0/0 .sdata aPiecePriority__Q29JFWSystem11CSetUpParam
*/
SECTION_SDATA static u32 aPiecePriority__Q29JFWSystem11CSetUpParam = 0x00000006;
SECTION_SDATA u32 JFWSystem::CSetUpParam::aPiecePriority = 0x00000006;
/* 80450790-80450794 -00001 0004+00 1/1 0/0 0/0 .sdata systemFontRes__Q29JFWSystem11CSetUpParam */
SECTION_SDATA static void* systemFontRes__Q29JFWSystem11CSetUpParam =
(void*)&JUTResFONT_Ascfont_fix12;
SECTION_SDATA void* JFWSystem::CSetUpParam::systemFontRes = (void*)&JUTResFONT_Ascfont_fix12;
/* 80450794-80450798 -00001 0004+00 1/1 1/1 0/0 .sdata renderMode__Q29JFWSystem11CSetUpParam */
SECTION_SDATA extern void* renderMode__Q29JFWSystem11CSetUpParam = (void*)&GXNtsc480IntDf;
SECTION_SDATA void* JFWSystem::CSetUpParam::renderMode = (void*)&GXNtsc480IntDf;
/* 80450798-804507A0 000218 0004+04 1/1 0/0 0/0 .sdata
* exConsoleBufferSize__Q29JFWSystem11CSetUpParam */
SECTION_SDATA static u32 exConsoleBufferSize__Q29JFWSystem11CSetUpParam[1 + 1 /* padding */] = {
SECTION_SDATA u32 JFWSystem::CSetUpParam::exConsoleBufferSize[1 + 1 /* padding */] = {
0x000024FC,
/* padding */
0x00000000,
};
/* 804511A8-804511AC 0006A8 0004+00 1/1 0/0 0/0 .sbss mainThread__9JFWSystem */
static u8 mainThread__9JFWSystem[4];
u8 JFWSystem::mainThread[4];
/* 804511AC-804511B0 0006AC 0004+00 1/1 0/0 0/0 .sbss debugPrint__9JFWSystem */
static u8 debugPrint__9JFWSystem[4];
u8 JFWSystem::debugPrint[4];
/* 804511B0-804511B4 0006B0 0004+00 1/1 0/0 0/0 .sbss systemFont__9JFWSystem */
static u8 systemFont__9JFWSystem[4];
u8 JFWSystem::systemFont[4];
/* 804511B4-804511B8 0006B4 0004+00 1/1 0/0 0/0 .sbss systemConsoleManager__9JFWSystem */
static u8 systemConsoleManager__9JFWSystem[4];
u8 JFWSystem::systemConsoleManager[4];
/* 804511B8-804511BC 0006B8 0004+00 1/1 7/7 0/0 .sbss systemConsole__9JFWSystem */
extern u8 systemConsole__9JFWSystem[4];
u8 systemConsole__9JFWSystem[4];
u8 JFWSystem::systemConsole[4];
/* 804511BC-804511C0 0006BC 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_804511BC[4];
libs/JSystem/JKernel/JKRAram.cpp
+21 -8
View File
@@ -36,6 +36,9 @@ struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE474 */ void alloc(u32, int, JKRHeap*);
/* 802CE500 */ void free(void*, JKRHeap*);
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
};
struct JKRExpandSwitch {};
@@ -75,6 +78,12 @@ struct JKRAram {
/* 802D22DC */ void changeGroupIdIfNeed(u8*, int);
/* 802D233C */ void mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
/* 802D25B4 */ void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static u8 sMessageBuffer[16];
static u8 sMessageQueue[32];
static u8 sAramCommandList[12];
static u32 sSZSBufferSize[1 + 1 /* padding */];
static u8 sAramObject[4];
};
//
@@ -96,6 +105,11 @@ extern "C" static void nextSrcData__FPUc();
extern "C" void __sinit_JKRAram_cpp();
extern "C" void func_802D2DF0();
extern "C" extern char const* const JKRAram__stringBase0;
extern "C" u8 sMessageBuffer__7JKRAram[16];
extern "C" u8 sMessageQueue__7JKRAram[32];
extern "C" u8 sAramCommandList__7JKRAram[12];
extern "C" u32 sSZSBufferSize__7JKRAram[1 + 1 /* padding */];
extern "C" u8 sAramObject__7JKRAram[4];
//
// External References:
@@ -146,8 +160,8 @@ extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
//
// Declarations:
@@ -155,8 +169,7 @@ extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
/* ############################################################################################## */
/* 804513C8-804513CC 0008C8 0004+00 3/3 9/9 0/0 .sbss sAramObject__7JKRAram */
extern u8 sAramObject__7JKRAram[4];
u8 sAramObject__7JKRAram[4];
u8 JKRAram::sAramObject[4];
/* 802D1FA4-802D2040 2CC8E4 009C+00 0/0 1/1 0/0 .text create__7JKRAramFUlUllll */
#pragma push
@@ -170,12 +183,12 @@ asm void JKRAram::create(u32 param_0, u32 param_1, s32 param_2, s32 param_3, s32
/* ############################################################################################## */
/* 803CC128-803CC138 029248 0010+00 1/1 0/0 0/0 .data sMessageBuffer__7JKRAram */
SECTION_DATA static u8 sMessageBuffer__7JKRAram[16] = {
SECTION_DATA u8 JKRAram::sMessageBuffer[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 803CC138-803CC158 029258 0020+00 1/1 1/1 0/0 .data sMessageQueue__7JKRAram */
SECTION_DATA extern u8 sMessageQueue__7JKRAram[32] = {
SECTION_DATA u8 JKRAram::sMessageQueue[32] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
@@ -269,13 +282,13 @@ asm void JKRAram::aramToMainRam(u32 param_0, u8* param_1, u32 param_2, JKRExpand
static u8 lit_492[12];
/* 804342DC-804342E8 060FFC 000C+00 1/1 0/0 0/0 .bss sAramCommandList__7JKRAram */
static u8 sAramCommandList__7JKRAram[12];
u8 JKRAram::sAramCommandList[12];
/* 804342E8-80434300 061008 0018+00 1/1 0/0 0/0 .bss decompMutex */
static u8 decompMutex[24];
/* 804508B8-804508C0 000338 0004+04 1/1 1/1 0/0 .sdata sSZSBufferSize__7JKRAram */
SECTION_SDATA extern u32 sSZSBufferSize__7JKRAram[1 + 1 /* padding */] = {
SECTION_SDATA u32 JKRAram::sSZSBufferSize[1 + 1 /* padding */] = {
0x00000400,
/* padding */
0x00000000,
libs/JSystem/JKernel/JKRAramArchive.cpp
+9 -3
View File
@@ -28,10 +28,14 @@ struct JKRHeap {
/* 802CE500 */ void free(void*, JKRHeap*);
/* 802CE548 */ void free(void*);
/* 802CEB18 */ void copyMemory(void*, void*, u32);
static u8 sSystemHeap[4];
};
struct JKRFileLoader {
/* 802D41D4 */ void unmount();
static u8 sVolumeList[12];
};
struct JKRFile {
@@ -106,6 +110,8 @@ struct JKRAramArchive {
struct JKRAram {
/* 802D25B4 */ void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static u8 sAramObject[4];
};
//
@@ -175,9 +181,9 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void abs();
extern "C" extern u8 sVolumeList__13JKRFileLoader[12];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sAramObject__7JKRAram[4];
extern "C" u8 sVolumeList__13JKRFileLoader[12];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sAramObject__7JKRAram[4];
//
// Declarations:
libs/JSystem/JKernel/JKRAramHeap.cpp
+4 -1
View File
@@ -46,6 +46,8 @@ struct JKRAramHeap {
/* 802D3134 */ void getFreeSize();
/* 802D31AC */ void getTotalFreeSize();
/* 802D3218 */ void dump();
static u8 sAramList[12];
};
struct JKRAramBlock {
@@ -68,6 +70,7 @@ extern "C" void getTotalFreeSize__11JKRAramHeapFv();
extern "C" void dump__11JKRAramHeapFv();
extern "C" void __sinit_JKRAramHeap_cpp();
extern "C" void func_802D32B0();
extern "C" u8 sAramList__11JKRAramHeap[12];
//
// External References:
@@ -109,7 +112,7 @@ SECTION_DATA extern void* __vt__11JKRAramHeap[3 + 1 /* padding */] = {
static u8 lit_297[12];
/* 8043430C-80434318 06102C 000C+00 8/8 0/0 0/0 .bss sAramList__11JKRAramHeap */
static u8 sAramList__11JKRAramHeap[12];
u8 JKRAramHeap::sAramList[12];
/* 802D2E44-802D2F14 2CD784 00D0+00 0/0 1/1 0/0 .text __ct__11JKRAramHeapFUlUl */
#pragma push
libs/JSystem/JKernel/JKRAramPiece.cpp
+15 -4
View File
@@ -35,6 +35,8 @@ struct JSUList__template5 {
struct JKRHeap {
/* 802CE500 */ void free(void*, JKRHeap*);
static u8 sSystemHeap[4];
};
struct JKRDecompCommand {};
@@ -58,6 +60,13 @@ struct JKRAramPiece {
/* 802D3838 */ void orderSync(int, u32, u32, u32, JKRAramBlock*);
/* 802D38CC */ void startDMA(JKRAMCommand*);
/* 802D3944 */ void doneDMA(u32);
static u8 sAramPieceCommandList[12];
static u8 mMutex[24];
};
struct JKRAram {
static u8 sMessageQueue[32];
};
//
@@ -75,6 +84,8 @@ extern "C" void __ct__12JKRAMCommandFv();
extern "C" void __dt__12JKRAMCommandFv();
extern "C" void __sinit_JKRAramPiece_cpp();
extern "C" extern char const* const JKRAramPiece__stringBase0;
extern "C" u8 sAramPieceCommandList__12JKRAramPiece[12];
extern "C" u8 mMutex__12JKRAramPiece[24];
//
// External References:
@@ -107,8 +118,8 @@ extern "C" void _savegpr_27();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" extern u8 sMessageQueue__7JKRAram[32];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sMessageQueue__7JKRAram[32];
extern "C" u8 sSystemHeap__7JKRHeap[4];
//
// Declarations:
@@ -142,10 +153,10 @@ asm void JKRAramPiece::sendCommand(JKRAMCommand* param_0) {
static u8 lit_492[12];
/* 80434324-80434330 061044 000C+00 3/3 0/0 0/0 .bss sAramPieceCommandList__12JKRAramPiece */
static u8 sAramPieceCommandList__12JKRAramPiece[12];
u8 JKRAramPiece::sAramPieceCommandList[12];
/* 80434330-80434348 061050 0018+00 3/3 0/0 0/0 .bss mMutex__12JKRAramPiece */
static u8 mMutex__12JKRAramPiece[24];
u8 JKRAramPiece::mMutex[24];
/* 802D3614-802D3770 2CDF54 015C+00 1/1 0/0 0/0 .text
* orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v */
libs/JSystem/JKernel/JKRAramStream.cpp
+24 -8
View File
@@ -37,6 +37,9 @@ struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE474 */ void alloc(u32, int, JKRHeap*);
/* 802CE500 */ void free(void*, JKRHeap*);
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
};
struct JKRAramStreamCommand {
@@ -53,6 +56,13 @@ struct JKRAramStream {
/* 802D3ED0 */ void write_StreamToAram_Async(JSUFileInputStream*, u32, u32, u32, u32*);
/* 802D3FA0 */ void sync(JKRAramStreamCommand*, int);
/* 802D4034 */ void setTransBuffer(u8*, u32, JKRHeap*);
static u8 sMessageBuffer[16];
static u8 sMessageQueue[32];
static u8 sAramStreamObject[4];
static u8 transBuffer[4];
static u8 transSize[4];
static u8 transHeap[4];
};
struct JKRAramBlock {};
@@ -77,6 +87,12 @@ extern "C" void setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap();
extern "C" void __ct__20JKRAramStreamCommandFv();
extern "C" void getAvailable__20JSURandomInputStreamCFv();
extern "C" extern char const* const JKRAramStream__stringBase0;
extern "C" u8 sMessageBuffer__13JKRAramStream[16];
extern "C" u8 sMessageQueue__13JKRAramStream[32];
extern "C" u8 sAramStreamObject__13JKRAramStream[4];
extern "C" u8 transBuffer__13JKRAramStream[4];
extern "C" u8 transSize__13JKRAramStream[4];
extern "C" u8 transHeap__13JKRAramStream[4];
//
// External References:
@@ -101,8 +117,8 @@ extern "C" void _savegpr_24();
extern "C" void _savegpr_26();
extern "C" void _restgpr_24();
extern "C" void _restgpr_26();
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
//
// Declarations:
@@ -111,7 +127,7 @@ extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
/* ############################################################################################## */
/* 80451408-8045140C 000908 0004+00 1/1 0/0 0/0 .sbss sAramStreamObject__13JKRAramStream
*/
static u8 sAramStreamObject__13JKRAramStream[4];
u8 JKRAramStream::sAramStreamObject[4];
/* 802D3B48-802D3BB8 2CE488 0070+00 0/0 1/1 0/0 .text create__13JKRAramStreamFl */
#pragma push
@@ -125,12 +141,12 @@ asm void JKRAramStream::create(s32 param_0) {
/* ############################################################################################## */
/* 803CC188-803CC198 0292A8 0010+00 1/1 0/0 0/0 .data sMessageBuffer__13JKRAramStream */
SECTION_DATA static u8 sMessageBuffer__13JKRAramStream[16] = {
SECTION_DATA u8 JKRAramStream::sMessageBuffer[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 803CC198-803CC1B8 0292B8 0020+00 2/2 0/0 0/0 .data sMessageQueue__13JKRAramStream */
SECTION_DATA static u8 sMessageQueue__13JKRAramStream[32] = {
SECTION_DATA u8 JKRAramStream::sMessageQueue[32] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
@@ -191,13 +207,13 @@ asm void JKRAramStream::writeToAram(JKRAramStreamCommand* param_0) {
/* ############################################################################################## */
/* 8045140C-80451410 00090C 0004+00 2/2 0/0 0/0 .sbss transBuffer__13JKRAramStream */
static u8 transBuffer__13JKRAramStream[4];
u8 JKRAramStream::transBuffer[4];
/* 80451410-80451414 000910 0004+00 2/2 0/0 0/0 .sbss transSize__13JKRAramStream */
static u8 transSize__13JKRAramStream[4];
u8 JKRAramStream::transSize[4];
/* 80451414-80451418 000914 0004+00 2/2 0/0 0/0 .sbss transHeap__13JKRAramStream */
static u8 transHeap__13JKRAramStream[4];
u8 JKRAramStream::transHeap[4];
/* 802D3ED0-802D3FA0 2CE810 00D0+00 0/0 1/1 0/0 .text
* write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl */
libs/JSystem/JKernel/JKRArchivePri.cpp
+10 -4
View File
@@ -13,11 +13,15 @@
struct JKRHeap {
/* 802CE83C */ void findFromRoot(void*);
static u8 sCurrentHeap[4];
};
struct JKRFileLoader {
/* 802D40F0 */ JKRFileLoader();
/* 802D4148 */ ~JKRFileLoader();
static u8 sCurrentVolume[4 + 4 /* padding */];
};
struct JKRArchive {
@@ -43,6 +47,8 @@ struct JKRArchive {
/* 802D6770 */ void findIdResource(u16) const;
/* 802D693C */ void setExpandSize(JKRArchive::SDIFileEntry*, u32);
/* 802D6978 */ void getExpandSize(JKRArchive::SDIFileEntry*) const;
static u8 sCurrentDirID[4 + 4 /* padding */];
};
//
@@ -64,6 +70,7 @@ extern "C" void store__Q210JKRArchive8CArcNameFPCc();
extern "C" void store__Q210JKRArchive8CArcNameFPCcc();
extern "C" void setExpandSize__10JKRArchiveFPQ210JKRArchive12SDIFileEntryUl();
extern "C" void getExpandSize__10JKRArchiveCFPQ210JKRArchive12SDIFileEntry();
extern "C" u8 sCurrentDirID__10JKRArchive[4 + 4 /* padding */];
//
// External References:
@@ -82,8 +89,8 @@ extern "C" void _restgpr_29();
extern "C" void tolower();
extern "C" void strcmp();
extern "C" extern void* __vt__10JKRArchive[20];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
//
// Declarations:
@@ -91,8 +98,7 @@ extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
/* ############################################################################################## */
/* 80451420-80451428 000920 0004+04 1/1 5/5 0/0 .sbss sCurrentDirID__10JKRArchive */
extern u8 sCurrentDirID__10JKRArchive[4 + 4 /* padding */];
u8 sCurrentDirID__10JKRArchive[4 + 4 /* padding */];
u8 JKRArchive::sCurrentDirID[4 + 4 /* padding */];
/* 802D6294-802D6334 2D0BD4 00A0+00 0/0 5/5 0/0 .text
* __ct__10JKRArchiveFlQ210JKRArchive10EMountMode */
libs/JSystem/JKernel/JKRArchivePub.cpp
+13 -5
View File
@@ -15,6 +15,9 @@ struct JKRMemBreakFlag {};
struct JKRHeap {
/* 802CE500 */ void free(void*, JKRHeap*);
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
};
struct JKRArchive {
@@ -61,6 +64,8 @@ struct JKRArchive {
/* 802D6770 */ void findIdResource(u16) const;
/* 802D693C */ void setExpandSize(JKRArchive::SDIFileEntry*, u32);
/* 802D6978 */ void getExpandSize(JKRArchive::SDIFileEntry*) const;
static u8 sCurrentDirID[4 + 4 /* padding */];
};
struct JKRMemArchive {
@@ -70,6 +75,9 @@ struct JKRMemArchive {
struct JKRFileLoader {
/* 802D41D4 */ void unmount();
static u8 sVolumeList[12];
static u8 sCurrentVolume[4 + 4 /* padding */];
};
struct JKRDvdArchive {
@@ -150,11 +158,11 @@ extern "C" void _savegpr_29();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sVolumeList__13JKRFileLoader[12];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
extern "C" extern u8 sCurrentDirID__10JKRArchive[4 + 4 /* padding */];
extern "C" u8 sVolumeList__13JKRFileLoader[12];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
extern "C" u8 sCurrentDirID__10JKRArchive[4 + 4 /* padding */];
//
// Declarations:
libs/JSystem/JKernel/JKRAssertHeap.cpp
+3 -1
View File
@@ -22,6 +22,8 @@ struct JKRHeap {
/* 802CED84 */ void state_register(JKRHeap::TState*, u32) const;
/* 802CED88 */ void state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const;
/* 802CEDA0 */ void state_dump(JKRHeap::TState const&) const;
static u8 sRootHeap[4];
};
struct JKRAssertHeap {
@@ -85,7 +87,7 @@ extern "C" void __dl__FPv();
extern "C" void state_register__7JKRHeapCFPQ27JKRHeap6TStateUl();
extern "C" void state_compare__7JKRHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState();
extern "C" void state_dump__7JKRHeapCFRCQ27JKRHeap6TState();
extern "C" extern u8 sRootHeap__7JKRHeap[4];
extern "C" u8 sRootHeap__7JKRHeap[4];
//
// Declarations:
libs/JSystem/JKernel/JKRCompArchive.cpp
+9 -3
View File
@@ -32,10 +32,14 @@ struct JKRHeap {
/* 802CE500 */ void free(void*, JKRHeap*);
/* 802CE548 */ void free(void*);
/* 802CEB18 */ void copyMemory(void*, void*, u32);
static u8 sSystemHeap[4];
};
struct JKRFileLoader {
/* 802D41D4 */ void unmount();
static u8 sVolumeList[12];
};
struct JKRExpandSwitch {};
@@ -112,6 +116,8 @@ struct JKRAramArchive {
struct JKRAram {
/* 802D233C */ void mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
/* 802D25B4 */ void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static u8 sAramObject[4];
};
//
@@ -181,9 +187,9 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void abs();
extern "C" extern u8 sVolumeList__13JKRFileLoader[12];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sAramObject__7JKRAram[4];
extern "C" u8 sVolumeList__13JKRFileLoader[12];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sAramObject__7JKRAram[4];
//
// Declarations:
libs/JSystem/JKernel/JKRDecomp.cpp
+14 -5
View File
@@ -16,7 +16,9 @@ struct JKRThread {
/* 802D1758 */ ~JKRThread();
};
struct JKRHeap {};
struct JKRHeap {
static u8 sSystemHeap[4];
};
struct JKRDecompCommand {
/* 802DBD70 */ JKRDecompCommand();
@@ -37,6 +39,10 @@ struct JKRDecomp {
/* 802DBA58 */ void decodeSZP(u8*, u8*, u32, u32);
/* 802DBC14 */ void decodeSZS(u8*, u8*, u32, u32);
/* 802DBCF8 */ void checkCompressed(u8*);
static u8 sMessageBuffer[32];
static u8 sMessageQueue[32];
static u8 sDecompObject[4 + 4 /* padding */];
};
struct JKRAMCommand {};
@@ -64,6 +70,9 @@ extern "C" void decodeSZS__9JKRDecompFPUcPUcUlUl();
extern "C" void checkCompressed__9JKRDecompFPUc();
extern "C" void __ct__16JKRDecompCommandFv();
extern "C" void __dt__16JKRDecompCommandFv();
extern "C" u8 sMessageBuffer__9JKRDecomp[32];
extern "C" u8 sMessageQueue__9JKRDecomp[32];
extern "C" u8 sDecompObject__9JKRDecomp[4 + 4 /* padding */];
//
// External References:
@@ -82,7 +91,7 @@ extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
//
// Declarations:
@@ -90,7 +99,7 @@ extern "C" extern u8 sSystemHeap__7JKRHeap[4];
/* ############################################################################################## */
/* 804514B0-804514B8 0009B0 0004+04 1/1 0/0 0/0 .sbss sDecompObject__9JKRDecomp */
static u8 sDecompObject__9JKRDecomp[4 + 4 /* padding */];
u8 JKRDecomp::sDecompObject[4 + 4 /* padding */];
/* 802DB680-802DB6E0 2D5FC0 0060+00 0/0 1/1 0/0 .text create__9JKRDecompFl */
#pragma push
@@ -104,13 +113,13 @@ asm void JKRDecomp::create(s32 param_0) {
/* ############################################################################################## */
/* 803CC460-803CC480 029580 0020+00 1/1 0/0 0/0 .data sMessageBuffer__9JKRDecomp */
SECTION_DATA static u8 sMessageBuffer__9JKRDecomp[32] = {
SECTION_DATA u8 JKRDecomp::sMessageBuffer[32] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 803CC480-803CC4A0 0295A0 0020+00 2/2 0/0 0/0 .data sMessageQueue__9JKRDecomp */
SECTION_DATA static u8 sMessageQueue__9JKRDecomp[32] = {
SECTION_DATA u8 JKRDecomp::sMessageQueue[32] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
libs/JSystem/JKernel/JKRDvdAramRipper.cpp
+15 -4
View File
@@ -44,6 +44,8 @@ struct JSUFileInputStream {
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE500 */ void free(void*, JKRHeap*);
static u8 sSystemHeap[4];
};
struct JKRExpandSwitch {};
@@ -66,6 +68,9 @@ struct JKRDvdAramRipper {
u32*);
/* 802DAA74 */ void callCommand_Async(JKRADCommand*);
/* 802DAE48 */ void syncAram(JKRADCommand*, int);
static u8 sDvdAramAsyncList[12];
static u32 sSZSBufferSize;
};
struct JKRDecomp {
@@ -91,6 +96,10 @@ struct JKRAramHeap {
/* 802D2FBC */ void alloc(u32, JKRAramHeap::EAllocMode);
};
struct JKRAram {
static u8 sAramObject[4];
};
//
// Forward References:
//
@@ -111,6 +120,8 @@ extern "C" static void nextSrcData__FPUc();
extern "C" static void dmaBufferFlush__FUl();
extern "C" void __sinit_JKRDvdAramRipper_cpp();
extern "C" void func_802DB62C();
extern "C" u8 sDvdAramAsyncList__16JKRDvdAramRipper[12];
extern "C" u32 sSZSBufferSize__16JKRDvdAramRipper;
//
// External References:
@@ -159,8 +170,8 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__20JSURandomInputStream[9];
extern "C" extern void* __vt__18JSUFileInputStream[9 + 1 /* padding */];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sAramObject__7JKRAram[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sAramObject__7JKRAram[4];
//
// Declarations:
@@ -208,7 +219,7 @@ asm void JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* param_0, u32 param_1,
static u8 lit_301[12];
/* 804343B4-804343C0 0610D4 000C+00 3/3 0/0 0/0 .bss sDvdAramAsyncList__16JKRDvdAramRipper */
static u8 sDvdAramAsyncList__16JKRDvdAramRipper[12];
u8 JKRDvdAramRipper::sDvdAramAsyncList[12];
/* 804508D0-804508D4 000350 0004+00 3/3 0/0 0/0 .sdata None */
SECTION_SDATA static u32 data_804508D0 = 0x01000000;
@@ -271,7 +282,7 @@ static u8 decompMutex[24];
/* 804508D4-804508D8 000354 0004+00 1/1 1/1 0/0 .sdata sSZSBufferSize__16JKRDvdAramRipper
*/
SECTION_SDATA extern u32 sSZSBufferSize__16JKRDvdAramRipper = 0x00000400;
SECTION_SDATA u32 JKRDvdAramRipper::sSZSBufferSize = 0x00000400;
/* 80451468-8045146C 000968 0004+00 3/3 0/0 0/0 .sbss szpBuf */
static u8 szpBuf[4];
libs/JSystem/JKernel/JKRDvdArchive.cpp
+6 -2
View File
@@ -28,10 +28,14 @@ struct JKRHeap {
/* 802CE500 */ void free(void*, JKRHeap*);
/* 802CE548 */ void free(void*);
/* 802CEB18 */ void copyMemory(void*, void*, u32);
static u8 sSystemHeap[4];
};
struct JKRFileLoader {
/* 802D41D4 */ void unmount();
static u8 sVolumeList[12];
};
struct JKRExpandSwitch {};
@@ -144,8 +148,8 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void abs();
extern "C" extern u8 sVolumeList__13JKRFileLoader[12];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sVolumeList__13JKRFileLoader[12];
extern "C" u8 sSystemHeap__7JKRHeap[4];
//
// Declarations:
libs/JSystem/JKernel/JKRDvdFile.cpp
+4 -1
View File
@@ -50,6 +50,8 @@ struct JKRDvdFile {
/* 802D9A70 */ void sync();
/* 802D9AC4 */ void doneProcess(s32, DVDFileInfo*);
/* 802D9AF8 */ void getFileSize() const;
static u8 sDvdList[12];
};
struct JKRDisposer {
@@ -77,6 +79,7 @@ extern "C" void getFileSize__10JKRDvdFileCFv();
extern "C" void __sinit_JKRDvdFile_cpp();
extern "C" void func_802D9B44();
extern "C" extern char const* const JKRDvdFile__stringBase0;
extern "C" u8 sDvdList__10JKRDvdFile[12];
//
// External References:
@@ -186,7 +189,7 @@ asm void JKRDvdFile::initiate() {
static u8 lit_657[12];
/* 8043436C-80434378 06108C 000C+00 4/4 0/0 0/0 .bss sDvdList__10JKRDvdFile */
static u8 sDvdList__10JKRDvdFile[12];
u8 JKRDvdFile::sDvdList[12];
/* 802D9850-802D98C4 2D4190 0074+00 1/0 1/1 0/0 .text open__10JKRDvdFileFPCc */
#pragma push
libs/JSystem/JKernel/JKRDvdRipper.cpp
+12 -5
View File
@@ -31,6 +31,8 @@ struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE474 */ void alloc(u32, int, JKRHeap*);
/* 802CE500 */ void free(void*, JKRHeap*);
static u8 sSystemHeap[4];
};
struct JKRExpandSwitch {};
@@ -45,13 +47,16 @@ struct JKRDvdFile {
struct JKRDvdRipper {
struct EAllocDirection {};
/* 802D9B98 */ void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*,
JKRDvdRipper::EAllocDirection, u32, int*, u32*);
/* 802D9D10 */ void loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*,
JKRDvdRipper::EAllocDirection, u32, int*, u32*);
/* 802D9C54 */ void loadToMainRAM(s32, u8*, JKRExpandSwitch, u32, JKRHeap*,
JKRDvdRipper::EAllocDirection, u32, int*, u32*);
/* 802D9B98 */ void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*,
JKRDvdRipper::EAllocDirection, u32, int*, u32*);
/* 802DA7D4 */ void isErrorRetry();
static u8 sDvdAsyncList[12];
static u32 sSZSBufferSize;
};
struct JKRDecomp {
@@ -77,6 +82,8 @@ extern "C" void isErrorRetry__12JKRDvdRipperFv();
extern "C" void __sinit_JKRDvdRipper_cpp();
extern "C" void func_802DA820();
extern "C" extern char const* const JKRDvdRipper__stringBase0;
extern "C" u8 sDvdAsyncList__12JKRDvdRipper[12];
extern "C" u32 sSZSBufferSize__12JKRDvdRipper;
//
// External References:
@@ -116,7 +123,7 @@ extern "C" void _restgpr_23();
extern "C" void _restgpr_24();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
//
// Declarations:
@@ -175,13 +182,13 @@ asm void JKRDvdRipper::loadToMainRAM(JKRDvdFile* param_0, u8* param_1, JKRExpand
static u8 lit_491[12];
/* 80434384-80434390 0610A4 000C+00 1/1 0/0 0/0 .bss sDvdAsyncList__12JKRDvdRipper */
static u8 sDvdAsyncList__12JKRDvdRipper[12];
u8 JKRDvdRipper::sDvdAsyncList[12];
/* 80434390-804343A8 0610B0 0018+00 1/1 0/0 0/0 .bss decompMutex */
static u8 decompMutex[24];
/* 804508CC-804508D0 00034C 0004+00 1/1 1/1 0/0 .sdata sSZSBufferSize__12JKRDvdRipper */
SECTION_SDATA extern u32 sSZSBufferSize__12JKRDvdRipper = 0x00000400;
SECTION_SDATA u32 JKRDvdRipper::sSZSBufferSize = 0x00000400;
/* 80451428-8045142C 000928 0004+00 3/3 0/0 0/0 .sbss szpBuf */
static u8 szpBuf[4];
libs/JSystem/JKernel/JKRExpHeap.cpp
+7 -3
View File
@@ -30,6 +30,10 @@ struct JKRHeap {
/* 802CEAC0 */ void dispose();
/* 802CEA78 */ void dispose(void*, u32);
/* 802CEDA0 */ void state_dump(JKRHeap::TState const&) const;
static u8 sCurrentHeap[4];
static u8 sRootHeap[4];
static u8 mErrorHandler[4];
};
struct JKRExpHeap {
@@ -161,9 +165,9 @@ extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" extern u8 sRootHeap__7JKRHeap[4];
extern "C" extern u8 mErrorHandler__7JKRHeap[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sRootHeap__7JKRHeap[4];
extern "C" u8 mErrorHandler__7JKRHeap[4];
//
// Declarations:
libs/JSystem/JKernel/JKRFileCache.cpp
+8 -3
View File
@@ -30,12 +30,17 @@ struct JKRHeap {
/* 802CE500 */ void free(void*, JKRHeap*);
/* 802CE548 */ void free(void*);
/* 802CE83C */ void findFromRoot(void*);
static u8 sSystemHeap[4];
};
struct JKRFileLoader {
/* 802D40F0 */ JKRFileLoader();
/* 802D4148 */ ~JKRFileLoader();
/* 802D41D4 */ void unmount();
static u8 sVolumeList[12];
static u8 sCurrentVolume[4 + 4 /* padding */];
};
struct JKRFileCache {
@@ -155,9 +160,9 @@ extern "C" void strcmp();
extern "C" void strcat();
extern "C" void strcpy();
extern "C" void strlen();
extern "C" extern u8 sVolumeList__13JKRFileLoader[12];
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
extern "C" u8 sVolumeList__13JKRFileLoader[12];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
//
// Declarations:
libs/JSystem/JKernel/JKRFileLoader.cpp
+7 -4
View File
@@ -38,6 +38,9 @@ struct JKRFileLoader {
/* 802D43A0 */ void detachResource(void*, JKRFileLoader*);
/* 802D4438 */ void findVolume(char const**);
/* 802D44C4 */ void fetchVolumeName(char*, s32, char const*);
static u8 sVolumeList[12];
static u8 sCurrentVolume[4 + 4 /* padding */];
};
struct JKRDisposer {
@@ -61,6 +64,8 @@ extern "C" void fetchVolumeName__13JKRFileLoaderFPclPCc();
extern "C" void __sinit_JKRFileLoader_cpp();
extern "C" void func_802D45E4();
extern "C" extern char const* const JKRFileLoader__stringBase0;
extern "C" u8 sVolumeList__13JKRFileLoader[12];
extern "C" u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
//
// External References:
@@ -118,8 +123,7 @@ asm JKRFileLoader::JKRFileLoader() {
/* ############################################################################################## */
/* 80451418-80451420 000918 0004+04 2/2 3/3 0/0 .sbss sCurrentVolume__13JKRFileLoader */
extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */];
u8 JKRFileLoader::sCurrentVolume[4 + 4 /* padding */];
/* 802D4148-802D41D4 2CEA88 008C+00 1/0 2/2 0/0 .text __dt__13JKRFileLoaderFv */
#pragma push
@@ -157,8 +161,7 @@ asm void JKRFileLoader::getGlbResource(char const* param_0) {
static u8 lit_2182[12];
/* 80434354-80434360 061074 000C+00 5/5 14/14 0/0 .bss sVolumeList__13JKRFileLoader */
extern u8 sVolumeList__13JKRFileLoader[12];
u8 sVolumeList__13JKRFileLoader[12];
u8 JKRFileLoader::sVolumeList[12];
/* 802D4270-802D4308 2CEBB0 0098+00 0/0 29/29 1/1 .text
* getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader */
libs/JSystem/JKernel/JKRHeap.cpp
+28 -18
View File
@@ -69,6 +69,16 @@ struct JKRHeap {
/* 802CEDA0 */ void state_dump(JKRHeap::TState const&) const;
/* 802CEDA4 */ bool do_changeGroupID(u8);
/* 802CEDAC */ bool do_getCurrentGroupId();
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
static u8 sRootHeap[4];
static u8 mErrorHandler[4];
static u8 mCodeStart[4];
static u8 mCodeEnd[4];
static u8 mUserRamStart[4];
static u8 mUserRamEnd[4];
static u8 mMemorySize[4];
};
struct JKRDisposer {
@@ -128,6 +138,15 @@ extern "C" void state_dump__7JKRHeapCFRCQ27JKRHeap6TState();
extern "C" bool do_changeGroupID__7JKRHeapFUc();
extern "C" bool do_getCurrentGroupId__7JKRHeapFv();
extern "C" extern char const* const JKRHeap__stringBase0;
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sRootHeap__7JKRHeap[4];
extern "C" u8 mErrorHandler__7JKRHeap[4];
extern "C" u8 mCodeStart__7JKRHeap[4];
extern "C" u8 mCodeEnd__7JKRHeap[4];
extern "C" u8 mUserRamStart__7JKRHeap[4];
extern "C" u8 mUserRamEnd__7JKRHeap[4];
extern "C" u8 mMemorySize__7JKRHeap[4];
//
// External References:
@@ -193,20 +212,16 @@ SECTION_DATA extern void* __vt__7JKRHeap[24] = {
};
/* 80451370-80451374 000870 0004+00 3/3 44/44 0/0 .sbss sSystemHeap__7JKRHeap */
extern u8 sSystemHeap__7JKRHeap[4];
u8 sSystemHeap__7JKRHeap[4];
u8 JKRHeap::sSystemHeap[4];
/* 80451374-80451378 000874 0004+00 4/4 23/23 0/0 .sbss sCurrentHeap__7JKRHeap */
extern u8 sCurrentHeap__7JKRHeap[4];
u8 sCurrentHeap__7JKRHeap[4];
u8 JKRHeap::sCurrentHeap[4];
/* 80451378-8045137C 000878 0004+00 3/3 10/10 0/0 .sbss sRootHeap__7JKRHeap */
extern u8 sRootHeap__7JKRHeap[4];
u8 sRootHeap__7JKRHeap[4];
u8 JKRHeap::sRootHeap[4];
/* 8045137C-80451380 00087C 0004+00 2/2 3/3 0/0 .sbss mErrorHandler__7JKRHeap */
extern u8 mErrorHandler__7JKRHeap[4];
u8 mErrorHandler__7JKRHeap[4];
u8 JKRHeap::mErrorHandler[4];
/* 80451380-80451384 000880 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80451380[4];
@@ -233,24 +248,19 @@ asm JKRHeap::~JKRHeap() {
/* ############################################################################################## */
/* 80451384-80451388 000884 0004+00 1/1 1/1 0/0 .sbss mCodeStart__7JKRHeap */
extern u8 mCodeStart__7JKRHeap[4];
u8 mCodeStart__7JKRHeap[4];
u8 JKRHeap::mCodeStart[4];
/* 80451388-8045138C 000888 0004+00 1/1 1/1 0/0 .sbss mCodeEnd__7JKRHeap */
extern u8 mCodeEnd__7JKRHeap[4];
u8 mCodeEnd__7JKRHeap[4];
u8 JKRHeap::mCodeEnd[4];
/* 8045138C-80451390 00088C 0004+00 1/1 1/1 0/0 .sbss mUserRamStart__7JKRHeap */
extern u8 mUserRamStart__7JKRHeap[4];
u8 mUserRamStart__7JKRHeap[4];
u8 JKRHeap::mUserRamStart[4];
/* 80451390-80451394 000890 0004+00 1/1 1/1 0/0 .sbss mUserRamEnd__7JKRHeap */
extern u8 mUserRamEnd__7JKRHeap[4];
u8 mUserRamEnd__7JKRHeap[4];
u8 JKRHeap::mUserRamEnd[4];
/* 80451394-80451398 000894 0004+00 1/1 2/2 0/0 .sbss mMemorySize__7JKRHeap */
extern u8 mMemorySize__7JKRHeap[4];
u8 mMemorySize__7JKRHeap[4];
u8 JKRHeap::mMemorySize[4];
/* 802CE378-802CE428 2C8CB8 00B0+00 0/0 1/1 0/0 .text initArena__7JKRHeapFPPcPUli */
#pragma push
libs/JSystem/JKernel/JKRMemArchive.cpp
+3 -1
View File
@@ -68,6 +68,8 @@ struct JKRHeap {
struct JKRFileLoader {
/* 802D41D4 */ void unmount();
static u8 sVolumeList[12];
};
struct JKRExpandSwitch {};
@@ -134,7 +136,7 @@ extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sVolumeList__13JKRFileLoader[12];
extern "C" u8 sVolumeList__13JKRFileLoader[12];
//
// Declarations:
libs/JSystem/JKernel/JKRSolidHeap.cpp
+5 -2
View File
@@ -29,6 +29,9 @@ struct JKRHeap {
/* 802CEDA0 */ void state_dump(JKRHeap::TState const&) const;
/* 802CEDA4 */ bool do_changeGroupID(u8);
/* 802CEDAC */ bool do_getCurrentGroupId();
static u8 sRootHeap[4];
static u8 mErrorHandler[4];
};
struct JKRSolidHeap {
@@ -112,8 +115,8 @@ extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sRootHeap__7JKRHeap[4];
extern "C" extern u8 mErrorHandler__7JKRHeap[4];
extern "C" u8 sRootHeap__7JKRHeap[4];
extern "C" u8 mErrorHandler__7JKRHeap[4];
//
// Declarations:
libs/JSystem/JKernel/JKRThread.cpp
+36 -12
View File
@@ -50,6 +50,10 @@ struct JKRHeap {
/* 802CE500 */ void free(void*, JKRHeap*);
/* 802CE83C */ void findFromRoot(void*);
/* 802CEBA8 */ void isSubHeap(JKRHeap*) const;
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
static u8 sRootHeap[4];
};
struct JKRThread {
@@ -62,6 +66,8 @@ struct JKRThread {
/* 802D1934 */ void start(void*);
/* 802D1960 */ void searchThread(OSThread*);
/* 802D1E14 */ bool run();
static u8 sThreadList[12];
};
struct JKRThreadName_ {};
@@ -74,6 +80,17 @@ struct JKRThreadSwitch {
/* 802D1C74 */ void draw(JKRThreadName_*, JUTConsole*);
/* 802D1E1C */ void draw(JKRThreadName_*);
/* 802D1E4C */ ~JKRThreadSwitch();
static u8 sManager[4];
static u8 sTotalCount[4];
static u8 sTotalStart[4];
static u8 mUserPreCallback[4];
static u8 mUserPostCallback[4];
};
struct JKRTask {
static u8 sTaskList[12];
static u8 sEndMesgQueue[32];
};
struct JKRDisposer {
@@ -105,6 +122,14 @@ extern "C" void __sinit_JKRThread_cpp();
extern "C" void func_802D1EFC();
extern "C" void func_802D1F50();
extern "C" extern char const* const JKRThread__stringBase0;
extern "C" u8 sThreadList__9JKRThread[12];
extern "C" u8 sTaskList__7JKRTask[12];
extern "C" u8 sEndMesgQueue__7JKRTask[32];
extern "C" u8 sManager__15JKRThreadSwitch[4];
extern "C" u8 sTotalCount__15JKRThreadSwitch[4];
extern "C" u8 sTotalStart__15JKRThreadSwitch[4];
extern "C" u8 mUserPreCallback__15JKRThreadSwitch[4];
extern "C" u8 mUserPostCallback__15JKRThreadSwitch[4];
//
// External References:
@@ -149,9 +174,9 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void __cvt_sll_flt();
extern "C" void sprintf();
extern "C" extern u8 sSystemHeap__7JKRHeap[4];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" extern u8 sRootHeap__7JKRHeap[4];
extern "C" u8 sSystemHeap__7JKRHeap[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 sRootHeap__7JKRHeap[4];
//
// Declarations:
@@ -212,7 +237,7 @@ asm JKRThread::JKRThread(OSThread* param_0, int param_1) {
static u8 lit_481[12];
/* 8043428C-80434298 060FAC 000C+00 5/6 0/0 0/0 .bss sThreadList__9JKRThread */
static u8 sThreadList__9JKRThread[12];
u8 JKRThread::sThreadList[12];
/* 802D1758-802D1830 2CC098 00D8+00 1/0 9/9 0/0 .text __dt__9JKRThreadFv */
#pragma push
@@ -269,14 +294,13 @@ asm void JKRThread::searchThread(OSThread* param_0) {
/* ############################################################################################## */
/* 804513B0-804513B4 0008B0 0004+00 2/2 1/1 0/0 .sbss sManager__15JKRThreadSwitch */
extern u8 sManager__15JKRThreadSwitch[4];
u8 sManager__15JKRThreadSwitch[4];
u8 JKRThreadSwitch::sManager[4];
/* 804513B4-804513B8 0008B4 0004+00 3/3 0/0 0/0 .sbss sTotalCount__15JKRThreadSwitch */
static u8 sTotalCount__15JKRThreadSwitch[4];
u8 JKRThreadSwitch::sTotalCount[4];
/* 804513B8-804513BC 0008B8 0004+00 1/1 0/0 0/0 .sbss sTotalStart__15JKRThreadSwitch */
static u8 sTotalStart__15JKRThreadSwitch[4];
u8 JKRThreadSwitch::sTotalStart[4];
/* 804513BC-804513C0 0008BC 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_804513BC[4];
@@ -316,10 +340,10 @@ asm void JKRThreadSwitch::enter(JKRThread* param_0, int param_1) {
/* ############################################################################################## */
/* 804513C0-804513C4 0008C0 0004+00 1/1 0/0 0/0 .sbss mUserPreCallback__15JKRThreadSwitch
*/
static u8 mUserPreCallback__15JKRThreadSwitch[4];
u8 JKRThreadSwitch::mUserPreCallback[4];
/* 804513C4-804513C8 0008C4 0004+00 1/1 0/0 0/0 .sbss mUserPostCallback__15JKRThreadSwitch */
static u8 mUserPostCallback__15JKRThreadSwitch[4];
u8 JKRThreadSwitch::mUserPostCallback[4];
/* 802D1AE4-802D1C74 2CC424 0190+00 1/1 0/0 0/0 .text
* callback__15JKRThreadSwitchFP8OSThreadP8OSThread */
@@ -388,7 +412,7 @@ static u8 lit_989[12];
/* 804342A4-804342B0 060FC4 000C+00 0/1 0/0 0/0 .bss sTaskList__7JKRTask */
#pragma push
#pragma force_active on
static u8 sTaskList__7JKRTask[12];
u8 JKRTask::sTaskList[12];
#pragma pop
/* 802D1E94-802D1EFC 2CC7D4 0068+00 0/0 1/0 0/0 .text __sinit_JKRThread_cpp */
@@ -430,7 +454,7 @@ extern "C" asm void func_802D1F50() {
/* 804342B0-804342D0 060FD0 0020+00 0/0 0/0 0/0 .bss sEndMesgQueue__7JKRTask */
#pragma push
#pragma force_active on
static u8 sEndMesgQueue__7JKRTask[32];
u8 JKRTask::sEndMesgQueue[32];
#pragma pop
/* 8039CFA8-8039D078 029608 00CD+03 2/2 0/0 0/0 .rodata @stringBase0 */
libs/JSystem/JMath/JMATrigonometric.cpp
+12 -5
View File
@@ -21,12 +21,21 @@ struct pair__template0 {
}; // namespace std
struct JMath {
static u8 sincosTable_[65536];
static f32 atanTable_[1032];
static f32 asinAcosTable_[1032];
};
//
// Forward References:
//
extern "C" void __sinit_JMATrigonometric_cpp();
extern "C" void func_80339CB0();
extern "C" u8 sincosTable___5JMath[65536];
extern "C" f32 atanTable___5JMath[1032];
extern "C" f32 asinAcosTable___5JMath[1032];
//
// External References:
@@ -46,15 +55,13 @@ extern "C" void asin();
/* ############################################################################################## */
/* 80439A20-80449A20 066740 10000+00 1/1 265/265 705/705 .bss sincosTable___5JMath */
extern u8 sincosTable___5JMath[65536];
u8 sincosTable___5JMath[65536];
u8 JMath::sincosTable_[65536];
/* 80449A20-8044AA40 076740 1020+00 1/1 0/0 0/0 .bss atanTable___5JMath */
static f32 atanTable___5JMath[1032];
f32 JMath::atanTable_[1032];
/* 8044AA40-8044BA60 077760 1020+00 1/1 1/1 0/0 .bss asinAcosTable___5JMath */
extern f32 asinAcosTable___5JMath[1032];
f32 asinAcosTable___5JMath[1032];
f32 JMath::asinAcosTable_[1032];
/* 804564D8-804564E0 004AD8 0004+04 2/2 0/0 0/0 .sdata2 @326 */
SECTION_SDATA2 static f32 lit_326[1 + 1 /* padding */] = {
libs/JSystem/JMath/JMath.cpp
+5 -1
View File
@@ -15,6 +15,10 @@ struct Vec {};
struct Quaternion {};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -29,7 +33,7 @@ extern "C" void JMAMTXApplyScale__FPA4_CfPA4_ffff();
// External References:
//
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
libs/JSystem/JMessage/data.cpp
+12 -3
View File
@@ -7,11 +7,21 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct JMessage {
struct data {
static f32 ga4cSignature[1 + 1 /* padding */];
};
};
//
// Forward References:
//
extern "C" extern f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
extern "C" f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
//
// External References:
@@ -23,8 +33,7 @@ extern "C" extern f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
/* ############################################################################################## */
/* 80455818-80455820 003E18 0004+04 0/0 1/1 0/0 .sdata2 ga4cSignature__Q28JMessage4data */
SECTION_SDATA2 extern f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
SECTION_SDATA2 f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */] = {
SECTION_SDATA2 f32 JMessage::data::ga4cSignature[1 + 1 /* padding */] = {
206910576.0f,
/* padding */
0.0f,
libs/JSystem/JMessage/resource.cpp
+9 -2
View File
@@ -35,6 +35,8 @@ struct JMessage {
/* 802A906C */ TResourceContainer();
/* 802A90B8 */ void setEncoding(u8);
/* 802A90F0 */ void setEncoding_(u8);
static void* sapfnParseCharacter_[5];
};
struct TParse {
@@ -50,6 +52,10 @@ struct JMessage {
/* 802A9528 */ void parseCharacter_ShiftJIS(char const**);
/* 802A958C */ void parseCharacter_UTF8(char const**);
};
struct data {
static f32 ga4cSignature[1 + 1 /* padding */];
};
};
namespace JGadget {
@@ -91,6 +97,7 @@ extern "C" void parseBlock_next__Q28JMessage6TParseFPPCvPUlUl();
extern "C" void parseCharacter_1Byte__Q28JMessage6localeFPPCc();
extern "C" void parseCharacter_2Byte__Q28JMessage6localeFPPCc();
extern "C" void func_802A94D4(u32 const*, u32 const*, u32 const&);
extern "C" void* sapfnParseCharacter___Q28JMessage18TResourceContainer[5];
//
// External References:
@@ -109,7 +116,7 @@ extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" void memcmp();
extern "C" extern void* __vt__Q37JGadget6binary19TParse_header_block[5];
extern "C" extern f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
extern "C" f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
//
// Declarations:
@@ -130,7 +137,7 @@ asm void JMessage::TResource::toMessageIndex_messageID(u32 param_0, u32 param_1,
/* ############################################################################################## */
/* 803C9C80-803C9C94 -00001 0014+00 1/1 0/0 0/0 .data
* sapfnParseCharacter___Q28JMessage18TResourceContainer */
SECTION_DATA static void* sapfnParseCharacter___Q28JMessage18TResourceContainer[5] = {
SECTION_DATA void* JMessage::TResourceContainer::sapfnParseCharacter_[5] = {
(void*)NULL,
(void*)parseCharacter_1Byte__Q28JMessage6localeFPPCc,
(void*)parseCharacter_2Byte__Q28JMessage6localeFPPCc,
libs/JSystem/JParticle/JPABaseShape.cpp
+27 -8
View File
@@ -35,6 +35,14 @@ struct JKRHeap {
struct JPABaseShape {
/* 8027A6DC */ JPABaseShape(u8 const*, JKRHeap*);
/* 8027A7E8 */ void setGX(JPAEmitterWorkData*) const;
static u8 st_bm[12];
static u8 st_bf[40];
static u8 st_lo[64];
static u8 st_c[32];
static u8 st_ao[16];
static u8 st_ca[96];
static u8 st_aa[32 + 4 /* padding */];
};
struct JPABaseParticle {};
@@ -50,6 +58,10 @@ struct JPABaseEmitter {
/* 8027EEB0 */ void calcEmitterGlobalPosition(JGeometry::TVec3<f32>*) const;
};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -134,6 +146,13 @@ extern "C" void JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticl
extern "C" static void makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap();
extern "C" void __ct__12JPABaseShapeFPCUcP7JKRHeap();
extern "C" void setGX__12JPABaseShapeCFP18JPAEmitterWorkData();
extern "C" u8 st_bm__12JPABaseShape[12];
extern "C" u8 st_bf__12JPABaseShape[40];
extern "C" u8 st_lo__12JPABaseShape[64];
extern "C" u8 st_c__12JPABaseShape[32];
extern "C" u8 st_ao__12JPABaseShape[16];
extern "C" u8 st_ca__12JPABaseShape[96];
extern "C" u8 st_aa__12JPABaseShape[32 + 4 /* padding */];
//
// External References:
@@ -171,7 +190,7 @@ extern "C" void _restgpr_22();
extern "C" void _restgpr_24();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_epsilon;
//
@@ -1125,7 +1144,7 @@ asm JPABaseShape::JPABaseShape(u8 const* param_0, JKRHeap* param_1) {
/* 803C4360-803C436C 021480 000C+00 0/1 0/0 0/0 .data st_bm__12JPABaseShape */
#pragma push
#pragma force_active on
SECTION_DATA static u8 st_bm__12JPABaseShape[12] = {
SECTION_DATA u8 JPABaseShape::st_bm[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02,
};
#pragma pop
@@ -1133,7 +1152,7 @@ SECTION_DATA static u8 st_bm__12JPABaseShape[12] = {
/* 803C436C-803C4394 02148C 0028+00 0/1 0/0 0/0 .data st_bf__12JPABaseShape */
#pragma push
#pragma force_active on
SECTION_DATA static u8 st_bf__12JPABaseShape[40] = {
SECTION_DATA u8 JPABaseShape::st_bf[40] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04,
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07,
@@ -1143,7 +1162,7 @@ SECTION_DATA static u8 st_bf__12JPABaseShape[40] = {
/* 803C4394-803C43D4 0214B4 0040+00 0/1 0/0 0/0 .data st_lo__12JPABaseShape */
#pragma push
#pragma force_active on
SECTION_DATA static u8 st_lo__12JPABaseShape[64] = {
SECTION_DATA u8 JPABaseShape::st_lo[64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C,
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0E,
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x09,
@@ -1154,7 +1173,7 @@ SECTION_DATA static u8 st_lo__12JPABaseShape[64] = {
/* 803C43D4-803C43F4 0214F4 0020+00 0/1 0/0 0/0 .data st_c__12JPABaseShape */
#pragma push
#pragma force_active on
SECTION_DATA static u8 st_c__12JPABaseShape[32] = {
SECTION_DATA u8 JPABaseShape::st_c[32] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02,
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07,
};
@@ -1163,7 +1182,7 @@ SECTION_DATA static u8 st_c__12JPABaseShape[32] = {
/* 803C43F4-803C4404 021514 0010+00 0/1 0/0 0/0 .data st_ao__12JPABaseShape */
#pragma push
#pragma force_active on
SECTION_DATA static u8 st_ao__12JPABaseShape[16] = {
SECTION_DATA u8 JPABaseShape::st_ao[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03,
};
#pragma pop
@@ -1171,7 +1190,7 @@ SECTION_DATA static u8 st_ao__12JPABaseShape[16] = {
/* 803C4404-803C4464 021524 0060+00 0/1 0/0 0/0 .data st_ca__12JPABaseShape */
#pragma push
#pragma force_active on
SECTION_DATA static u8 st_ca__12JPABaseShape[96] = {
SECTION_DATA u8 JPABaseShape::st_ca[96] = {
0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0F,
0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0F,
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0F,
@@ -1184,7 +1203,7 @@ SECTION_DATA static u8 st_ca__12JPABaseShape[96] = {
/* 803C4464-803C4488 021584 0020+04 0/1 0/0 0/0 .data st_aa__12JPABaseShape */
#pragma push
#pragma force_active on
SECTION_DATA static u8 st_aa__12JPABaseShape[32 + 4 /* padding */] = {
SECTION_DATA u8 JPABaseShape::st_aa[32 + 4 /* padding */] = {
0x00,
0x00,
0x00,
libs/JSystem/JParticle/JPADynamicsBlock.cpp
+5 -1
View File
@@ -23,6 +23,10 @@ struct JPABaseEmitter {
/* 8027EA40 */ void createParticle();
};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -43,7 +47,7 @@ extern "C" void create__16JPADynamicsBlockFP18JPAEmitterWorkData();
//
extern "C" void createParticle__14JPABaseEmitterFv();
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
libs/JSystem/JParticle/JPAEmitterManager.cpp
+9 -9
View File
@@ -36,16 +36,11 @@ struct JPAResourceManager {
/* 80273E68 */ void getResource(u16) const;
};
struct JPAEmitterWorkData {};
struct JPAResource;
struct JPAParticleCallBack {};
struct JPABaseEmitter;
struct JKRHeap {};
struct JPAEmitterCallBack {};
struct JPADrawInfo {};
struct JGeometry {
template <typename A1>
struct TVec3 {};
@@ -53,6 +48,13 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JPAEmitterCallBack {};
struct JPADrawInfo {};
struct JKRHeap {};
struct JPABaseEmitter;
struct JPAEmitterManager {
/* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
/* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
@@ -74,8 +76,6 @@ struct JPABaseEmitter {
/* 8027EC60 */ void deleteAllParticle();
};
struct JPAEmitterWorkData {};
struct JPAResource {
/* 802755E8 */ void calc(JPAEmitterWorkData*, JPABaseEmitter*);
/* 80275A94 */ void draw(JPAEmitterWorkData*, JPABaseEmitter*);
libs/JSystem/JParticle/JPAExtraShape.cpp
+5 -1
View File
@@ -20,6 +20,10 @@ struct JPAEmitterWorkData {};
struct JPABaseParticle {};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -41,7 +45,7 @@ extern "C" void init__13JPAExtraShapeFv();
// External References:
//
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
libs/JSystem/JParticle/JPAFieldBlock.cpp
+2 -2
View File
@@ -11,10 +11,10 @@
// Types:
//
struct JPABaseParticle {};
struct JPAEmitterWorkData {};
struct JPABaseParticle {};
struct JKRHeap {};
struct JPAFieldBlock {
libs/JSystem/JParticle/JPAMath.cpp
+5 -1
View File
@@ -11,6 +11,10 @@
// Types:
//
struct JMath {
static u8 sincosTable_[65536];
};
struct JGeometry {
template <typename A1>
struct TVec3 {};
@@ -37,7 +41,7 @@ extern "C" void PSMTXIdentity();
extern "C" void PSVECMag();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_epsilon;
//

Some files were not shown because too many files have changed in this diff Show More