mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-09-08 02:26:34 -04:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
@@ -1,8 +1,3 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: JAUSectionHeap
|
||||
//
|
||||
|
||||
#include "JSystem/JSystem.h" // IWYU pragma: keep
|
||||
|
||||
#include "JSystem/JAudio2/JAUSectionHeap.h"
|
||||
@@ -75,7 +70,6 @@ namespace {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802A4EE8-802A4F68 29F828 0080+00 1/1 0/0 0/0 .text __ct__Q210JAUSection12TSectionDataFv */
|
||||
JAUSection::TSectionData::TSectionData() {
|
||||
resetRegisteredWaveBankTables();
|
||||
resetRegisteredBankTables();
|
||||
@@ -86,23 +80,18 @@ JAUSection::TSectionData::TSectionData() {
|
||||
field_0x9c = 0;
|
||||
}
|
||||
|
||||
/* 802A4F68-802A4FE4 29F8A8 007C+00 1/1 0/0 0/0 .text
|
||||
* resetRegisteredBankTables__Q210JAUSection12TSectionDataFv */
|
||||
void JAUSection::TSectionData::resetRegisteredBankTables() {
|
||||
for (u32 i = 0; i < 255; i++) {
|
||||
registeredBankTables.reset(i);
|
||||
}
|
||||
}
|
||||
|
||||
/* 802A4FE4-802A5060 29F924 007C+00 1/1 0/0 0/0 .text
|
||||
* resetRegisteredWaveBankTables__Q210JAUSection12TSectionDataFv */
|
||||
void JAUSection::TSectionData::resetRegisteredWaveBankTables() {
|
||||
for (u32 i = 0; i < 255; i++) {
|
||||
registeredWaveBankTables.reset(i);
|
||||
}
|
||||
}
|
||||
|
||||
/* 802A5060-802A50F8 29F9A0 0098+00 1/1 0/0 0/0 .text __ct__10JAUSectionFP14JAUSectionHeapUll */
|
||||
JAUSection::JAUSection(JAUSectionHeap* param_0, u32 param_1, s32 param_2)
|
||||
: JSULink<JAUSection>(this), field_0x28(param_1), sectionHeap_(param_0) {
|
||||
buildingBankTable_ = NULL;
|
||||
@@ -113,7 +102,6 @@ JAUSection::JAUSection(JAUSectionHeap* param_0, u32 param_1, s32 param_2)
|
||||
}
|
||||
}
|
||||
|
||||
/* 802A50F8-802A5160 29FA38 0068+00 0/0 1/1 0/0 .text finishBuild__10JAUSectionFv */
|
||||
void JAUSection::finishBuild() {
|
||||
JUT_ASSERT(143, isOpen());
|
||||
JUT_ASSERT(144, isBuilding());
|
||||
@@ -125,7 +113,6 @@ void JAUSection::finishBuild() {
|
||||
field_0x2c = 0;
|
||||
}
|
||||
|
||||
/* 802A5160-802A51E4 29FAA0 0084+00 2/0 0/0 0/0 .text dispose__10JAUSectionFv */
|
||||
void JAUSection::dispose() {
|
||||
JUT_ASSERT(267, ! data_.registeredBankTables.any());
|
||||
JUT_ASSERT(268, ! data_.registeredWaveBankTables.any());
|
||||
@@ -139,8 +126,6 @@ void JAUSection::dispose() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802A51E4-802A52A0 29FB24 00BC+00 0/0 1/1 0/0 .text newSoundTable__10JAUSectionFPCvUlb
|
||||
*/
|
||||
JAUSoundTable* JAUSection::newSoundTable(void const* bst, u32 param_1, bool param_2) {
|
||||
JUT_ASSERT(285, isOpen());
|
||||
JUT_ASSERT(286, isBuilding());
|
||||
@@ -163,7 +148,6 @@ JAUSoundTable* JAUSection::newSoundTable(void const* bst, u32 param_1, bool para
|
||||
return sectionHeap_->sectionHeapData_.soundTable;
|
||||
}
|
||||
|
||||
/* 802A52A0-802A535C 29FBE0 00BC+00 0/0 1/1 0/0 .text newSoundNameTable__10JAUSectionFPCvUlb */
|
||||
JAUSoundNameTable* JAUSection::newSoundNameTable(void const* bstn, u32 param_1, bool param_2) {
|
||||
JUT_ASSERT(315, isOpen());
|
||||
JUT_ASSERT(316, isBuilding());
|
||||
@@ -186,7 +170,6 @@ JAUSoundNameTable* JAUSection::newSoundNameTable(void const* bstn, u32 param_1,
|
||||
return sectionHeap_->sectionHeapData_.soundNameTable;
|
||||
}
|
||||
|
||||
/* 802A535C-802A5500 29FC9C 01A4+00 0/0 1/1 0/0 .text newStreamFileTable__10JAUSectionFPCvb */
|
||||
JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param_1) {
|
||||
JUT_ASSERT(345, asSectionHeap() == this);
|
||||
JUT_ASSERT(346, isOpen());
|
||||
@@ -212,7 +195,6 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param
|
||||
return sectionHeap_->sectionHeapData_.streamDataMgr_;
|
||||
}
|
||||
|
||||
/* 802A5500-802A5598 29FE40 0098+00 0/0 1/1 0/0 .text newSeSeqCollection__10JAUSectionFPCvUl */
|
||||
JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) {
|
||||
// JUT_ASSERT(398, asSectionHeap() == this);
|
||||
JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == NULL);
|
||||
@@ -231,8 +213,6 @@ JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) {
|
||||
return sectionHeap_->sectionHeapData_.seSeqDataMgr_;
|
||||
}
|
||||
|
||||
/* 802A5598-802A56C8 29FED8 0130+00 2/2 0/0 0/0 .text
|
||||
* newStaticSeqDataBlock___10JAUSectionF10JAISoundIDUl */
|
||||
u8* JAUSection::newStaticSeqDataBlock_(JAISoundID param_0, u32 size) {
|
||||
JUT_ASSERT(419, isOpen());
|
||||
JUT_ASSERT(420, isBuilding());
|
||||
@@ -263,8 +243,6 @@ u8* JAUSection::newStaticSeqDataBlock_(JAISoundID param_0, u32 size) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 802A56C8-802A5730 2A0008 0068+00 0/0 1/1 0/0 .text
|
||||
* newStaticSeqData__10JAUSectionF10JAISoundIDPCvUl */
|
||||
bool JAUSection::newStaticSeqData(JAISoundID param_0, void const* param_1, u32 param_2) {
|
||||
u8* r30 = newStaticSeqDataBlock_(param_0, param_2);
|
||||
if (r30) {
|
||||
@@ -274,8 +252,6 @@ bool JAUSection::newStaticSeqData(JAISoundID param_0, void const* param_1, u32 p
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 802A5730-802A57F0 2A0070 00C0+00 0/0 1/1 0/0 .text newStaticSeqData__10JAUSectionF10JAISoundID
|
||||
*/
|
||||
bool JAUSection::newStaticSeqData(JAISoundID param_0) {
|
||||
JKRArchive* seqArchive = data_.field_0x00.getSeqDataArchive();
|
||||
JUT_ASSERT(481, seqArchive);
|
||||
@@ -293,7 +269,6 @@ bool JAUSection::newStaticSeqData(JAISoundID param_0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 802A57F0-802A5854 2A0130 0064+00 3/3 0/0 0/0 .text newCopy__10JAUSectionFPCvUll */
|
||||
void* JAUSection::newCopy(void const* param_0, u32 param_1, s32 param_2) {
|
||||
JUT_ASSERT(516, isOpen());
|
||||
JUT_ASSERT(517, isBuilding());
|
||||
@@ -309,7 +284,6 @@ static bool dummy_string(int i) {
|
||||
return x.test(i);
|
||||
}
|
||||
|
||||
/* 802A5854-802A5948 2A0194 00F4+00 0/0 1/1 0/0 .text newWaveBank__10JAUSectionFUlPCv */
|
||||
JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) {
|
||||
JUT_ASSERT(528, isOpen());
|
||||
JUT_ASSERT(529, isBuilding());
|
||||
@@ -327,7 +301,6 @@ JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) {
|
||||
|
||||
}
|
||||
|
||||
/* 802A5948-802A5A50 2A0288 0108+00 0/0 1/1 0/0 .text loadWaveArc__10JAUSectionFUlUl */
|
||||
bool JAUSection::loadWaveArc(u32 param_0, u32 param_1) {
|
||||
if (data_.registeredWaveBankTables.test(param_0)) {
|
||||
JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_0);
|
||||
@@ -343,7 +316,6 @@ bool JAUSection::loadWaveArc(u32 param_0, u32 param_1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 802A5A50-802A5B84 2A0390 0134+00 0/0 1/1 0/0 .text newBank__10JAUSectionFPCvUl */
|
||||
JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
|
||||
JUT_ASSERT(647, isOpen());
|
||||
JUT_ASSERT(648, isBuilding());
|
||||
@@ -369,7 +341,6 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 802A5B84-802A5CAC 2A04C4 0128+00 0/0 1/1 0/0 .text newVoiceBank__10JAUSectionFUlUl */
|
||||
JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
|
||||
{
|
||||
JUT_ASSERT(685, isOpen());
|
||||
@@ -394,7 +365,6 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 802A5CAC-802A5D9C 2A05EC 00F0+00 0/0 1/1 0/0 .text beginNewBankTable__10JAUSectionFUlUl */
|
||||
bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) {
|
||||
JUT_ASSERT(714, isOpen());
|
||||
JUT_ASSERT(715, isBuilding());
|
||||
@@ -417,7 +387,6 @@ bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) {
|
||||
return bankTableLink;
|
||||
}
|
||||
|
||||
/* 802A5D9C-802A5DF4 2A06DC 0058+00 0/0 1/1 0/0 .text endNewBankTable__10JAUSectionFv */
|
||||
JAUBankTable* JAUSection::endNewBankTable() {
|
||||
JAUBankTable* r29 = NULL;
|
||||
if (buildingBankTable_) {
|
||||
@@ -428,8 +397,6 @@ JAUBankTable* JAUSection::endNewBankTable() {
|
||||
return r29;
|
||||
}
|
||||
|
||||
/* 802A5DF4-802A5E60 2A0734 006C+00 1/1 0/0 0/0 .text __ct__Q214JAUSectionHeap16TSectionHeapDataFv
|
||||
*/
|
||||
JAUSectionHeap::TSectionHeapData::TSectionHeapData() {
|
||||
seSeqDataMgr_ = NULL;
|
||||
streamDataMgr_ = NULL;
|
||||
@@ -438,8 +405,6 @@ JAUSectionHeap::TSectionHeapData::TSectionHeapData() {
|
||||
seqDataUser = NULL;
|
||||
}
|
||||
|
||||
/* 802A5E60-802A5EC0 2A07A0 0060+00 0/0 1/1 0/0 .text
|
||||
* setSeqDataArchive__14JAUSectionHeapFP10JKRArchive */
|
||||
void JAUSectionHeap::setSeqDataArchive(JKRArchive* param_0) {
|
||||
sectionHeapData_.seqDataBlocks.setSeqDataArchive(param_0);
|
||||
for (JSULink<JAUSection>* link = mSectionList.getFirst(); link; link = link->getNext()) {
|
||||
@@ -447,19 +412,14 @@ void JAUSectionHeap::setSeqDataArchive(JKRArchive* param_0) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802A5EC0-802A5EF8 2A0800 0038+00 0/0 1/1 0/0 .text
|
||||
* loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb */
|
||||
bool JAUSectionHeap::loadDynamicSeq(JAISoundID param_0, bool param_1) {
|
||||
return sectionHeapData_.seqDataBlocks.loadDynamicSeq(param_0, param_1, sectionHeapData_.seqDataUser);
|
||||
}
|
||||
|
||||
/* 802A5EF8-802A5F24 2A0838 002C+00 0/0 1/1 0/0 .text
|
||||
* releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv */
|
||||
u32 JAUSectionHeap::releaseIdleDynamicSeqDataBlock() {
|
||||
return sectionHeapData_.seqDataBlocks.releaseIdleDynamicSeqDataBlock(sectionHeapData_.seqDataUser);
|
||||
}
|
||||
|
||||
/* 802A5F24-802A5F9C 2A0864 0078+00 1/1 0/0 0/0 .text JAUNewSectionHeap__FP12JKRSolidHeapb */
|
||||
static JAUSectionHeap* JAUNewSectionHeap(JKRSolidHeap* heap, bool param_1) {
|
||||
JUT_ASSERT(809, JKRSolidHeap_isEmpty( heap ));
|
||||
TPushCurrentHeap push(heap);
|
||||
@@ -467,7 +427,6 @@ static JAUSectionHeap* JAUNewSectionHeap(JKRSolidHeap* heap, bool param_1) {
|
||||
return new JAUSectionHeap(heap, param_1, r29);
|
||||
}
|
||||
|
||||
/* 802A5F9C-802A5FE0 2A08DC 0044+00 0/0 1/1 0/0 .text JAUNewSectionHeap__Fb */
|
||||
JAUSectionHeap* JAUNewSectionHeap(bool param_0) {
|
||||
s32 freeSize = JASDram->getFreeSize();
|
||||
JKRSolidHeap* sectionHeap = JKRCreateSolidHeap(freeSize, JASDram, true);
|
||||
@@ -475,27 +434,21 @@ JAUSectionHeap* JAUNewSectionHeap(bool param_0) {
|
||||
return JAUNewSectionHeap(sectionHeap, param_0);
|
||||
}
|
||||
|
||||
/* 802A5FE0-802A6094 2A0920 00B4+00 1/1 0/0 0/0 .text __ct__14JAUSectionHeapFP12JKRSolidHeapbl */
|
||||
JAUSectionHeap::JAUSectionHeap(JKRSolidHeap* param_0, bool param_1, s32 param_2)
|
||||
: JAUSection(this, 0, param_2), JASGlobalInstance<JAUSectionHeap>(param_1), mHeap(param_0) {
|
||||
field_0xe4 = 0;
|
||||
mSectionList.append(this);
|
||||
}
|
||||
|
||||
/* 802A6094-802A60A0 2A09D4 000C+00 0/0 1/1 0/0 .text getOpenSection__14JAUSectionHeapFv
|
||||
*/
|
||||
JAUSection* JAUSectionHeap::getOpenSection() {
|
||||
return mSectionList.getLast()->getObject();
|
||||
}
|
||||
|
||||
/* 802A60A0-802A60AC 2A09E0 000C+00 2/1 0/0 0/0 .text
|
||||
* setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser */
|
||||
bool JAUSectionHeap::setSeqDataUser(JAISeqDataUser* param_0) {
|
||||
sectionHeapData_.seqDataUser = param_0;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802A60AC-802A61D0 2A09EC 0124+00 0/0 2/2 0/0 .text newDynamicSeqBlock__14JAUSectionHeapFUl */
|
||||
bool JAUSectionHeap::newDynamicSeqBlock(u32 size) {
|
||||
/* JUT_ASSERT(937, isOpen());
|
||||
JUT_ASSERT(938, isBuilding());
|
||||
@@ -523,8 +476,6 @@ bool JAUSectionHeap::newDynamicSeqBlock(u32 size) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 802A61D0-802A6270 2A0B10 00A0+00 2/1 0/0 0/0 .text
|
||||
* getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData */
|
||||
JAISeqDataMgr::SeqDataReturnValue JAUSectionHeap::getSeqData(JAISoundID param_0, JAISeqData* param_1) {
|
||||
for (JSULink<JAUSection> * link = mSectionList.getFirst(); link; link = link->getNext()) {
|
||||
s32 result = link->getObject()->data_.field_0x00.getSeqData(param_0, sectionHeapData_.seqDataUser, param_1, false);
|
||||
@@ -536,8 +487,6 @@ JAISeqDataMgr::SeqDataReturnValue JAUSectionHeap::getSeqData(JAISoundID param_0,
|
||||
return (SeqDataReturnValue)sectionHeapData_.seqDataBlocks.getSeqData(param_0, sectionHeapData_.seqDataUser, param_1, true);
|
||||
}
|
||||
|
||||
/* 802A6270-802A6278 2A0BB0 0008+00 2/1 0/0 0/0 .text releaseSeqData__14JAUSectionHeapFv
|
||||
*/
|
||||
int JAUSectionHeap::releaseSeqData() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user