Avoid using linker-generated symbols for bins and assets (#1245)

Co-authored-by: Mr-Wiseguy <mrwiseguyromhacking@gmail.com>
Co-authored-by: Alex <16batesa@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 4 people

.gitignore

@@ -1,6 +1,7 @@
 # Python
 __pycache__/
 venv/
+.venv/
 .lark_cache*
 .splat_cache
 
@@ -63,3 +64,5 @@ build/
 .cache/clangd/
 # compile_commands.json requires hardcoded paths, so it can't be committed
 compile_commands.json
+
+/ver/*/asm/data/rsp/*.s

src/audio/core/system.c

@@ -33,8 +33,8 @@ AuSynDriver auSynDriver;
 u8 rspbootUcodeBuffer[0x100] ALIGNED(16);
 #endif
 
-extern u64 n_aspMain_text_bin[];
-extern u64 n_aspMain_data_bin[];
+extern u64 n_aspMainTextStart[];
+extern u64 n_aspMainDataStart[];
 
 extern u8 AuHeapBase[AUDIO_HEAP_SIZE];
 
@@ -72,8 +72,8 @@ void create_audio_system(void) {
         nuAuTasks[i].list.t.ucode_boot = (u64*) rspbootUcodeBuffer;
         nuAuTasks[i].list.t.ucode_boot_size = 0x100;
 #endif
-        nuAuTasks[i].list.t.ucode = n_aspMain_text_bin;
-        nuAuTasks[i].list.t.ucode_data = n_aspMain_data_bin;
+        nuAuTasks[i].list.t.ucode = n_aspMainTextStart;
+        nuAuTasks[i].list.t.ucode_data = n_aspMainDataStart;
         nuAuTasks[i].list.t.ucode_data_size = SP_UCODE_DATA_SIZE;
         nuAuTasks[i].list.t.dram_stack = nullptr;
         nuAuTasks[i].list.t.dram_stack_size = 0;

src/menu_hud_scripts.c

@@ -1,11 +1,11 @@
 #include "common.h"
 #include "nu/nusys.h"
 
-extern u64 gspF3DEX2kawase_fifo_text_bin[];
-extern u64 gspF3DEX2kawase_fifo_data_bin[];
+extern u64 gspF3DZEX2_NoN_PosLight_fifoTextStart[];
+extern u64 gspF3DZEX2_NoN_PosLight_fifoDataStart[];
 
 NUUcode nugfx_ucode = {
-    gspF3DEX2kawase_fifo_text_bin, gspF3DEX2kawase_fifo_data_bin,
+    gspF3DZEX2_NoN_PosLight_fifoTextStart, gspF3DZEX2_NoN_PosLight_fifoDataStart,
 };
 
 extern u16 gFrameBuf0[];

src/os/nusys/nugfxinit.c

@@ -70,8 +70,6 @@ nuAuTaskStop = 0x80076de0;
 AlFrameSize = 0x800a0044;
 AlCmdListBuffers = 0x8009ff20;
 AlMinFrameSize = 0x800a0048;
-n_aspMain_text_bin = 0x80071e10;
-n_aspMain_data_bin = 0x80096700;
 nuAuTasks = 0x8009ff30;
 D_800A3628 = 0x800a0038;
 nuAuDmaBufList = 0x800a05f0;
@@ -113,7 +111,6 @@ __osViNext = 0x80094654;
 osViModePalLan1 = 0x80094660;
 AuHeapBase = 0x801aa000;
 nuAuMgr = 0x8004a4c0;
-rspbootTextStart = 0x80071d40;
 alHeapAlloc = 0x80057650;
 alLink = 0x8004aaa4;
 nuAuPreNMIProc = 0x8004a9e0;
@@ -4756,3 +4753,10 @@ D_09001518_39A0D8 = 0x09001518; // rom:0x3E2B28
 charset_peach_letter_png = 0x00051020; //rom:0x15F140
 charset_postcard_png = 0x00054FA8; //rom:0x1630C8
 charset_letter_content_1_png = 0x00056E90; //rom:0x164FB0
+
+// RSP symbols
+rspbootTextStart = 0x80071D40; // size:0xD0 name_end:rspbootTextEnd
+n_aspMainTextStart = 0x80071E10; // size:0xC60 name_end:n_aspMainTextEnd
+gspF3DZEX2_NoN_PosLight_fifoTextStart = 0x80094CB0; // size:0x1630 name_end:gspF3DZEX2_NoN_PosLight_fifoTextEnd
+gspF3DZEX2_NoN_PosLight_fifoDataStart = 0x800962E0; // size:0x420 name_end:gspF3DZEX2_NoN_PosLight_fifoDataEnd
+n_aspMainDataStart = 0x80096700; // size:0x2B0 name_end:n_aspMainDataEnd

ver/ique/splat.yaml

@@ -35,6 +35,3 @@ D_A6000000 = 0xA6000000;
 D_B0000000 = 0xB0000000;
 D_B0000008 = 0xB0000008;
 D_B0000010 = 0xB0000010;
-
-rspbootTextStart = rspboot_bin;
-rspbootTextEnd = rspboot_bin + 0xd0;