Split data/rsp asm files into individual files for each microcode (#2756)

This commit is contained in:
Tharo
2026-05-10 20:05:39 +01:00
committed by GitHub
parent 4b742bf3cf
commit b6f8584597
8 changed files with 82 additions and 34 deletions
+22
View File
@@ -0,0 +1,22 @@
.include "macro.inc"
/* assembler directives */
.set noat /* allow manual use of $at */
.set noreorder /* don't insert nops after branches */
.set gp=64 /* allow use of 64-bit general purpose registers */
.section .text
.balign 16
glabel aspMainTextStart
.incbin "incbin/aspMainText"
glabel aspMainTextEnd
.section .rodata
.balign 16
glabel aspMainDataStart
.incbin "incbin/aspMainData"
glabel aspMainDataEnd
@@ -9,15 +9,6 @@
.balign 16
glabel aspMainDataStart
.incbin "incbin/aspMainData"
glabel aspMainDataEnd
#ifndef F3DEX_GBI_PL
glabel gspF3DZEX2_NoN_fifoDataStart
.incbin "incbin/gspF3DZEX2_NoN_fifoData"
glabel gspF3DZEX2_NoN_fifoDataEnd
#else
glabel gspF3DZEX2_NoN_PosLight_fifoTextStart
.incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText"
glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
@@ -25,12 +16,3 @@ glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
glabel gspF3DZEX2_NoN_PosLight_fifoDataStart
.incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoData"
glabel gspF3DZEX2_NoN_PosLight_fifoDataEnd
#endif
glabel gspS2DEX2d_fifoDataStart
.incbin "incbin/gspS2DEX2d_fifoData"
glabel gspS2DEX2d_fifoDataEnd
glabel njpgdspMainDataStart
.incbin "incbin/njpgdspMainData"
glabel njpgdspMainDataEnd
+6 -12
View File
@@ -9,20 +9,14 @@
.balign 16
glabel aspMainTextStart
.incbin "incbin/aspMainText"
glabel aspMainTextEnd
#ifndef F3DEX_GBI_PL
glabel gspF3DZEX2_NoN_fifoTextStart
.incbin "incbin/gspF3DZEX2_NoN_fifoText"
glabel gspF3DZEX2_NoN_fifoTextEnd
#endif
glabel gspS2DEX2d_fifoTextStart
.incbin "incbin/gspS2DEX2d_fifoText"
glabel gspS2DEX2d_fifoTextEnd
.section .rodata
glabel njpgdspMainTextStart
.incbin "incbin/njpgdspMainText"
glabel njpgdspMainTextEnd
.balign 16
glabel gspF3DZEX2_NoN_fifoDataStart
.incbin "incbin/gspF3DZEX2_NoN_fifoData"
glabel gspF3DZEX2_NoN_fifoDataEnd
+22
View File
@@ -0,0 +1,22 @@
.include "macro.inc"
/* assembler directives */
.set noat /* allow manual use of $at */
.set noreorder /* don't insert nops after branches */
.set gp=64 /* allow use of 64-bit general purpose registers */
.section .text
.balign 16
glabel gspS2DEX2d_fifoTextStart
.incbin "incbin/gspS2DEX2d_fifoText"
glabel gspS2DEX2d_fifoTextEnd
.section .rodata
.balign 16
glabel gspS2DEX2d_fifoDataStart
.incbin "incbin/gspS2DEX2d_fifoData"
glabel gspS2DEX2d_fifoDataEnd
+22
View File
@@ -0,0 +1,22 @@
.include "macro.inc"
/* assembler directives */
.set noat /* allow manual use of $at */
.set noreorder /* don't insert nops after branches */
.set gp=64 /* allow use of 64-bit general purpose registers */
.section .text
.balign 16
glabel njpgdspMainTextStart
.incbin "incbin/njpgdspMainText"
glabel njpgdspMainTextEnd
.section .rodata
.balign 16
glabel njpgdspMainDataStart
.incbin "incbin/njpgdspMainData"
glabel njpgdspMainDataEnd
+10 -4
View File
@@ -85,8 +85,8 @@ beginseg
include "$(BUILD_DIR)/src/boot/build.o"
// RSP microcode
include "$(BUILD_DIR)/data/rsp_boot.text.o"
include "$(BUILD_DIR)/data/cic6105.text.o"
include "$(BUILD_DIR)/data/rspboot.o"
include "$(BUILD_DIR)/data/cic6105.o"
// Extra files for non-matching debug builds
#if DEBUG_FEATURES
@@ -816,8 +816,14 @@ beginseg
include "$(BUILD_DIR)/src/audio/tables/samplebank_table.o"
// RSP microcode
include "$(BUILD_DIR)/data/rsp.text.o"
include "$(BUILD_DIR)/data/rsp.rodata.o"
include "$(BUILD_DIR)/data/aspMain.o"
#ifndef F3DEX_GBI_PL
include "$(BUILD_DIR)/data/gspF3DZEX2.NoN.fifo.o"
#else
include "$(BUILD_DIR)/data/gspF3DZEX2.NoN.PosLight.fifo.o"
#endif
include "$(BUILD_DIR)/data/gspS2DEX2d.fifo.o"
include "$(BUILD_DIR)/data/njpgdspMain.o"
// Extra files for non-matching debug builds
#if DEBUG_FEATURES