Split RSP files (#1806)

Makefile

@@ -267,6 +267,7 @@ else
 SRC_DIRS := $(shell find src -type d)
 endif
 
+RSP_DIRS := $(shell find rsp -type d)
 ASM_DIRS := $(shell find asm -type d -not -path "asm/non_matchings*") $(shell find data -type d)
 
 ifneq ($(wildcard $(EXTRACTED_DIR)/assets/audio),)
@@ -363,11 +364,13 @@ C_FILES        := $(foreach dir,$(SRC_DIRS) $(ASSET_BIN_DIRS_C_FILES),$(wildcard
 S_FILES        := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.s)) \
                   $(shell grep -F "\$$(BUILD_DIR)/asm" $(SPEC) | sed 's/.*$$(BUILD_DIR)\/// ; s/\.o\".*/.s/') \
                   $(shell grep -F "\$$(BUILD_DIR)/data" $(SPEC) | sed 's/.*$$(BUILD_DIR)\/// ; s/\.o\".*/.s/')
+RSP_FILES      := $(foreach dir,$(RSP_DIRS),$(wildcard $(dir)/*.s))
 SCHEDULE_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.schl))
 BASEROM_FILES  := $(shell grep -F "\$$(BUILD_DIR)/baserom" $(SPEC) | sed 's/.*$$(BUILD_DIR)\/// ; s/\.o\".*//')
 ARCHIVES_O     := $(shell grep -F ".yar.o" $(SPEC) | sed 's/.*include "// ; s/.*$$(BUILD_DIR)\/// ; s/\.o\".*/.o/')
 O_FILES        := $(foreach f,$(S_FILES:.s=.o),$(BUILD_DIR)/$f) \
                   $(foreach f,$(C_FILES:.c=.o),$(BUILD_DIR)/$f) \
+                  $(foreach f,$(RSP_FILES:.s=.o),$(BUILD_DIR)/$f) \
                   $(foreach f,$(ASSET_C_FILES_EXTRACTED:.c=.o),$(f:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)) \
                   $(foreach f,$(ASSET_C_FILES_COMMITTED:.c=.o),$(BUILD_DIR)/$f) \
                   $(foreach f,$(BASEROM_FILES),$(BUILD_DIR)/$f.o) \
@@ -391,6 +394,7 @@ OTHER_DIRS := assets/text baserom dmadata $(shell find linker_scripts -type d)
 
 # create build directories
 $(shell mkdir -p $(foreach dir, \
+                      $(RSP_DIRS) \
                       $(SRC_DIRS) \
                       $(ASM_DIRS) \
                       $(OTHER_DIRS), \

rsp/aspMain.s

@@ -0,0 +1,18 @@
+.include "macro.inc"
+
+.section .text
+
+.balign 16
+
+glabel aspMainTextStart
+    .incbin "incbin/aspMainText"
+endlabel aspMainTextStart
+dlabel aspMainTextEnd
+
+.section .rodata
+
+.balign 16
+
+dlabel aspMainDataStart
+    .incbin "incbin/aspMainData"
+dlabel aspMainDataEnd

rsp/gspF3DZEX2.NoN.PosLight.fifo.s

@@ -0,0 +1,17 @@
+.include "macro.inc"
+
+.section .rodata
+
+.balign 16
+
+dlabel gspF3DZEX2_NoN_PosLight_fifoTextStart
+    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText"
+dlabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
+
+.section .rodata
+
+.balign 16
+
+dlabel gspF3DZEX2_NoN_PosLight_fifoDataStart
+    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoData"
+dlabel gspF3DZEX2_NoN_PosLight_fifoDataEnd

rsp/gspS2DEX2.fifo.s

@@ -0,0 +1,18 @@
+.include "macro.inc"
+
+.section .text
+
+.balign 16
+
+glabel gspS2DEX2_fifoTextStart
+    .incbin "incbin/gspS2DEX2_fifoText"
+endlabel gspS2DEX2_fifoTextStart
+dlabel gspS2DEX2_fifoTextEnd
+
+.section .rodata
+
+.balign 16
+
+dlabel gspS2DEX2_fifoDataStart
+    .incbin "incbin/gspS2DEX2_fifoData"
+dlabel gspS2DEX2_fifoDataEnd

rsp/njpgdspMain.s

@@ -0,0 +1,18 @@
+.include "macro.inc"
+
+.section .text
+
+.balign 16
+
+glabel njpgdspMainTextStart
+    .incbin "incbin/njpgdspMainText"
+endlabel njpgdspMainTextStart
+dlabel njpgdspMainTextEnd
+
+.section .rodata
+
+.balign 16
+
+dlabel njpgdspMainDataStart
+    .incbin "incbin/njpgdspMainData"
+dlabel njpgdspMainDataEnd

spec/spec

@@ -243,7 +243,7 @@ beginseg
     include "$(BUILD_DIR)/src/boot/libc/strcpy.o"
     include "$(BUILD_DIR)/src/boot/libc/memmove.o"
     include "$(BUILD_DIR)/src/boot/build.o"
-    include "$(BUILD_DIR)/src/boot/rspboot.o"
+    include "$(BUILD_DIR)/rsp/rspboot.o"
 
 #ifdef COMPILER_GCC
     include "$(BUILD_DIR)/src/gcc_fix/missing_gcc_functions.o"
@@ -780,7 +780,10 @@ beginseg
     include "$(BUILD_DIR)/assets/audio/sequence_font_table.o"
     include "$(BUILD_DIR)/src/audio/tables/sequence_table.o"
     include "$(BUILD_DIR)/src/audio/tables/samplebank_table.o"
-    include "$(BUILD_DIR)/src/code/rspcode.o"
+    include "$(BUILD_DIR)/rsp/aspMain.o"
+    include "$(BUILD_DIR)/rsp/gspF3DZEX2.NoN.PosLight.fifo.o"
+    include "$(BUILD_DIR)/rsp/gspS2DEX2.fifo.o"
+    include "$(BUILD_DIR)/rsp/njpgdspMain.o"
 endseg
 
 // The game expects all the segments after the `code` segment and before the first overlay to be `NOLOAD` ones

src/code/rspcode.s

@@ -1,44 +0,0 @@
-.include "macro.inc"
-
-.section .text
-
-.balign 16
-
-glabel aspMainTextStart
-    .incbin "incbin/aspMainText"
-endlabel aspMainTextStart
-dlabel aspMainTextEnd
-
-glabel gspS2DEX2_fifoTextStart
-    .incbin "incbin/gspS2DEX2_fifoText"
-endlabel gspS2DEX2_fifoTextStart
-dlabel gspS2DEX2_fifoTextEnd
-
-glabel njpgdspMainTextStart
-    .incbin "incbin/njpgdspMainText"
-endlabel njpgdspMainTextStart
-dlabel njpgdspMainTextEnd
-
-.section .rodata
-
-.balign 16
-
-dlabel aspMainDataStart
-    .incbin "incbin/aspMainData"
-dlabel aspMainDataEnd
-
-dlabel gspF3DZEX2_NoN_PosLight_fifoTextStart
-    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText"
-dlabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
-
-dlabel gspF3DZEX2_NoN_PosLight_fifoDataStart
-    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoData"
-dlabel gspF3DZEX2_NoN_PosLight_fifoDataEnd
-
-dlabel gspS2DEX2_fifoDataStart
-    .incbin "incbin/gspS2DEX2_fifoData"
-dlabel gspS2DEX2_fifoDataEnd
-
-dlabel njpgdspMainDataStart
-    .incbin "incbin/njpgdspMainData"
-dlabel njpgdspMainDataEnd