Gameboot mapping

.gitignore

@@ -9,4 +9,5 @@ tools/ido_recomp
 *.s
 .DS_Store
 *.ld
-.venv/
+.venv/
+nonmatchings/

include/PR/rcp.h

@@ -560,9 +560,10 @@
 #define VI_CTRL_DIVOT_ON            0x00010 /* 4: default = on */
 #define VI_CTRL_SERRATE_ON          0x00040 /* 6: on if interlaced */
 #define VI_CTRL_ANTIALIAS_MASK      0x00300 /* [9:8] anti-alias mode */
-#define VI_CTRL_ANTIALIAS_MODE_1    0x00100 /* Bit [9:8] anti-alias mode */
-#define VI_CTRL_ANTIALIAS_MODE_2    0x00200 /* Bit [9:8] anti-alias mode */
-#define VI_CTRL_ANTIALIAS_MODE_3    0x00300 /* Bit [9:8] anti-alias mode */
+#define VI_CTRL_ANTIALIAS_MODE_0    0x00000 /* Bit [9:8] anti-alias mode: AA enabled, resampling enabled, always fetch extra lines */
+#define VI_CTRL_ANTIALIAS_MODE_1    0x00100 /* Bit [9:8] anti-alias mode: AA enabled, resampling enabled, fetch extra lines as-needed */
+#define VI_CTRL_ANTIALIAS_MODE_2    0x00200 /* Bit [9:8] anti-alias mode: AA disabled, resampling enabled, operate as if everything is covered */
+#define VI_CTRL_ANTIALIAS_MODE_3    0x00300 /* Bit [9:8] anti-alias mode: AA disabled, resampling disabled, replicate pixels */
 #define VI_CTRL_PIXEL_ADV_MASK      0x01000 /* [15:12] pixel advance mode? */
 #define VI_CTRL_PIXEL_ADV_1         0x01000 /* Bit [15:12] pixel advance mode? */
 #define VI_CTRL_PIXEL_ADV_2         0x02000 /* Bit [15:12] pixel advance mode? */

include/common.h

@@ -0,0 +1,6 @@
+#ifndef _COMMON_H
+#define _COMMON_H
+
+#define ARRAYCOUNT(a) (sizeof(a) / sizeof(a[0]))
+
+#endif //_COMMON_H

include/gameboot.h

@@ -0,0 +1,17 @@
+#ifndef _GAMEBOOT_H
+#define _GAMEBOOT_H
+
+#include "PR/ultratypes.h"
+
+void func_80005384(void);
+void func_800016F8(u16 arg0);
+s32 func_80001D0C(u32 startLba, void *dst, u32 lbaCount);
+s32 func_80001E54(u32 devAddr, void *dramAddr, u32 size);
+u32 func_80001F20(u32 startLba, u32 endLba, u32 *lbaCount);
+s32 DisplayDiskError(s32 arg0);
+s32 func_8000314C(u8 *a, u8 *b, u32 size);
+void func_80005108(void);
+void func_80001360(void *arg);
+void func_80001A44(void);
+
+#endif //_GAMEBOOT_H

splat.yaml

@@ -18,6 +18,7 @@ options:
   ld_align_segment_start: 8
   ld_align_segment_vram_end: false
   ld_align_section_vram_end: false
+  make_full_disasm_for_code: True
 segments:
   - name: header
     type: data # this is not a typical N64 header. Do not let splat process it as such.
@@ -30,13 +31,13 @@ segments:
     start: 0x0200 # LBA 0
     vram: 0x80000400
     align: 8
+    bss_size: 0x44F18
     subsegments:
     - [0x0200, asm, entrypoint] # maybe hasm
     - [0x0250, data] # list of LBA Start/End Mapping Info (unused here)
 
     - [0x0260, asm]
     - [0x1160, c, gameboot]
-    - [0x76B0, asm]
 
     #--libleo .text
     - [0xC500, asm, leo/lib/readwrite]
@@ -182,7 +183,7 @@ segments:
     - [0x599A0, data, libultra/io/siacs]
     - [0x599B0, data, libultra/io/controller]
     - [0x599C0, data, libultra/os/initialize]
-    - [0x599E0, data, libultra/io/vitbl]
+    - [0x599E0, .data, libultra/io/vitbl]
     - [0x5AB60, data, libultra/gu/us2dex2_emu]
     - [0x5AB90, data, libultra/io/pimgr]
     - [0x5ABC0, data, libultra/sched/sched]
@@ -230,6 +231,13 @@ segments:
 
     - [0x76FB0, pad] # end
 
+
+    # .bss
+    - { type: .bss, vram: 0x800789D0, name: gameboot }
+    - { type: bss, vram: 0x80083070, name: gameboot_bss_80083070 }
+    - { type: bss, vram: 0x800B86C0, name: leo }
+    - { type: bss, vram: 0x800BADD0, name: libultra }
+
     #--libleo .bss
     #- { type: .bss, vram: 0x800B86C0, name: leo/lib/leofunc }
     #- { type: .bss, vram: 0x800B86E0, name: leo/lib/leoram }