From df800139af55a5bfda305ed805fca98e7b9b9600 Mon Sep 17 00:00:00 2001 From: zelda2774 Date: Tue, 24 Aug 2021 12:27:21 +0200 Subject: [PATCH] Move nop padding to ucode_disas --- .../code/{audio_synthesis => ucode_disas}/pad_800DACB0.s | 0 src/code/audio_synthesis.c | 3 --- src/code/ucode_disas.c | 5 +++++ 3 files changed, 5 insertions(+), 3 deletions(-) rename asm/non_matchings/code/{audio_synthesis => ucode_disas}/pad_800DACB0.s (100%) diff --git a/asm/non_matchings/code/audio_synthesis/pad_800DACB0.s b/asm/non_matchings/code/ucode_disas/pad_800DACB0.s similarity index 100% rename from asm/non_matchings/code/audio_synthesis/pad_800DACB0.s rename to asm/non_matchings/code/ucode_disas/pad_800DACB0.s diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c index b7baa82bae..a45ebd7b97 100644 --- a/src/code/audio_synthesis.c +++ b/src/code/audio_synthesis.c @@ -13,9 +13,6 @@ Acmd* func_800DD6CC(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthSt Acmd* func_800DD62C(Acmd* cmd, NoteSynthesisState* synthState, s32 count, u16 pitch, u16 inpDmem, s32 resampleFlags); extern s16 D_8012FBAA[]; -// 4 nops, part of ucode_disas? -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/pad_800DACB0.s") - void AudioSynth_InitNextRingBuf(s32 chunkSize, s32 bufIdx, s32 reverbIdx) { ReverbRingBufferItem* bufItem; s32 pad[3]; diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 81301f2ccd..00335dd20f 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -283,3 +283,8 @@ void UCodeDisas_RegisterUCode(UCodeDisas* this, s32 count, UCodeInfo* ucodeArray void UCodeDisas_SetCurUCode(UCodeDisas* this, void* ptr) { UCodeDisas_SetCurUCodeImpl(this, ptr); } + +// 4 bytes of nops, separating this file from audio_synthesis and padding .text +// to a 32-byte boundary. Unclear what this comes from... maybe the audio +// library was built separately and aligned to 32 bytes? +#pragma GLOBAL_ASM("asm/non_matchings/code/ucode_disas/pad_800DACB0.s")