mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Audio code converted to uintptr_t

This commit is contained in:
Kenix 2022-05-16 20:16:56 -04:00
parent e6c959e500
commit 7a4da43d7b
7 changed files with 86 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/include/functions.h
View File

@ -1909,7 +1909,7 @@ void AudioHeap_AllocPoolInit(AudioAllocPool* pool, void* mem, size_t size);
void AudioHeap_PersistentCacheClear(AudioPersistentCache* persistent); void AudioHeap_PersistentCacheClear(AudioPersistentCache* persistent);
void AudioHeap_TemporaryCacheClear(AudioTemporaryCache* temporary); void AudioHeap_TemporaryCacheClear(AudioTemporaryCache* temporary);
void AudioHeap_PopCache(s32 tableType); void AudioHeap_PopCache(s32 tableType);
void AudioHeap_InitMainPools(ptrdiff_t sizeForAudioInitPool); void AudioHeap_InitMainPools(size_t sizeForAudioInitPool);
void* AudioHeap_AllocCached(s32 tableType, ptrdiff_t size, s32 cache, s32 id); void* AudioHeap_AllocCached(s32 tableType, ptrdiff_t size, s32 cache, s32 id);
void* AudioHeap_SearchCaches(s32 tableType, s32 arg1, s32 id); void* AudioHeap_SearchCaches(s32 tableType, s32 arg1, s32 id);
void* AudioHeap_SearchRegularCaches(s32 tableType, s32 cache, s32 id); void* AudioHeap_SearchRegularCaches(s32 tableType, s32 cache, s32 id);
@ -1921,7 +1921,7 @@ void* AudioHeap_AllocPermanent(s32 tableType, s32 id, size_t size);
void* AudioHeap_AllocSampleCache(size_t size, s32 fontId, void* sampleAddr, s8 medium, s32 cache); void* AudioHeap_AllocSampleCache(size_t size, s32 fontId, void* sampleAddr, s8 medium, s32 cache);
void AudioHeap_ApplySampleBankCache(s32 sampleBankId); void AudioHeap_ApplySampleBankCache(s32 sampleBankId);
void AudioLoad_DecreaseSampleDmaTtls(void); void AudioLoad_DecreaseSampleDmaTtls(void);
void* AudioLoad_DmaSampleData(u32 devAddr, size_t size, s32 arg2, u8* dmaIndexRef, s32 medium); uintptr_t AudioLoad_DmaSampleData(uintptr_t devAddr, size_t size, s32 arg2, u8* dmaIndexRef, s32 medium);
void AudioLoad_InitSampleDmaBuffers(s32 arg0); void AudioLoad_InitSampleDmaBuffers(s32 arg0);
s32 AudioLoad_IsFontLoadComplete(s32 fontId); s32 AudioLoad_IsFontLoadComplete(s32 fontId);
s32 AudioLoad_IsSeqLoadComplete(s32 seqId); s32 AudioLoad_IsSeqLoadComplete(s32 seqId);
@ -1938,7 +1938,7 @@ s32 AudioLoad_SyncInitSeqPlayer(s32 playerIdx, s32 seqId, s32 arg2);
s32 AudioLoad_SyncInitSeqPlayerSkipTicks(s32 playerIdx, s32 seqId, s32 arg2); s32 AudioLoad_SyncInitSeqPlayerSkipTicks(s32 playerIdx, s32 seqId, s32 arg2);
void AudioLoad_ProcessLoads(s32 resetStatus); void AudioLoad_ProcessLoads(s32 resetStatus);
void AudioLoad_SetDmaHandler(DmaHandler callback); void AudioLoad_SetDmaHandler(DmaHandler callback);
void AudioLoad_Init(void* heap, u32 heapSize); void AudioLoad_Init(void* heap, size_t heapSize);
void AudioLoad_InitSlowLoads(void); void AudioLoad_InitSlowLoads(void);
s32 AudioLoad_SlowLoadSample(s32 arg0, s32 arg1, s8* arg2); s32 AudioLoad_SlowLoadSample(s32 arg0, s32 arg1, s8* arg2);
s32 AudioLoad_SlowLoadSeq(s32 playerIdx, u8* ramAddr, s8* arg2); s32 AudioLoad_SlowLoadSeq(s32 playerIdx, u8* ramAddr, s8* arg2);

20
soh/include/z64audio.h
View File

@ -107,8 +107,8 @@ typedef struct {
} AdsrEnvelope; // size = 0x4 } AdsrEnvelope; // size = 0x4
typedef struct { typedef struct {
/* 0x00 */ u32 start; /* 0x00 */ uintptr_t start;
/* 0x04 */ u32 end; /* 0x04 */ uintptr_t end;
/* 0x08 */ u32 count; /* 0x08 */ u32 count;
/* 0x0C */ char unk_0C[0x4]; /* 0x0C */ char unk_0C[0x4];
/* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned /* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned
@ -712,10 +712,10 @@ typedef struct {
/* 0x01 */ s8 delay; /* 0x01 */ s8 delay;
/* 0x02 */ s8 medium; /* 0x02 */ s8 medium;
/* 0x04 */ u8* ramAddr; /* 0x04 */ u8* ramAddr;
/* 0x08 */ u32 curDevAddr; /* 0x08 */ u8* curDevAddr;
/* 0x0C */ u8* curRamAddr; /* 0x0C */ u8* curRamAddr;
/* 0x10 */ u32 bytesRemaining; /* 0x10 */ size_t bytesRemaining;
/* 0x14 */ u32 chunkSize; /* 0x14 */ size_t chunkSize;
/* 0x18 */ s32 unkMediumParam; /* 0x18 */ s32 unkMediumParam;
/* 0x1C */ u32 retMsg; /* 0x1C */ u32 retMsg;
/* 0x20 */ OSMesgQueue* retQueue; /* 0x20 */ OSMesgQueue* retQueue;
@ -729,7 +729,7 @@ typedef struct {
/* 0x01 */ u8 seqOrFontId; /* 0x01 */ u8 seqOrFontId;
/* 0x02 */ u16 instId; /* 0x02 */ u16 instId;
/* 0x04 */ s32 unkMediumParam; /* 0x04 */ s32 unkMediumParam;
/* 0x08 */ s32 curDevAddr; /* 0x08 */ u8* curDevAddr;
/* 0x0C */ u8* curRamAddr; /* 0x0C */ u8* curRamAddr;
/* 0x10 */ u8* ramAddr; /* 0x10 */ u8* ramAddr;
/* 0x14 */ s32 status; /* 0x14 */ s32 status;
@ -878,7 +878,7 @@ typedef struct {
/* 0x351C */ s32 audioResetFadeOutFramesLeft; /* 0x351C */ s32 audioResetFadeOutFramesLeft;
/* 0x3520 */ f32* unk_3520; /* 0x3520 */ f32* unk_3520;
/* 0x3524 */ u8* audioHeap; /* 0x3524 */ u8* audioHeap;
/* 0x3528 */ u32 audioHeapSize; /* 0x3528 */ size_t audioHeapSize;
/* 0x352C */ Note* notes; /* 0x352C */ Note* notes;
/* 0x3530 */ SequencePlayer seqPlayers[4]; /* 0x3530 */ SequencePlayer seqPlayers[4];
/* 0x3AB0 */ SequenceLayer sequenceLayers[64]; /* 0x3AB0 */ SequenceLayer sequenceLayers[64];
@ -916,9 +916,9 @@ typedef struct {
} NoteSubAttributes; // size = 0x18 } NoteSubAttributes; // size = 0x18
typedef struct { typedef struct {
/* 0x00 */ u32 heapSize; /* 0x00 */ size_t heapSize;
/* 0x04 */ u32 initPoolSize; /* 0x04 */ size_t initPoolSize;
/* 0x08 */ u32 permanentPoolSize; /* 0x08 */ size_t permanentPoolSize;
} AudioContextInitSizes; // size = 0xC } AudioContextInitSizes; // size = 0xC
typedef struct { typedef struct {

12
soh/src/code/audio_heap.c
View File

@ -249,7 +249,7 @@ void AudioHeap_PopCache(s32 tableType) {
persistent->numEntries--; persistent->numEntries--;
} }
void AudioHeap_InitMainPools(ptrdiff_t initPoolSize) { void AudioHeap_InitMainPools(size_t initPoolSize) {
AudioHeap_AllocPoolInit(&gAudioContext.audioInitPool, gAudioContext.audioHeap, initPoolSize); AudioHeap_AllocPoolInit(&gAudioContext.audioInitPool, gAudioContext.audioHeap, initPoolSize);
AudioHeap_AllocPoolInit(&gAudioContext.audioSessionPool, gAudioContext.audioHeap + initPoolSize, AudioHeap_AllocPoolInit(&gAudioContext.audioSessionPool, gAudioContext.audioHeap + initPoolSize,
gAudioContext.audioHeapSize - initPoolSize); gAudioContext.audioHeapSize - initPoolSize);
@ -1266,18 +1266,18 @@ void AudioHeap_DiscardSampleCaches(void) {
} }
typedef struct { typedef struct {
u32 oldAddr; uintptr_t oldAddr;
u32 newAddr; uintptr_t newAddr;
size_t size; size_t size;
u8 newMedium; u8 newMedium;
} StorageChange; } StorageChange;
void AudioHeap_ChangeStorage(StorageChange* change, SoundFontSample* sample) { void AudioHeap_ChangeStorage(StorageChange* change, SoundFontSample* sample) {
if (sample != NULL) { if (sample != NULL) {
u32 start = change->oldAddr; uintptr_t start = change->oldAddr;
u32 end = change->oldAddr + change->size; uintptr_t end = change->oldAddr + change->size;
if (start <= (u32)sample->sampleAddr && (u32)sample->sampleAddr < end) { if (start <= sample->sampleAddr && sample->sampleAddr < end) {
sample->sampleAddr = sample->sampleAddr - start + change->newAddr; sample->sampleAddr = sample->sampleAddr - start + change->newAddr;
sample->medium = change->newMedium; sample->medium = change->newMedium;
} }

114
soh/src/code/audio_load.c
View File

@ -20,8 +20,8 @@ typedef enum {
typedef struct { typedef struct {
/* 0x00 */ s32 sampleBankId1; /* 0x00 */ s32 sampleBankId1;
/* 0x04 */ s32 sampleBankId2; /* 0x04 */ s32 sampleBankId2;
/* 0x08 */ s32 baseAddr1; /* 0x08 */ intptr_t baseAddr1;
/* 0x0C */ s32 baseAddr2; /* 0x0C */ intptr_t baseAddr2;
/* 0x10 */ u32 medium1; /* 0x10 */ u32 medium1;
/* 0x14 */ u32 medium2; /* 0x14 */ u32 medium2;
} RelocInfo; // size = 0x18 } RelocInfo; // size = 0x18
@ -39,27 +39,28 @@ void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus);
void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo, s32 temporary); void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo, s32 temporary);
void AudioLoad_RelocateSample(SoundFontSound* sound, SoundFontData* mem, RelocInfo* relocInfo); void AudioLoad_RelocateSample(SoundFontSound* sound, SoundFontData* mem, RelocInfo* relocInfo);
void AudioLoad_DiscardFont(s32 fontId); void AudioLoad_DiscardFont(s32 fontId);
u32 AudioLoad_TrySyncLoadSampleBank(u32 sampleBankId, u32* outMedium, s32 noLoad); uintptr_t AudioLoad_TrySyncLoadSampleBank(u32 sampleBankId, u32* outMedium, s32 noLoad);
void* AudioLoad_SyncLoad(u32 tableType, u32 tableId, s32* didAllocate); uintptr_t AudioLoad_SyncLoad(u32 tableType, u32 tableId, s32* didAllocate);
u32 AudioLoad_GetRealTableIndex(s32 tableType, u32 tableId); uintptr_t AudioLoad_GetRealTableIndex(s32 tableType, u32 tableId);
void* AudioLoad_SearchCaches(s32 tableType, s32 id); void* AudioLoad_SearchCaches(s32 tableType, s32 id);
AudioTable* AudioLoad_GetLoadTable(s32 tableType); AudioTable* AudioLoad_GetLoadTable(s32 tableType);
void AudioLoad_SyncDma(u32 devAddr, u8* addr, size_t size, s32 medium); void AudioLoad_SyncDma(uintptr_t devAddr, u8* addr, size_t size, s32 medium);
void AudioLoad_SyncDmaUnkMedium(u32 devAddr, u8* addr, size_t size, s32 unkMediumParam); void AudioLoad_SyncDmaUnkMedium(uintptr_t devAddr, u8* addr, size_t size, s32 unkMediumParam);
s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, size_t size, s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, uintptr_t devAddr, uintptr_t ramAddr, size_t size,
OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType); OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType);
void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, OSMesgQueue* retQueue); void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, OSMesgQueue* retQueue);
AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, u32 devAddr, void* ramAddr, ptrdiff_t size, s32 medium, AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, uintptr_t devAddr, uintptr_t ramAddr,
ptrdiff_t size, s32 medium,
s32 nChunks, OSMesgQueue* retQueue, s32 retMsg); s32 nChunks, OSMesgQueue* retQueue, s32 retMsg);
AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, void* ramAddr, size_t size, s32 medium, s32 nChunks, AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, uintptr_t ramAddr, size_t size, s32 medium, s32 nChunks,
OSMesgQueue* retQueue, s32 retMsg); OSMesgQueue* retQueue, s32 retMsg);
void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, size_t size); void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, size_t size);
void AudioLoad_AsyncDmaUnkMedium(u32 devAddr, void* ramAddr, size_t size, s16 arg3); void AudioLoad_AsyncDmaUnkMedium(uintptr_t devAddr, uintptr_t ramAddr, size_t size, s16 arg3);
u8* AudioLoad_SyncLoadSeq(s32 seqId); u8* AudioLoad_SyncLoadSeq(s32 seqId);
s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus); s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus);
void AudioLoad_DmaSlowCopy(AudioSlowLoad* slowLoad, ptrdiff_t size); void AudioLoad_DmaSlowCopy(AudioSlowLoad* slowLoad, size_t size);
void AudioLoad_ProcessSlowLoads(s32 resetStatus); void AudioLoad_ProcessSlowLoads(s32 resetStatus);
void AudioLoad_DmaSlowCopyUnkMedium(s32 devAddr, u8* ramAddr, ptrdiff_t size, s32 arg3); void AudioLoad_DmaSlowCopyUnkMedium(uintptr_t devAddr, uintptr_t ramAddr, size_t size, s32 arg3);
OSMesgQueue sScriptLoadQueue; OSMesgQueue sScriptLoadQueue;
OSMesg sScriptLoadMesgBuf[0x10]; OSMesg sScriptLoadMesgBuf[0x10];
@ -106,11 +107,11 @@ void AudioLoad_DecreaseSampleDmaTtls(void) {
gAudioContext.unused2628 = 0; gAudioContext.unused2628 = 0;
} }
void* AudioLoad_DmaSampleData(u32 devAddr, size_t size, s32 arg2, u8* dmaIndexRef, s32 medium) { uintptr_t AudioLoad_DmaSampleData(uintptr_t devAddr, size_t size, s32 arg2, u8* dmaIndexRef, s32 medium) {
s32 pad1; s32 pad1;
SampleDma* dma; SampleDma* dma;
s32 hasDma = false; s32 hasDma = false;
u32 dmaDevAddr; uintptr_t dmaDevAddr;
u32 pad2; u32 pad2;
u32 dmaIndex; u32 dmaIndex;
u32 transfer; u32 transfer;
@ -525,6 +526,8 @@ s32 AudioLoad_SyncInitSeqPlayer(s32 playerIdx, s32 seqId, s32 arg2) {
// call matches but is UB because it too is missing a return, and using the // call matches but is UB because it too is missing a return, and using the
// result of a non-void function that has failed to return a value is UB. // result of a non-void function that has failed to return a value is UB.
// The callers of this function do not use the return value, so it's fine. // The callers of this function do not use the return value, so it's fine.
return 1;
} }
s32 AudioLoad_SyncInitSeqPlayerSkipTicks(s32 playerIdx, s32 seqId, s32 skipTicks) { s32 AudioLoad_SyncInitSeqPlayerSkipTicks(s32 playerIdx, s32 seqId, s32 skipTicks) {
@ -535,6 +538,8 @@ s32 AudioLoad_SyncInitSeqPlayerSkipTicks(s32 playerIdx, s32 seqId, s32 skipTicks
gAudioContext.seqPlayers[playerIdx].skipTicks = skipTicks; gAudioContext.seqPlayers[playerIdx].skipTicks = skipTicks;
AudioLoad_SyncInitSeqPlayerInternal(playerIdx, seqId, 0); AudioLoad_SyncInitSeqPlayerInternal(playerIdx, seqId, 0);
// Missing return, see above. // Missing return, see above.
return 1;
} }
s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) { s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
@ -590,12 +595,12 @@ u8* AudioLoad_SyncLoadSeq(s32 seqId) {
return AudioLoad_SyncLoad(SEQUENCE_TABLE, seqId, &didAllocate); return AudioLoad_SyncLoad(SEQUENCE_TABLE, seqId, &didAllocate);
} }
u32 AudioLoad_GetSampleBank(u32 sampleBankId, u32* outMedium) { uintptr_t AudioLoad_GetSampleBank(u32 sampleBankId, u32* outMedium) {
return AudioLoad_TrySyncLoadSampleBank(sampleBankId, outMedium, true); return AudioLoad_TrySyncLoadSampleBank(sampleBankId, outMedium, true);
} }
u32 AudioLoad_TrySyncLoadSampleBank(u32 sampleBankId, u32* outMedium, s32 noLoad) { uintptr_t AudioLoad_TrySyncLoadSampleBank(u32 sampleBankId, u32* outMedium, s32 noLoad) {
void* ret; uintptr_t ret;
AudioTable* sampleBankTable; AudioTable* sampleBankTable;
u32 realTableId = AudioLoad_GetRealTableIndex(SAMPLE_TABLE, sampleBankId); u32 realTableId = AudioLoad_GetRealTableIndex(SAMPLE_TABLE, sampleBankId);
s8 cachePolicy; s8 cachePolicy;
@ -665,7 +670,7 @@ SoundFontData* AudioLoad_SyncLoadFont(u32 fontId) {
return ret; return ret;
} }
void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) { uintptr_t AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
size_t size; size_t size;
AudioTable* table; AudioTable* table;
s32 pad; s32 pad;
@ -673,7 +678,7 @@ void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
s32 status; s32 status;
uintptr_t romAddr; uintptr_t romAddr;
s32 cachePolicy; s32 cachePolicy;
void* ret; uintptr_t ret;
u32 realId; u32 realId;
realId = AudioLoad_GetRealTableIndex(tableType, id); realId = AudioLoad_GetRealTableIndex(tableType, id);
@ -743,7 +748,7 @@ void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
return ret; return ret;
} }
u32 AudioLoad_GetRealTableIndex(s32 tableType, u32 id) { uintptr_t AudioLoad_GetRealTableIndex(s32 tableType, u32 id) {
AudioTable* table = AudioLoad_GetLoadTable(tableType); AudioTable* table = AudioLoad_GetLoadTable(tableType);
if (table->entries[id].size == 0) { if (table->entries[id].size == 0) {
@ -790,8 +795,8 @@ AudioTable* AudioLoad_GetLoadTable(s32 tableType) {
} }
void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo) { void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo) {
u32 reloc; uintptr_t reloc;
u32 reloc2; uintptr_t reloc2;
Instrument* inst; Instrument* inst;
Drum* drum; Drum* drum;
SoundFontSound* sfx; SoundFontSound* sfx;
@ -801,7 +806,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
s32 numSfx = gAudioContext.soundFonts[fontId].numSfx; s32 numSfx = gAudioContext.soundFonts[fontId].numSfx;
void** ptrs = (void**)mem; void** ptrs = (void**)mem;
#define BASE_OFFSET(x) (void*)((u32)(x) + (u32)(mem)) #define BASE_OFFSET(x) (uintptr_t)((uintptr_t)(x) + (uintptr_t)(mem))
reloc2 = ptrs[0]; reloc2 = ptrs[0];
if (1) {} if (1) {}
@ -871,7 +876,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
gAudioContext.soundFonts[fontId].instruments = (Instrument**)(ptrs + 2); gAudioContext.soundFonts[fontId].instruments = (Instrument**)(ptrs + 2);
} }
void AudioLoad_SyncDma(u32 devAddr, u8* addr, size_t size, s32 medium) { void AudioLoad_SyncDma(uintptr_t devAddr, u8* addr, size_t size, s32 medium) {
OSMesgQueue* msgQueue = &gAudioContext.syncDmaQueue; OSMesgQueue* msgQueue = &gAudioContext.syncDmaQueue;
OSIoMesg* ioMesg = &gAudioContext.syncDmaIoMesg; OSIoMesg* ioMesg = &gAudioContext.syncDmaIoMesg;
size = ALIGN16(size); size = ALIGN16(size);
@ -895,10 +900,10 @@ void AudioLoad_SyncDma(u32 devAddr, u8* addr, size_t size, s32 medium) {
} }
} }
void AudioLoad_SyncDmaUnkMedium(u32 devAddr, u8* addr, size_t size, s32 unkMediumParam) { void AudioLoad_SyncDmaUnkMedium(uintptr_t devAddr, u8* addr, size_t size, s32 unkMediumParam) {
} }
s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, size_t size, s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, uintptr_t devAddr, uintptr_t ramAddr, size_t size,
OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType) { OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType) {
if (gAudioContext.resetTimer > 0x10) { if (gAudioContext.resetTimer > 0x10) {
return -1; return -1;
@ -924,7 +929,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData,
void* ret; void* ret;
s32 medium; s32 medium;
s8 cachePolicy; s8 cachePolicy;
u32 devAddr; uintptr_t devAddr;
s32 status; s32 status;
u32 temp_v0; u32 temp_v0;
u32 realId; u32 realId;
@ -1051,7 +1056,7 @@ s32 AudioLoad_AssertValidAddr(uintptr_t ramAddr, uintptr_t startAddr, size_t siz
} }
} }
#define BASE_ROM_OFFSET(x) (void*)((u32)(x) + (u32)(romAddr)) #define BASE_ROM_OFFSET(x) (uintptr_t)((uintptr_t)(x) + (uintptr_t)(romAddr))
void AudioLoad_InitSwapFontSampleHeaders(SoundFontSample* sample, uintptr_t romAddr) { void AudioLoad_InitSwapFontSampleHeaders(SoundFontSample* sample, uintptr_t romAddr) {
// OTRTODO: This will be removed when we actually extract the data. // OTRTODO: This will be removed when we actually extract the data.
@ -1128,7 +1133,7 @@ void AudioLoad_InitSwapFont(void) {
} }
// sfxs // sfxs
ptrs[1] = (void*)BOMSWAP32((u32)ptrs[1]); ptrs[1] = (void*)BOMSWAP32((uintptr_t)ptrs[1]);
if ((ptrs[1] != NULL) && (numSfxs != 0)) { if ((ptrs[1] != NULL) && (numSfxs != 0)) {
sfxList = (SoundFontSound*)BASE_ROM_OFFSET(ptrs[1]); sfxList = (SoundFontSound*)BASE_ROM_OFFSET(ptrs[1]);
@ -1178,7 +1183,7 @@ void AudioLoad_InitSwapFont(void) {
#undef BASE_ROM_OFFSET #undef BASE_ROM_OFFSET
void AudioLoad_Init(void* heap, u32 heapSize) { void AudioLoad_Init(void* heap, size_t heapSize) {
char pad[0x48]; char pad[0x48];
s32 numFonts; s32 numFonts;
void* temp_v0_3; void* temp_v0_3;
@ -1245,7 +1250,7 @@ void AudioLoad_Init(void* heap, u32 heapSize) {
gAudioContext.audioHeapSize = heapSize; gAudioContext.audioHeapSize = heapSize;
} }
for (i = 0; i < (s32)gAudioContext.audioHeapSize / 8; i++) { for (i = 0; i < gAudioContext.audioHeapSize / 8; i++) {
((u64*)gAudioContext.audioHeap)[i] = 0; ((u64*)gAudioContext.audioHeap)[i] = 0;
} }
@ -1284,7 +1289,7 @@ void AudioLoad_Init(void* heap, u32 heapSize) {
if (temp_v0_3 = AudioHeap_Alloc(&gAudioContext.audioInitPool, D_8014A6C4.permanentPoolSize), temp_v0_3 == NULL) { if (temp_v0_3 = AudioHeap_Alloc(&gAudioContext.audioInitPool, D_8014A6C4.permanentPoolSize), temp_v0_3 == NULL) {
// cast away const from D_8014A6C4 // cast away const from D_8014A6C4
*((u32*)&D_8014A6C4.permanentPoolSize) = 0; *((size_t*)&D_8014A6C4.permanentPoolSize) = 0;
} }
AudioHeap_AllocPoolInit(&gAudioContext.permanentPool, temp_v0_3, D_8014A6C4.permanentPoolSize); AudioHeap_AllocPoolInit(&gAudioContext.permanentPool, temp_v0_3, D_8014A6C4.permanentPoolSize);
@ -1439,14 +1444,14 @@ void AudioLoad_ProcessSlowLoads(s32 resetStatus) {
} }
} }
void AudioLoad_DmaSlowCopy(AudioSlowLoad* slowLoad, ptrdiff_t size) { void AudioLoad_DmaSlowCopy(AudioSlowLoad* slowLoad, size_t size) {
Audio_InvalDCache(slowLoad->curRamAddr, size); Audio_InvalDCache(slowLoad->curRamAddr, size);
osCreateMesgQueue(&slowLoad->msgqueue, &slowLoad->msg, 1); osCreateMesgQueue(&slowLoad->msgqueue, &slowLoad->msg, 1);
AudioLoad_Dma(&slowLoad->ioMesg, OS_MESG_PRI_NORMAL, 0, slowLoad->curDevAddr, slowLoad->curRamAddr, size, AudioLoad_Dma(&slowLoad->ioMesg, OS_MESG_PRI_NORMAL, 0, slowLoad->curDevAddr, slowLoad->curRamAddr, size,
&slowLoad->msgqueue, slowLoad->medium, "SLOWCOPY"); &slowLoad->msgqueue, slowLoad->medium, "SLOWCOPY");
} }
void AudioLoad_DmaSlowCopyUnkMedium(s32 devAddr, u8* ramAddr, ptrdiff_t size, s32 arg3) { void AudioLoad_DmaSlowCopyUnkMedium(uintptr_t devAddr, uintptr_t ramAddr, size_t size, s32 arg3) {
} }
s32 AudioLoad_SlowLoadSeq(s32 seqId, u8* ramAddr, s8* isDone) { s32 AudioLoad_SlowLoadSeq(s32 seqId, u8* ramAddr, s8* isDone) {
@ -1494,7 +1499,8 @@ void AudioLoad_InitAsyncLoads(void) {
} }
} }
AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, u32 devAddr, void* ramAddr, ptrdiff_t size, s32 medium, AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, u32 devAddr, uintptr_t ramAddr, size_t size,
s32 medium,
s32 nChunks, OSMesgQueue* retQueue, s32 retMsg) { s32 nChunks, OSMesgQueue* retQueue, s32 retMsg) {
AudioAsyncLoad* asyncLoad; AudioAsyncLoad* asyncLoad;
@ -1509,7 +1515,7 @@ AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, u32 devAdd
return asyncLoad; return asyncLoad;
} }
AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, void* ramAddr, size_t size, s32 medium, s32 nChunks, AudioAsyncLoad* AudioLoad_StartAsyncLoad(uintptr_t devAddr, uintptr_t ramAddr, size_t size, s32 medium, s32 nChunks,
OSMesgQueue* retQueue, s32 retMsg) { OSMesgQueue* retQueue, s32 retMsg) {
AudioAsyncLoad* asyncLoad; AudioAsyncLoad* asyncLoad;
s32 i; s32 i;
@ -1537,7 +1543,7 @@ AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, void* ramAddr, size_t size
} else if (nChunks == 1) { } else if (nChunks == 1) {
asyncLoad->chunkSize = size; asyncLoad->chunkSize = size;
} else { } else {
asyncLoad->chunkSize = ALIGN256((s32)size / nChunks); asyncLoad->chunkSize = ALIGN256(size / nChunks);
if (asyncLoad->chunkSize < 0x100) { if (asyncLoad->chunkSize < 0x100) {
asyncLoad->chunkSize = 0x100; asyncLoad->chunkSize = 0x100;
} }
@ -1682,10 +1688,10 @@ void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, size_t size) {
asyncLoad->medium, "BGCOPY"); asyncLoad->medium, "BGCOPY");
} }
void AudioLoad_AsyncDmaUnkMedium(u32 devAddr, void* ramAddr, size_t size, s16 arg3) { void AudioLoad_AsyncDmaUnkMedium(uintptr_t devAddr, uintptr_t ramAddr, size_t size, s16 arg3) {
} }
#define RELOC(v, base) (reloc = (void*)((u32)(v) + (u32)(base))) #define RELOC(v, base) (reloc = (uintptr_t)((uintptr_t)(v) + (uintptr_t)(base)))
void AudioLoad_RelocateSample(SoundFontSound* sound, SoundFontData* mem, RelocInfo* relocInfo) { void AudioLoad_RelocateSample(SoundFontSound* sound, SoundFontData* mem, RelocInfo* relocInfo) {
// OTRTODO: This is hack to detect whether or not the sample has been relocated. // OTRTODO: This is hack to detect whether or not the sample has been relocated.
@ -1736,7 +1742,7 @@ void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* mem, Rel
AudioPreloadReq* preload; AudioPreloadReq* preload;
AudioPreloadReq* topPreload; AudioPreloadReq* topPreload;
SoundFontSample* sample; SoundFontSample* sample;
ptrdiff_t size; size_t size;
s32 nChunks; s32 nChunks;
u8* addr; u8* addr;
s32 preloadInProgress; s32 preloadInProgress;
@ -1799,12 +1805,12 @@ void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* mem, Rel
switch (async) { switch (async) {
case false: case false:
if (sample->medium == MEDIUM_UNK) { if (sample->medium == MEDIUM_UNK) {
AudioLoad_SyncDmaUnkMedium((u32)sample->sampleAddr, addr, sample->size, AudioLoad_SyncDmaUnkMedium(sample->sampleAddr, addr, sample->size,
gAudioContext.sampleBankTable->unkMediumParam); gAudioContext.sampleBankTable->unkMediumParam);
sample->sampleAddr = addr; sample->sampleAddr = addr;
sample->medium = MEDIUM_RAM; sample->medium = MEDIUM_RAM;
} else { } else {
AudioLoad_SyncDma((u32)sample->sampleAddr, addr, sample->size, sample->medium); AudioLoad_SyncDma(sample->sampleAddr, addr, sample->size, sample->medium);
sample->sampleAddr = addr; sample->sampleAddr = addr;
sample->medium = MEDIUM_RAM; sample->medium = MEDIUM_RAM;
} }
@ -1817,7 +1823,7 @@ void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* mem, Rel
preload->ramAddr = addr; preload->ramAddr = addr;
preload->encodedInfo = (gAudioContext.preloadSampleStackTop << 24) | 0xFFFFFF; preload->encodedInfo = (gAudioContext.preloadSampleStackTop << 24) | 0xFFFFFF;
preload->isFree = false; preload->isFree = false;
preload->endAndMediumKey = (u32)sample->sampleAddr + sample->size + sample->medium; preload->endAndMediumKey = sample->sampleAddr + sample->size + sample->medium;
gAudioContext.preloadSampleStackTop++; gAudioContext.preloadSampleStackTop++;
break; break;
} }
@ -1828,7 +1834,7 @@ void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* mem, Rel
topPreload = &gAudioContext.preloadSampleStack[gAudioContext.preloadSampleStackTop - 1]; topPreload = &gAudioContext.preloadSampleStack[gAudioContext.preloadSampleStackTop - 1];
sample = topPreload->sample; sample = topPreload->sample;
nChunks = (sample->size >> 12) + 1; nChunks = (sample->size >> 12) + 1;
AudioLoad_StartAsyncLoad((u32)sample->sampleAddr, topPreload->ramAddr, sample->size, sample->medium, nChunks, AudioLoad_StartAsyncLoad(sample->sampleAddr, topPreload->ramAddr, sample->size, sample->medium, nChunks,
&gAudioContext.preloadSampleQueue, topPreload->encodedInfo); &gAudioContext.preloadSampleQueue, topPreload->encodedInfo);
} }
} }
@ -1837,7 +1843,7 @@ s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus) {
SoundFontSample* sample; SoundFontSample* sample;
AudioPreloadReq* preload; AudioPreloadReq* preload;
u32 preloadIndex; u32 preloadIndex;
u32 key; uintptr_t key;
u32 nChunks; u32 nChunks;
s32 pad; s32 pad;
@ -1858,7 +1864,7 @@ s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus) {
if (preload->isFree == false) { if (preload->isFree == false) {
sample = preload->sample; sample = preload->sample;
key = (u32)sample->sampleAddr + sample->size + sample->medium; key = sample->sampleAddr + sample->size + sample->medium;
if (key == preload->endAndMediumKey) { if (key == preload->endAndMediumKey) {
// Change storage for sample to the preloaded version. // Change storage for sample to the preloaded version.
sample->sampleAddr = preload->ramAddr; sample->sampleAddr = preload->ramAddr;
@ -1881,12 +1887,12 @@ s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus) {
sample = preload->sample; sample = preload->sample;
nChunks = (sample->size >> 12) + 1; nChunks = (sample->size >> 12) + 1;
key = (u32)sample->sampleAddr + sample->size + sample->medium; key = sample->sampleAddr + sample->size + sample->medium;
if (key != preload->endAndMediumKey) { if (key != preload->endAndMediumKey) {
preload->isFree = true; preload->isFree = true;
gAudioContext.preloadSampleStackTop--; gAudioContext.preloadSampleStackTop--;
} else { } else {
AudioLoad_StartAsyncLoad((u32)sample->sampleAddr, preload->ramAddr, sample->size, sample->medium, AudioLoad_StartAsyncLoad(sample->sampleAddr, preload->ramAddr, sample->size, sample->medium,
nChunks, &gAudioContext.preloadSampleQueue, preload->encodedInfo); nChunks, &gAudioContext.preloadSampleQueue, preload->encodedInfo);
break; break;
} }
@ -1964,7 +1970,7 @@ void AudioLoad_PreloadSamplesForFont(s32 fontId, s32 async, RelocInfo* relocInfo
AudioPreloadReq* preload; AudioPreloadReq* preload;
AudioPreloadReq* topPreload; AudioPreloadReq* topPreload;
u8* addr = NULL; u8* addr = NULL;
ptrdiff_t size; size_t size;
s32 i; s32 i;
SoundFontSample* sample; SoundFontSample* sample;
s32 preloadInProgress; s32 preloadInProgress;
@ -2056,12 +2062,12 @@ void AudioLoad_PreloadSamplesForFont(s32 fontId, s32 async, RelocInfo* relocInfo
switch (async) { switch (async) {
case false: case false:
if (sample->medium == MEDIUM_UNK) { if (sample->medium == MEDIUM_UNK) {
AudioLoad_SyncDmaUnkMedium((u32)sample->sampleAddr, addr, sample->size, AudioLoad_SyncDmaUnkMedium(sample->sampleAddr, addr, sample->size,
gAudioContext.sampleBankTable->unkMediumParam); gAudioContext.sampleBankTable->unkMediumParam);
sample->sampleAddr = addr; sample->sampleAddr = addr;
sample->medium = MEDIUM_RAM; sample->medium = MEDIUM_RAM;
} else { } else {
AudioLoad_SyncDma((u32)sample->sampleAddr, addr, sample->size, sample->medium); AudioLoad_SyncDma(sample->sampleAddr, addr, sample->size, sample->medium);
sample->sampleAddr = addr; sample->sampleAddr = addr;
sample->medium = MEDIUM_RAM; sample->medium = MEDIUM_RAM;
} }
@ -2073,7 +2079,7 @@ void AudioLoad_PreloadSamplesForFont(s32 fontId, s32 async, RelocInfo* relocInfo
preload->ramAddr = addr; preload->ramAddr = addr;
preload->encodedInfo = (gAudioContext.preloadSampleStackTop << 24) | 0xFFFFFF; preload->encodedInfo = (gAudioContext.preloadSampleStackTop << 24) | 0xFFFFFF;
preload->isFree = false; preload->isFree = false;
preload->endAndMediumKey = (u32)sample->sampleAddr + sample->size + sample->medium; preload->endAndMediumKey = sample->sampleAddr + sample->size + sample->medium;
gAudioContext.preloadSampleStackTop++; gAudioContext.preloadSampleStackTop++;
break; break;
} }
@ -2084,7 +2090,7 @@ void AudioLoad_PreloadSamplesForFont(s32 fontId, s32 async, RelocInfo* relocInfo
topPreload = &gAudioContext.preloadSampleStack[gAudioContext.preloadSampleStackTop - 1]; topPreload = &gAudioContext.preloadSampleStack[gAudioContext.preloadSampleStackTop - 1];
sample = topPreload->sample; sample = topPreload->sample;
nChunks = (sample->size >> 12) + 1; nChunks = (sample->size >> 12) + 1;
AudioLoad_StartAsyncLoad((u32)sample->sampleAddr, topPreload->ramAddr, sample->size, sample->medium, nChunks, AudioLoad_StartAsyncLoad(sample->sampleAddr, topPreload->ramAddr, sample->size, sample->medium, nChunks,
&gAudioContext.preloadSampleQueue, topPreload->encodedInfo); &gAudioContext.preloadSampleQueue, topPreload->encodedInfo);
} }
} }

10
soh/src/code/audio_synthesis.c
View File

@ -675,11 +675,11 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
s32 temp_v1_6; s32 temp_v1_6;
void* buf; void* buf;
s32 nSamplesToDecode; s32 nSamplesToDecode;
u32 sampleAddr; uintptr_t sampleAddr;
u32 samplesLenFixedPoint; u32 samplesLenFixedPoint;
s32 samplesLenAdjusted; s32 samplesLenAdjusted;
s32 nSamplesProcessed; s32 nSamplesProcessed;
s32 loopEndPos; uintptr_t loopEndPos;
s32 nSamplesToProcess; s32 nSamplesToProcess;
s32 phi_s4; s32 phi_s4;
s32 nFirstFrameSamplesToIgnore; s32 nFirstFrameSamplesToIgnore;
@ -687,15 +687,15 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
s32 frameSize; s32 frameSize;
s32 nFramesToDecode; s32 nFramesToDecode;
s32 skipInitialSamples; s32 skipInitialSamples;
s32 sampleDataStart; intptr_t sampleDataStart;
u8* sampleData; u8* sampleData;
s32 nParts; s32 nParts;
s32 curPart; s32 curPart;
s32 sampleDataStartPad; intptr_t sampleDataStartPad;
s32 side; s32 side;
s32 resampledTempLen; s32 resampledTempLen;
u16 noteSamplesDmemAddrBeforeResampling; u16 noteSamplesDmemAddrBeforeResampling;
s32 sampleDataOffset; intptr_t sampleDataOffset;
s32 thing; s32 thing;
s32 s5; s32 s5;
Note* note; Note* note;

1
soh/src/code/code_800E4FE0.c
View File

@ -39,7 +39,6 @@ extern u64 rspAspMainDataStart[];
extern u64 rspAspMainDataEnd[]; extern u64 rspAspMainDataEnd[];
void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples) { void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples) {
// OTRTODO: uintptr_t?
u32 sp4C; u32 sp4C;
gAudioContext.totalTaskCnt++; gAudioContext.totalTaskCnt++;

4
soh/src/code/main.c
View File

@ -6,7 +6,7 @@
s32 gScreenWidth = SCREEN_WIDTH; s32 gScreenWidth = SCREEN_WIDTH;
s32 gScreenHeight = SCREEN_HEIGHT; s32 gScreenHeight = SCREEN_HEIGHT;
u32 gSystemHeapSize = 0; size_t gSystemHeapSize = 0;
PreNmiBuff* gAppNmiBufferPtr; PreNmiBuff* gAppNmiBufferPtr;
SchedContext gSchedContext; SchedContext gSchedContext;
@ -53,7 +53,7 @@ void Main(void* arg) {
uintptr_t sysHeap; uintptr_t sysHeap;
uintptr_t fb; uintptr_t fb;
void* debugHeap; void* debugHeap;
s32 debugHeapSize; size_t debugHeapSize;
s16* msg; s16* msg;
osSyncPrintf("mainproc 実行開始\n"); // "Start running" osSyncPrintf("mainproc 実行開始\n"); // "Start running"