From 3bf9aa3c36aabbf437b2745af572b37e986afef4 Mon Sep 17 00:00:00 2001 From: ABelliqueux Date: Fri, 17 Sep 2021 23:20:29 +0200 Subject: [PATCH] Remove useless addition for spu_malloc_rec size --- Makefile | 10 +++++----- hello_multi_vag/hello_multi_vag.c | 2 +- hello_vag/hello_vag.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b631ab7..e3418e1 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ hello_gte_opti: $(MAKE) -C hello_gte_opti hello_light: $(MAKE) -C hello_light -hello_multivag: - $(MAKE) -C hello_multivag +hello_multi_vag: + $(MAKE) -C hello_multi_vag hello_pad: $(MAKE) -C hello_pad hello_poly: @@ -59,7 +59,7 @@ clean: $(MAKE) -C hello_poly_fun clean $(MAKE) -C hello_gte_opti clean $(MAKE) -C hello_light clean - $(MAKE) -C hello_multivag clean + $(MAKE) -C hello_multi_vag clean $(MAKE) -C hello_pad clean $(MAKE) -C hello_poly clean $(MAKE) -C hello_poly_ft clean @@ -88,7 +88,7 @@ all: $(MAKE) -C hello_poly_fun $(MAKE) -C hello_gte_opti $(MAKE) -C hello_light - $(MAKE) -C hello_multivag + $(MAKE) -C hello_multi_vag $(MAKE) -C hello_pad $(MAKE) -C hello_poly $(MAKE) -C hello_poly_ft @@ -109,7 +109,7 @@ all: # declare phony rules .PHONY: hello_2pads hello_cube hello_cubetex hello_poly_fun hello_gte_opti \ - hello_light hello_multivag hello_pad hello_poly hello_poly_ft hello_poly_gt \ + hello_light hello_multi_vag hello_pad hello_poly hello_poly_ft hello_poly_gt \ hello_poly_gt_tw hello_poly_inline hello_sio hello_sprt hello_tile \ hello_vag hello_world hello_cdda hello_cd hello_xa hello_bs hello_str hello_strplay \ hello_poly_stp hello_cubetex_stp \ diff --git a/hello_multi_vag/hello_multi_vag.c b/hello_multi_vag/hello_multi_vag.c index 8298602..815e73a 100644 --- a/hello_multi_vag/hello_multi_vag.c +++ b/hello_multi_vag/hello_multi_vag.c @@ -35,7 +35,7 @@ short db = 0; // index of which buffer is used, values 0, 1 // convert Little endian to Big endian #define SWAP_ENDIAN32(x) (((x)>>24) | (((x)>>8) & 0xFF00) | (((x)<<8) & 0x00FF0000) | ((x)<<24)) // Memory management table ; allow MALLOC_MAX calls to SpuMalloc() - libref47.pdf p.1044 -char spu_malloc_rec[SPU_MALLOC_RECSIZ * (2 + MALLOC_MAX + 1)]; +char spu_malloc_rec[SPU_MALLOC_RECSIZ * (MALLOC_MAX + 1)]; // Custom struct to handle VAG files typedef struct VAGsound { u_char * VAGfile; // Pointer to VAG data address diff --git a/hello_vag/hello_vag.c b/hello_vag/hello_vag.c index a2dcc9f..8a37cc0 100644 --- a/hello_vag/hello_vag.c +++ b/hello_vag/hello_vag.c @@ -60,7 +60,7 @@ u_long vag_spu_address; // address allocated in memory for firs u_long spu_start_address; u_long get_start_addr; u_long transSize; -// Memory management table ; allow MALLOC_MAX calls to SpuMalloc() - ibref47.pdf p.1044 +// Memory management table ; allow MALLOC_MAX calls to SpuMalloc() - libref47.pdf p.1044 char spu_malloc_rec[SPU_MALLOC_RECSIZ * (2 + MALLOC_MAX+1)]; // VAG files // We're using GrumpyCoder's Nugget wrapper to compile the code with a modern GCC : https://github.com/grumpycoders/pcsx-redux/tree/main/src/mips/psyq