auto decompile more functions

This commit is contained in:
Julgodis
2021-04-08 21:05:48 +02:00
parent a23a106399
commit 2661db6aaa
559 changed files with 3534 additions and 3686 deletions
+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*,
+2 -2
View File
@@ -18,10 +18,10 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JAISoundHandle {};
struct JAISoundID {};
struct JAISoundHandle {};
struct JAISoundStarter {
/* 802A2F6C */ JAISoundStarter(bool);
/* 802A2F88 */ ~JAISoundStarter();
+2 -2
View File
@@ -49,8 +49,6 @@ struct JASAramStream {
struct JAIStreamMgr {};
struct JAIAudience {};
template <typename A0>
struct JAISoundStrategyMgr {};
/* JAISoundStrategyMgr<JAIStream> */
@@ -58,6 +56,8 @@ struct JAISoundStrategyMgr__template2 {};
struct JAISoundID {};
struct JAIAudience {};
struct JAISoundActivity {};
struct JAIStream {
+4 -4
View File
@@ -44,10 +44,10 @@ struct JASGenericMemPool {
/* 80290994 */ void free(void*, u32);
};
struct JAISoundHandle {};
struct JAISoundID {};
struct JAISoundHandle {};
struct JAIStreamMgr {
/* 802A3B68 */ JAIStreamMgr(bool);
/* 802A3C3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
@@ -60,13 +60,13 @@ struct JAIStreamMgr {
/* 802A4174 */ void newStream_();
};
struct JAIAudience {};
template <typename A0>
struct JAISoundStrategyMgr {};
/* JAISoundStrategyMgr<JAIStream> */
struct JAISoundStrategyMgr__template2 {};
struct JAIAudience {};
struct JAISoundActivity {};
struct JAIStream {
+12 -22
View File
@@ -48,14 +48,14 @@ struct JASDriver {
/* 8029C900 */ void finishDSPFrame();
/* 8029C9DC */ void registerMixCallback(s16* (*)(s32), JASMixMode);
/* 8029C9E8 */ void getDacRate();
/* 8029C9F0 */ void getSubFrames();
/* 8029C9F0 */ u32 getSubFrames();
/* 8029C9F8 */ void getDacSize();
/* 8029CA04 */ void getFrameSamples();
/* 8029CA10 */ void mixMonoTrack(s16*, u32, s16* (*)(s32));
/* 8029CAC0 */ void mixMonoTrackWide(s16*, u32, s16* (*)(s32));
/* 8029CB70 */ void mixExtraTrack(s16*, u32, s16* (*)(s32));
/* 8029CC50 */ void mixInterleaveTrack(s16*, u32, s16* (*)(s32));
/* 8029CCD4 */ void getSubFrameCounter();
/* 8029CCD4 */ u32 getSubFrameCounter();
/* 8029E2A8 */ void subframeCallback();
/* 8029E2D0 */ void DSPSyncCallback();
@@ -113,14 +113,14 @@ extern "C" void readDspBuffer__9JASDriverFPsUl();
extern "C" void finishDSPFrame__9JASDriverFv();
extern "C" void registerMixCallback__9JASDriverFPFl_Ps10JASMixMode();
extern "C" void getDacRate__9JASDriverFv();
extern "C" void getSubFrames__9JASDriverFv();
extern "C" u32 getSubFrames__9JASDriverFv();
extern "C" void getDacSize__9JASDriverFv();
extern "C" void getFrameSamples__9JASDriverFv();
extern "C" void mixMonoTrack__9JASDriverFPsUlPFl_Ps();
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" u32 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 */];
@@ -257,7 +257,7 @@ SECTION_SDATA u32 JASDriver::sMixMode = 0x00000002;
/* 804507B0-804507B4 000230 0004+00 2/2 0/0 0/0 .sdata sDacRate__9JASDriver */
SECTION_SDATA f32 JASDriver::sDacRate = 32028.5f;
/* 804507B4-804507B8 000234 0004+00 4/4 0/0 0/0 .sdata sSubFrames__9JASDriver */
/* 804507B4-804507B8 000234 0004+00 4/3 0/0 0/0 .sdata sSubFrames__9JASDriver */
SECTION_SDATA u32 JASDriver::sSubFrames = 0x00000007;
/* 80455720-80455724 003D20 0004+00 1/1 0/0 0/0 .sdata2 @233 */
@@ -289,7 +289,7 @@ SECTION_RODATA void* const JASDriver::sMixFuncs[4] = {
};
COMPILER_STRIP_GATE(8039B2E0, &JASDriver::sMixFuncs);
/* 804512C4-804512C8 0007C4 0004+00 2/2 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */
/* 804512C4-804512C8 0007C4 0004+00 2/1 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */
u8 JASDriver::sSubFrameCounter[4];
/* 804512C8-804512CC 0007C8 0004+00 1/1 0/0 0/0 .sbss dacp$239 */
@@ -386,15 +386,10 @@ asm void JASDriver::getDacRate() {
}
#pragma pop
/* 8029C9F0-8029C9F8 297330 0008+00 2/2 2/2 0/0 .text getSubFrames__9JASDriverFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::getSubFrames() {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s"
/* 8029C9F0-8029C9F8 -00001 0008+00 0/0 0/0 0/0 .text getSubFrames__9JASDriverFv */
u32 JASDriver::getSubFrames() {
return *(u32*)(&JASDriver::sSubFrames);
}
#pragma pop
/* 8029C9F8-8029CA04 297338 000C+00 2/2 0/0 0/0 .text getDacSize__9JASDriverFv */
#pragma push
@@ -457,15 +452,10 @@ asm void JASDriver::mixInterleaveTrack(s16* param_0, u32 param_1, s16* (*)(s32))
}
#pragma pop
/* 8029CCD4-8029CCDC 297614 0008+00 0/0 1/1 0/0 .text getSubFrameCounter__9JASDriverFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::getSubFrameCounter() {
nofralloc
#include "asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s"
/* 8029CCD4-8029CCDC -00001 0008+00 0/0 0/0 0/0 .text getSubFrameCounter__9JASDriverFv */
u32 JASDriver::getSubFrameCounter() {
return *(u32*)(&JASDriver::sSubFrameCounter);
}
#pragma pop
/* 8039B2F0-8039B338 027950 0048+00 5/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
-4
View File
@@ -41,10 +41,6 @@ struct JASGenericMemPool {
/* 80290948 */ void alloc(u32);
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
};
struct JASDsp {
struct TChannel {};
};
-2
View File
@@ -67,8 +67,6 @@ struct JASDsp {
struct JASDriver {
/* 8029C9E8 */ void getDacRate();
/* 8029E150 */ void getChannelLevel_dsp();
/* 8029E180 */ void getOutputMode();
};
struct JASDSPChannel {
+12 -23
View File
@@ -17,12 +17,11 @@ struct JASDsp {
};
struct JASDriver {
/* 8029CCD4 */ void getSubFrameCounter();
/* 8029E130 */ void setDSPLevel(f32);
/* 8029E150 */ void getChannelLevel_dsp();
/* 8029E150 */ u16 getChannelLevel_dsp();
/* 8029E158 */ void getDSPLevel();
/* 8029E178 */ void setOutputMode(u32);
/* 8029E180 */ void getOutputMode();
/* 8029E180 */ u32 getOutputMode();
/* 8029E188 */ void waitSubFrame();
/* 8029E1C4 */ void rejectCallback(s32 (*)(void*), void*);
/* 8029E240 */ void registerDspSyncCallback(s32 (*)(void*), void*);
@@ -53,10 +52,10 @@ struct JASCallbackMgr {
//
extern "C" void setDSPLevel__9JASDriverFf();
extern "C" void getChannelLevel_dsp__9JASDriverFv();
extern "C" u16 getChannelLevel_dsp__9JASDriverFv();
extern "C" void getDSPLevel__9JASDriverFv();
extern "C" void setOutputMode__9JASDriverFUl();
extern "C" void getOutputMode__9JASDriverFv();
extern "C" u32 getOutputMode__9JASDriverFv();
extern "C" void waitSubFrame__9JASDriverFv();
extern "C" void rejectCallback__9JASDriverFPFPv_lPv();
extern "C" void registerDspSyncCallback__9JASDriverFPFPv_lPv();
@@ -102,23 +101,18 @@ asm void JASDriver::setDSPLevel(f32 param_0) {
#pragma pop
/* ############################################################################################## */
/* 804507C0-804507C4 000240 0002+02 1/1 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */
/* 804507C0-804507C4 000240 0002+02 1/0 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */
SECTION_SDATA u16 JASDriver::MAX_MIXERLEVEL[1 + 1 /* padding */] = {
0x2EE0,
/* padding */
0x0000,
};
/* 8029E150-8029E158 298A90 0008+00 0/0 2/2 0/0 .text getChannelLevel_dsp__9JASDriverFv
/* 8029E150-8029E158 -00001 0008+00 0/0 0/0 0/0 .text getChannelLevel_dsp__9JASDriverFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::getChannelLevel_dsp() {
nofralloc
#include "asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s"
u16 JASDriver::getChannelLevel_dsp() {
return *(u16*)(&JASDriver::MAX_MIXERLEVEL);
}
#pragma pop
/* 8029E158-8029E178 298A98 0020+00 0/0 3/3 0/0 .text getDSPLevel__9JASDriverFv */
#pragma push
@@ -131,7 +125,7 @@ asm void JASDriver::getDSPLevel() {
#pragma pop
/* ############################################################################################## */
/* 804507C4-804507C8 000244 0004+00 2/2 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver
/* 804507C4-804507C8 000244 0004+00 2/1 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver
*/
SECTION_SDATA u32 JASDriver::JAS_SYSTEM_OUTPUT_MODE = 0x00000001;
@@ -145,15 +139,10 @@ asm void JASDriver::setOutputMode(u32 param_0) {
}
#pragma pop
/* 8029E180-8029E188 298AC0 0008+00 0/0 4/4 1/1 .text getOutputMode__9JASDriverFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDriver::getOutputMode() {
nofralloc
#include "asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s"
/* 8029E180-8029E188 -00001 0008+00 0/0 0/0 0/0 .text getOutputMode__9JASDriverFv */
u32 JASDriver::getOutputMode() {
return *(u32*)(&JASDriver::JAS_SYSTEM_OUTPUT_MODE);
}
#pragma pop
/* 8029E188-8029E1C4 298AC8 003C+00 0/0 1/1 0/0 .text waitSubFrame__9JASDriverFv */
#pragma push
+6 -11
View File
@@ -21,7 +21,7 @@ struct JASTaskThread {
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
/* 8028FEFC */ u32 getThreadPointer();
/* 8028FF04 */ void createThread(s32, int, u32);
static u8 sThread[4 + 4 /* padding */];
@@ -31,7 +31,7 @@ struct JASDvd {
// Forward References:
//
extern "C" void getThreadPointer__6JASDvdFv();
extern "C" u32 getThreadPointer__6JASDvdFv();
extern "C" void createThread__6JASDvdFliUl();
extern "C" u8 sThread__6JASDvd[4 + 4 /* padding */];
@@ -53,18 +53,13 @@ extern "C" u8 sCurrentHeap__7JKRHeap[4];
//
/* ############################################################################################## */
/* 80451208-80451210 000708 0004+04 2/2 0/0 0/0 .sbss sThread__6JASDvd */
/* 80451208-80451210 000708 0004+04 2/1 0/0 0/0 .sbss sThread__6JASDvd */
u8 JASDvd::sThread[4 + 4 /* padding */];
/* 8028FEFC-8028FF04 28A83C 0008+00 0/0 6/6 0/0 .text getThreadPointer__6JASDvdFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASDvd::getThreadPointer() {
nofralloc
#include "asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s"
/* 8028FEFC-8028FF04 -00001 0008+00 0/0 0/0 0/0 .text getThreadPointer__6JASDvdFv */
u32 JASDvd::getThreadPointer() {
return *(u32*)(&JASDvd::sThread);
}
#pragma pop
/* 8028FF04-8028FFA8 28A844 00A4+00 0/0 1/1 0/0 .text createThread__6JASDvdFliUl */
#pragma push
+12 -22
View File
@@ -35,8 +35,8 @@ struct JKRExpHeap {
struct JASKernel {
/* 802909B8 */ void setupRootHeap(JKRSolidHeap*, u32);
/* 80290AC0 */ void getSystemHeap();
/* 80290AC8 */ void getCommandHeap();
/* 80290AC0 */ u32 getSystemHeap();
/* 80290AC8 */ u32 getCommandHeap();
/* 80290AD0 */ void setupAramHeap(u32, u32);
/* 80290B08 */ void getAramHeap();
@@ -90,8 +90,8 @@ extern "C" void newMemPool__17JASGenericMemPoolFUli();
extern "C" void alloc__17JASGenericMemPoolFUl();
extern "C" void free__17JASGenericMemPoolFPvUl();
extern "C" void setupRootHeap__9JASKernelFP12JKRSolidHeapUl();
extern "C" void getSystemHeap__9JASKernelFv();
extern "C" void getCommandHeap__9JASKernelFv();
extern "C" u32 getSystemHeap__9JASKernelFv();
extern "C" u32 getCommandHeap__9JASKernelFv();
extern "C" void setupAramHeap__9JASKernelFUlUl();
extern "C" void getAramHeap__9JASKernelFv();
extern "C" void __sinit_JASHeapCtrl_cpp();
@@ -287,10 +287,10 @@ asm void JASGenericMemPool::free(void* param_0, u32 param_1) {
/* 80451214-80451218 000714 0004+00 1/1 0/0 0/0 .sbss sAramBase__9JASKernel */
u8 JASKernel::sAramBase[4];
/* 80451218-8045121C 000718 0004+00 2/2 0/0 0/0 .sbss sSystemHeap__9JASKernel */
/* 80451218-8045121C 000718 0004+00 2/1 0/0 0/0 .sbss sSystemHeap__9JASKernel */
u8 JASKernel::sSystemHeap[4];
/* 8045121C-80451220 00071C 0004+00 2/2 0/0 0/0 .sbss sCommandHeap__9JASKernel */
/* 8045121C-80451220 00071C 0004+00 2/1 0/0 0/0 .sbss sCommandHeap__9JASKernel */
u8 JASKernel::sCommandHeap[4];
/* 802909B8-80290AC0 28B2F8 0108+00 0/0 1/1 0/0 .text setupRootHeap__9JASKernelFP12JKRSolidHeapUl
@@ -304,25 +304,15 @@ asm void JASKernel::setupRootHeap(JKRSolidHeap* param_0, u32 param_1) {
}
#pragma pop
/* 80290AC0-80290AC8 28B400 0008+00 1/1 3/3 0/0 .text getSystemHeap__9JASKernelFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASKernel::getSystemHeap() {
nofralloc
#include "asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s"
/* 80290AC0-80290AC8 -00001 0008+00 0/0 0/0 0/0 .text getSystemHeap__9JASKernelFv */
u32 JASKernel::getSystemHeap() {
return *(u32*)(&JASKernel::sSystemHeap);
}
#pragma pop
/* 80290AC8-80290AD0 28B408 0008+00 0/0 6/6 0/0 .text getCommandHeap__9JASKernelFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JASKernel::getCommandHeap() {
nofralloc
#include "asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s"
/* 80290AC8-80290AD0 -00001 0008+00 0/0 0/0 0/0 .text getCommandHeap__9JASKernelFv */
u32 JASKernel::getCommandHeap() {
return *(u32*)(&JASKernel::sCommandHeap);
}
#pragma pop
/* ############################################################################################## */
/* 804315D0-804315DC 05E2F0 000C+00 1/1 0/0 0/0 .bss @313 */
-4
View File
@@ -28,10 +28,6 @@ struct JASResArcLoader {
/* 80290D18 */ void loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
};
//
// Forward References:
//
-5
View File
@@ -31,11 +31,6 @@ struct JASTaskThread {
/* 8028FE88 */ void pause(bool);
};
struct JASKernel {
/* 80290AC0 */ void getSystemHeap();
/* 80290AC8 */ void getCommandHeap();
};
struct JASCalc {
/* 8028F354 */ void bcopy(void const*, void*, u32);
};
+2 -3
View File
@@ -32,6 +32,8 @@ struct JASTrackPort {
/* 802935E8 */ void writeExport(u32, u16);
};
struct JASSoundParams {};
struct JASOscillator {
struct Point {};
@@ -46,8 +48,6 @@ struct JASChannel {
/* 8029BBFC */ void free();
};
struct JASSoundParams {};
struct JASDsp {
struct TChannel {
/* 8029E00C */ void setFilterMode(u16);
@@ -175,7 +175,6 @@ struct JASGenericMemPool {
struct JASDriver {
/* 8029C9E8 */ void getDacRate();
/* 8029C9F0 */ void getSubFrames();
/* 8029E274 */ void registerSubFrameCallback(s32 (*)(void*), void*);
};
@@ -70,14 +70,9 @@ struct JASTaskThread {
};
struct JASKernel {
/* 80290AC0 */ void getSystemHeap();
/* 80290B08 */ void getAramHeap();
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
};
//
// Forward References:
//
-1
View File
@@ -88,7 +88,6 @@ struct JASGenericMemPool {
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
/* 8028FF04 */ void createThread(s32, int, u32);
};
+2 -2
View File
@@ -84,12 +84,12 @@ struct JAUSeqCollection {
/* 802A66AC */ void init(void const*);
};
struct JAISeqData {};
struct JAISoundID {};
struct JAISeqDataUser {};
struct JAISeqData {};
struct JAUSectionHeap {
struct TSectionHeapData {
/* 802A5DF4 */ TSectionHeapData();
+2 -2
View File
@@ -11,12 +11,12 @@
// Types:
//
struct JAISeqData {};
struct JAISoundID {};
struct JAISeqDataUser {};
struct JAISeqData {};
struct JAUSeqDataMgr_SeqCollection {
/* 802A677C */ JAUSeqDataMgr_SeqCollection();
/* 802A67D0 */ void setSeqDataUser(JAISeqDataUser*);
+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 JAISeqDataUser {};
struct JAISeqData {};
struct JAISeqDataUser {};
struct JAUDynamicSeqDataBlocks {
/* 802A6A58 */ JAUDynamicSeqDataBlocks();
/* 802A6AA0 */ void setSeqDataArchive(JKRArchive*);