Name rsp ucodes and surrounding cleanup (#1166)

* Name rsp ucodes and surrounding cleanup

* Fix comments alignment and remove unnecessary & in sys_ucode

* Change capitalization of sys_ucode variables

* Remove unnecessary externs for aspMain

* Improvements to Jpeg_ScheduleDecoderTask

* Split unknown rsp code into a separate file, spacing

5 files changed, 63 insertions, 25 deletions

diff --git a/data/audio_tables.rodata.s b/data/audio_tables.rodata.s
new file mode 100644
index 000000000..fb31af24b
--- /dev/null
+++ b/data/audio_tables.rodata.s
@@ -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 .rodata
+
+.balign 16
+
+glabel gSoundFontTable
+    .incbin "baserom.z64", 0xBCC270, 0x270
+
+glabel gSequenceFontTable
+    .incbin "baserom.z64", 0xBCC4E0, 0x1C0
+
+glabel gSequenceTable
+    .incbin "baserom.z64", 0xBCC6A0, 0x6F0
+
+glabel gSampleBankTable
+    .incbin "baserom.z64", 0xBCCD90, 0x80
diff --git a/data/rsp.rodata.s b/data/rsp.rodata.s
index 82c2c97c6..10044b940 100644
--- a/data/rsp.rodata.s
+++ b/data/rsp.rodata.s
@@ -9,30 +9,22 @@
 
 .balign 16
 
-glabel gSoundFontTable
-    .incbin "baserom.z64", 0xBCC270, 0x270
-
-glabel gSequenceFontTable
-    .incbin "baserom.z64", 0xBCC4E0, 0x1C0
-
-glabel gSequenceTable
-    .incbin "baserom.z64", 0xBCC6A0, 0x6F0
-
-glabel gSampleBankTable
-    .incbin "baserom.z64", 0xBCCD90, 0x80
-
-glabel rspAspMainDataStart
+glabel aspMainDataStart
     .incbin "baserom.z64", 0xBCCE10, 0x2E0
-glabel rspAspMainDataEnd
+glabel aspMainDataEnd
 
-glabel D_80155F50
+glabel gspF3DZEX2_NoN_PosLight_fifoTextStart
     .incbin "baserom.z64", 0xBCD0F0, 0x1630
+glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
 
-glabel D_80157580
+glabel gspF3DZEX2_NoN_PosLight_fifoDataStart
     .incbin "baserom.z64", 0xBCE720, 0x420
+glabel gspF3DZEX2_NoN_PosLight_fifoDataEnd
 
-glabel D_801579A0
+glabel gspS2DEX2d_fifoDataStart
     .incbin "baserom.z64", 0xBCEB40, 0x390
+glabel gspS2DEX2d_fifoDataEnd
 
-glabel gJpegUCodeData
+glabel njpgdspMainDataStart
     .incbin "baserom.z64", 0xBCEED0, 0x60
+glabel njpgdspMainDataEnd
diff --git a/data/rsp.text.s b/data/rsp.text.s
index 0aab098b0..1b29541d8 100644
--- a/data/rsp.text.s
+++ b/data/rsp.text.s
@@ -9,11 +9,14 @@
 
 .balign 16
 
-glabel D_801120C0
+glabel aspMainTextStart
     .incbin "baserom.z64", 0xB89260, 0xFB0
+glabel aspMainTextEnd
 
-glabel D_80113070
+glabel gspS2DEX2d_fifoTextStart
     .incbin "baserom.z64", 0xB8A210, 0x18C0
+glabel gspS2DEX2d_fifoTextEnd
 
-glabel gJpegUCode
+glabel njpgdspMainTextStart
     .incbin "baserom.z64", 0xB8BAD0, 0xAF0
+glabel njpgdspMainTextEnd
diff --git a/data/rsp_boot.text.s b/data/rsp_boot.text.s
index 9ca646e4a..507eafd6c 100644
--- a/data/rsp_boot.text.s
+++ b/data/rsp_boot.text.s
@@ -9,8 +9,6 @@
 
 .balign 16
 
-glabel D_80009320
+glabel rspbootTextStart
     .incbin "baserom.z64", 0x9F20, 0xD0
-
-glabel D_800093F0
-    .incbin "baserom.z64", 0x9FF0, 0x20
+glabel rspbootTextEnd
diff --git a/data/unk_800093F0.data.s b/data/unk_800093F0.data.s
new file mode 100644
index 000000000..380dbe64b
--- /dev/null
+++ b/data/unk_800093F0.data.s
@@ -0,0 +1,23 @@
+.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 .data
+
+.balign 16
+
+# Unused.
+# This appears to be RSP code, however it is not part of
+# rspboot as rspbootTextEnd is at this symbol
+glabel D_800093F0
+    .word 0xE80C2001 # sqv     $v12[0], 0x10($zero)
+    .word 0x34014000 # li      $1, 0x4000
+    .word 0x40812000 # mtc0    $1, SP_STATUS
+    .word 0x0000000D # break
+    .word 0x00000000 # nop
+    .word 0x09000425 # j       0x04001094
+    .word 0x00000000 #  nop
+    .word 0x00000000 # nop