mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-18 14:25:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

JSUOutputStream Matching for shield (#2825)

Browse Source 
* JSUOutputStream Matching for shield

* Fix nonmatching in JAUSectionHeap
This commit is contained in:
hatal175
2025-11-19 20:17:26 +02:00
committed by GitHub
parent b55f0c63c7
commit a8d792acf8
5 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JAudio2/JAUSectionHeap.cpp
+12 -11
View File
@@ -67,6 +67,14 @@ namespace {
};
}
namespace {
bool JKRSolidHeap_isEmpty(JKRSolidHeap* pHeap) {
u32 beforeSize = pHeap->getFreeSize();
pHeap->freeAll();
return pHeap->getFreeSize() - beforeSize == 0;
}
}
/* 802A4EE8-802A4F68 29F828 0080+00 1/1 0/0 0/0 .text __ct__Q210JAUSection12TSectionDataFv */
JAUSection::TSectionData::TSectionData() {
resetRegisteredWaveBankTables();
@@ -119,8 +127,8 @@ void JAUSection::finishBuild() {
/* 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()); */
JUT_ASSERT(267, ! data_.registeredBankTables.any());
JUT_ASSERT(268, ! data_.registeredWaveBankTables.any());
if (data_.mBstDst) {
sectionHeap_->sectionHeapData_.soundTable->~JAUSoundTable();
sectionHeap_->sectionHeapData_.soundTable = NULL;
@@ -362,7 +370,6 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
}
/* 802A5B84-802A5CAC 2A04C4 0128+00 0/0 1/1 0/0 .text newVoiceBank__10JAUSectionFUlUl */
// NONMATCHING regalloc
JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
{
JUT_ASSERT(685, isOpen());
@@ -371,7 +378,6 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
JUT_ASSERT(688, waveBank != NULL);
TPushCurrentHeap push(getHeap_());
JASBank* voiceBank = new JASVoiceBank();
JASVoiceBank* voiceBank2 = (JASVoiceBank*)voiceBank;
if (voiceBank) {
if (buildingBankTable_) {
JUT_ASSERT(696, buildingBankTable_->getBank( bank_no ) == 0);
@@ -381,8 +387,8 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
JASDefaultBankTable::getInstance()->registBank(bank_no, voiceBank);
data_.registeredBankTables.set(bank_no, true);
}
voiceBank2->assignWaveBank(waveBank);
return voiceBank2;
voiceBank->assignWaveBank(waveBank);
return (JASVoiceBank*)voiceBank;
}
}
return NULL;
@@ -453,11 +459,6 @@ void JAUSectionHeap::releaseIdleDynamicSeqDataBlock() {
sectionHeapData_.seqDataBlocks.releaseIdleDynamicSeqDataBlock(sectionHeapData_.seqDataUser);
}
namespace {
// TODO
bool JKRSolidHeap_isEmpty(JKRSolidHeap*) { return 1; }
}
/* 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 ));