PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove padding from g721.cpp, move unused bytes to CStaticAudioPlayer.cpp

This commit is contained in:
Phillip Stephens 2022-09-15 19:17:34 -07:00
parent 004dc6d1d0
commit 6898a9cc90
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -130,7 +130,7 @@ $(METROTRK_FILES): MWCC_VERSION := 1.2.5
$(METROTRK_FILES): CFLAGS := $(CFLAGS_BASE) $(METROTRK_FILES): CFLAGS := $(CFLAGS_BASE)
$(BASE_FILES): MWCC_VERSION := 1.2.5 $(BASE_FILES): MWCC_VERSION := 1.2.5
$(BASE_FILES): CFLAGS := $(CFLAGS_BASE) $(BASE_FILES): CFLAGS := $(CFLAGS_BASE)
$(AI_FILES): MWCC_VERSION := 1.2.5 $(AI_FILES): MWCC_VERSION := 1.2.5e
$(AI_FILES): CFLAGS := $(CFLAGS_BASE) $(AI_FILES): CFLAGS := $(CFLAGS_BASE)
$(OS_FILES): MWCC_VERSION := 1.2.5 $(OS_FILES): MWCC_VERSION := 1.2.5
$(OS_FILES): CFLAGS := $(CFLAGS_BASE) $(OS_FILES): CFLAGS := $(CFLAGS_BASE)
@ -138,7 +138,7 @@ $(CARD_FILES): MWCC_VERSION := 1.2.5
$(CARD_FILES): CFLAGS := $(CFLAGS_BASE) $(CARD_FILES): CFLAGS := $(CFLAGS_BASE)
$(DVD_FILES): MWCC_VERSION := 1.2.5e $(DVD_FILES): MWCC_VERSION := 1.2.5e
$(DVD_FILES): CFLAGS := $(CFLAGS_BASE) $(DVD_FILES): CFLAGS := $(CFLAGS_BASE)
$(DSP_FILES): MWCC_VERSION := 1.2.5 $(DSP_FILES): MWCC_VERSION := 1.2.5e
$(DSP_FILES): CFLAGS := $(CFLAGS_BASE) $(DSP_FILES): CFLAGS := $(CFLAGS_BASE)
$(MUSYX_FILES): CFLAGS := $(CFLAGS_MUSYX) $(MUSYX_FILES): CFLAGS := $(CFLAGS_MUSYX)
$(ZLIB_FILES): CFLAGS := $(CFLAGS_RUNTIME) $(ZLIB_FILES): CFLAGS := $(CFLAGS_RUNTIME)

12
asm/Kyoto/Audio/CStaticAudioPlayer.s
View File

@ -4,6 +4,18 @@
lbl_ctor: lbl_ctor:
.4byte __sinit_CStaticAudioPlayer_cpp .4byte __sinit_CStaticAudioPlayer_cpp
.section .data
.balign 8
lbl_803EF8C0:
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.section .bss .section .bss
.balign 8 .balign 8
.lcomm lbl_80540A20, 0xC, 4 .lcomm lbl_80540A20, 0xC, 4

8
asm/Kyoto/Audio/g721.s
View File

@ -38,14 +38,6 @@ lbl_803EF840:
.4byte 0x02000200 .4byte 0x02000200
.4byte 0x02000000 .4byte 0x02000000
.4byte 0 .4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.section .text, "ax" .section .text, "ax"

2
obj_files.mk
View File

@ -641,7 +641,7 @@ DB_FILES :=\
$(BUILD_DIR)/asm/Dolphin/db.o $(BUILD_DIR)/asm/Dolphin/db.o
DSP_FILES :=\ DSP_FILES :=\
$(BUILD_DIR)/asm/Dolphin/dsp/dsp.o\ $(BUILD_DIR)/src/Dolphin/dsp/dsp.o\
$(BUILD_DIR)/src/Dolphin/dsp/dsp_debug.o\ $(BUILD_DIR)/src/Dolphin/dsp/dsp_debug.o\
$(BUILD_DIR)/asm/Dolphin/dsp/dsp_task.o $(BUILD_DIR)/asm/Dolphin/dsp/dsp_task.o

4
src/Kyoto/Audio/g721.cpp
View File

@ -418,9 +418,7 @@ static short _witab[16] = {-12, 18, 41, 64, 112, 198, 355, 1122,
*/ */
static short _fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00, static short _fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0}; 0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0};
/* HACK: To make match */
/* TODO: Remove this */
static int padding[8] = { 0, 0, 0, 0, 0, 0, 0, 0};
/* /*
* g721_decoder() * g721_decoder()
* *