Implement sdata

.vscode/c_cpp_properties.json

@@ -27,7 +27,8 @@
                 "F3DEX_GBI_2=1",
                 "F3DZEX_NON_GBI_2=1",
                 "F3DEX_GBI_SHARED=1",
-                "LIBPL=1"
+                "LIBPL=1",
+                "SDATA=1"
             ],
             "compilerPath": "/usr/bin/mips-linux-gnu-gcc",
             "cStandard": "gnu17",

Makefile

@@ -265,6 +265,15 @@ ifeq ($(LIBPL),1)
   SRC_DIRS += $(LIBPL_DIR)
 endif
 
+# SDATA - use 64kb sdata and sbss sections to enhance performance (requires some housekeeping; recommended for experienced hackers only)
+#   1 - includes sdata and sbss in ROM
+#   0 - does not
+SDATA ?= 0
+$(eval $(call validate-option,SDATA,0 1))
+ifeq ($(SDATA),1)
+  DEFINES += SDATA=1
+endif
+
 BUILD_DIR_BASE := build
 # BUILD_DIR is the location where all build artifacts are placed
 BUILD_DIR      := $(BUILD_DIR_BASE)/$(VERSION)_$(CONSOLE)
@@ -466,6 +475,10 @@ ifeq ($(COMPILER),gcc)
   CXX     := $(CROSS)g++
   $(BUILD_DIR)/actors/%.o:           OPT_FLAGS := -Ofast -mlong-calls
   $(BUILD_DIR)/levels/%.o:           OPT_FLAGS := -Ofast -mlong-calls
+  ifeq ($(SDATA),1)
+    $(BUILD_DIR)/actors/%.o:           CFLAGS += -G 0
+    $(BUILD_DIR)/levels/%.o:           CFLAGS += -G 0
+  endif
 else ifeq ($(COMPILER),clang)
   CC      := clang
   CXX     := clang++
@@ -506,17 +519,25 @@ C_DEFINES := $(foreach d,$(DEFINES),-D$(d))
 DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(C_DEFINES)
 
 # C compiler options
-CFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) $(MIPSISET) $(DEF_INC_CFLAGS)
+CFLAGS = $(OPT_FLAGS) $(TARGET_CFLAGS) $(MIPSISET) $(DEF_INC_CFLAGS)
 ifeq ($(COMPILER),gcc)
-  CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
-  CFLAGS += -Wno-missing-braces
+  CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-missing-braces
 else ifeq ($(COMPILER),clang)
-  CFLAGS += -mfpxx -target mips -mabi=32 -G 0 -mhard-float -fomit-frame-pointer -fno-stack-protector -fno-common -I include -I src/ -I $(BUILD_DIR)/include -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
-  CFLAGS += -Wno-missing-braces
+  CFLAGS += -mfpxx -target mips -mabi=32 -mhard-float -fomit-frame-pointer -fno-stack-protector -fno-common -I include -I src/ -I $(BUILD_DIR)/include -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-missing-braces
 else
   CFLAGS += -non_shared -Wab,-r4300_mul -Xcpluscomm -Xfullwarn -signed -32
 endif
-ASMFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) -mips3 $(DEF_INC_CFLAGS) -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
+ASMFLAGS = -G 3 $(OPT_FLAGS) $(TARGET_CFLAGS) -mips3 $(DEF_INC_CFLAGS) -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
+
+ifeq ($(SDATA),1)
+  ASMFLAGS += -G 3
+else
+  CFLAGS += -G 0
+  ifeq ($(COMPILER),gcc)
+    CFLAGS += -fno-zero-initialized-in-bss
+  endif
+  ASMFLAGS += -G 0
+endif
 
 ASFLAGS     := -march=vr4300 -mabi=32 $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(foreach d,$(DEFINES),--defsym $(d))
 RSPASMFLAGS := $(foreach d,$(DEFINES),-definelabel $(subst =, ,$(d)))
@@ -696,8 +717,13 @@ $(BUILD_DIR)/src/usb/usb.o: CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wn
 $(BUILD_DIR)/src/usb/debug.o: OPT_FLAGS := -O0
 $(BUILD_DIR)/src/usb/debug.o: CFLAGS += -Wno-unused-parameter -Wno-maybe-uninitialized
 # File specific opt flags
-$(BUILD_DIR)/src/audio/heap.o:          OPT_FLAGS := -Os -fno-jump-tables
-$(BUILD_DIR)/src/audio/synthesis.o:     OPT_FLAGS := -Os -fno-jump-tables
+ifeq ($(SDATA),1)
+  $(BUILD_DIR)/src/audio/heap.o:          OPT_FLAGS := -Os -fno-jump-tables -ffunction-sections -fdata-sections
+  $(BUILD_DIR)/src/audio/synthesis.o:     OPT_FLAGS := -Os -fno-jump-tables -ffunction-sections -fdata-sections
+else
+  $(BUILD_DIR)/src/audio/heap.o:          OPT_FLAGS := -Os -fno-jump-tables
+  $(BUILD_DIR)/src/audio/synthesis.o:     OPT_FLAGS := -Os -fno-jump-tables
+endif
 
 $(BUILD_DIR)/src/engine/surface_collision.o:  OPT_FLAGS := $(COLLISION_OPT_FLAGS)
 $(BUILD_DIR)/src/engine/math_util.o:          OPT_FLAGS := $(MATH_UTIL_OPT_FLAGS)
@@ -879,9 +905,23 @@ ifeq ($(FIXLIGHTS),1)
 DUMMY != $(PYTHON) $(FIXLIGHTS_PY) actors
 DUMMY != $(PYTHON) $(FIXLIGHTS_PY) levels
 endif
+
+ifeq ($(SDATA),1)
+$(BUILD_DIR)/src/boot/%.o: src/boot/%.c
+	$(call print,Compiling Boot:,$<,$@)
+	$(V)$(CC) -c -G 0 $(CFLAGS) -MMD -MF $(BUILD_DIR)/src/boot/$*.d  -o $@ $<
+$(BUILD_DIR)/src/%.o: src/%.c
+	$(call print,Compiling:,$<,$@)
+	$(V)$(CC) -c -G 64 $(CFLAGS) -MMD -MF $(BUILD_DIR)/src/$*.d  -o $@ $<
+$(BUILD_DIR)/%.o: %.c
+	$(call print,Compiling:,$<,$@)
+	$(V)$(CC) -c -G 0 -fno-zero-initialized-in-bss $(CFLAGS) -MMD -MF $(BUILD_DIR)/$*.d  -o $@ $<
+else
 $(BUILD_DIR)/%.o: %.c
 	$(call print,Compiling:,$<,$@)
 	$(V)$(CC) -c $(CFLAGS) -MMD -MF $(BUILD_DIR)/$*.d  -o $@ $<
+endif
+
 $(BUILD_DIR)/%.o: %.cpp
 	$(call print,Compiling (C++):,$<,$@)
 	$(V)$(CXX) -c $(CFLAGS) -std=c++17 -Wno-register -MMD -MF $(BUILD_DIR)/$*.d  -o $@ $<

asm/setgp.s

@@ -0,0 +1,18 @@
+#ifdef SDATA
+
+// assembler directives
+.set noat      // allow manual use of $at
+.set noreorder // don't insert nops after branches
+.set gp=64
+
+#include "macros.inc"
+
+
+.section .text, "ax"
+
+glabel setgp
+    lui $gp, %hi(_gp)
+    jr $ra
+     addiu $gp, %lo(_gp)
+
+#endif

include/macros.h

@@ -103,6 +103,17 @@
 #define ALIGNED64
 #endif
 
+// Assign to a section type.
+#if defined(SDATA) && defined(__GNUC__)
+#define SECTION(x) __attribute__((section(x)))
+#define SECTION_BSS  SECTION(".bss")
+#define SECTION_DATA SECTION(".data")
+#else
+#define SECTION(x)
+#define SECTION_BSS
+#define SECTION_DATA
+#endif
+
 #ifndef ALIGN
 #define ALIGN(VAL_, ALIGNMENT_) (((VAL_) + ((ALIGNMENT_) - 1)) & ~((ALIGNMENT_) - 1))
 #endif

include/n64/PR/os_system.h

@@ -81,6 +81,20 @@ extern "C" {
  *
  */
 
+#if defined(SDATA) && defined(__GNUC__)
+extern __attribute__((section(".data"))) s32 	osRomType;	/* Bulk or cartridge ROM. 0=cartridge 1=bulk */
+extern __attribute__((section(".data"))) void 	*osRomBase;	/* Rom base address of the game image */
+extern __attribute__((section(".data"))) s32 	osTvType;	/* 0 = PAL, 1 = NTSC, 2 = MPAL */
+extern __attribute__((section(".data"))) s32 	osResetType;	/* 0 = cold reset, 1 = NMI */
+extern __attribute__((section(".data"))) s32 	osCicId;
+extern __attribute__((section(".data"))) s32 	osVersion;
+extern __attribute__((section(".data"))) u32	osMemSize;	/* Memory Size */
+extern s32 osAppNMIBuffer[];
+
+extern __attribute__((section(".data"))) u64	osClockRate;
+
+extern __attribute__((section(".data"))) OSIntMask __OSGlobalIntMask;	/* global interrupt mask */
+#else
 extern s32 	osRomType;	/* Bulk or cartridge ROM. 0=cartridge 1=bulk */
 extern void 	*osRomBase;	/* Rom base address of the game image */
 extern s32 	osTvType;	/* 0 = PAL, 1 = NTSC, 2 = MPAL */
@@ -93,6 +107,7 @@ extern s32	osAppNMIBuffer[];
 extern u64	osClockRate;
 
 extern OSIntMask __OSGlobalIntMask;	/* global interrupt mask */
+#endif
 
 
 /**************************************************************************

include/segment_symbols.h

@@ -53,10 +53,13 @@ DECLARE_SEGMENT(assets)
 extern u8 _goddardSegmentStart[];
 extern u8 _goddardSegmentEnd[];
 extern u8 _engineSegmentStart[];
+extern u8 _engineSegmentEnd[];
+extern u8 _engineSegmentBssStart[];
 extern u8 _engineSegmentBssEnd[];
 extern u8 _mainSegmentStart[];
 extern u8 _mainSegmentEnd[];
-extern u8 _engineSegmentEnd[];
+extern u8 _mainSegmentBssStart[];
+extern u8 _mainSegmentBssEnd[];
 extern u8 _framebuffersSegmentBssStart[];
 extern u8 _framebuffersSegmentBssEnd[];
 extern u8 _zbufferSegmentBssStart[];
@@ -64,6 +67,16 @@ extern u8 _zbufferSegmentBssEnd[];
 extern u8 _buffersSegmentBssStart[];
 extern u8 _buffersSegmentBssEnd[];
 
+#ifdef SDATA
+extern u8 _sbssSegmentBssStart[];
+extern u8 _sbssSegmentBssEnd[];
+extern u8 _sdataSegmentStart[];
+extern u8 _sdataSegmentEnd[];
+extern u8 _sdataSegmentRomStart[];
+extern u8 _sdataSegmentRomEnd[];
+extern u8 _gp[];
+#endif
+
 DECLARE_LEVEL_SEGMENT(menu)
 DECLARE_LEVEL_SEGMENT(intro)
 DECLARE_LEVEL_SEGMENT(ending)

sm64.ld

@@ -53,10 +53,10 @@ OUTPUT_ARCH (mips)
    END_SEG(name##_segment_7) \
    BEGIN_SEG(name, 0x0E000000) \
    { \
-      KEEP(BUILD_DIR/levels/name/script.o(.*data*)); \
+      KEEP(BUILD_DIR/levels/name/script.o(.data*)); \
       KEEP(BUILD_DIR/levels/name/script.o(.text*)); \
       KEEP(BUILD_DIR/levels/name/script.o(.rodata*)); \
-      KEEP(BUILD_DIR/levels/name/geo.o(.*data*)); \
+      KEEP(BUILD_DIR/levels/name/geo.o(.data*)); \
       KEEP(BUILD_DIR/levels/name/geo.o(.text*)); \
       KEEP(BUILD_DIR/levels/name/geo.o(.rodata*)); \
    } \
@@ -77,7 +77,7 @@ OUTPUT_ARCH (mips)
    END_SEG(name##_yay0) \
    BEGIN_SEG(name##_geo, geoAddr) \
    { \
-      KEEP(BUILD_DIR/actors/name##_geo.o(.*data*)); \
+      KEEP(BUILD_DIR/actors/name##_geo.o(.data*)); \
       KEEP(BUILD_DIR/actors/name##_geo.o(.rodata*)); \
       KEEP(BUILD_DIR/actors/name##_geo.o(.text*)); \
    } \
@@ -157,6 +157,7 @@ SECTIONS
    {
       KEEP(BUILD_DIR/asm/entry.o(.text*));
       KEEP(BUILD_DIR/asm/n64_assert.o(.text*));
+      KEEP(BUILD_DIR/asm/setgp.o(.text*));
 #ifdef EEP
       KEEP(BUILD_DIR/asm/vc_bin.o(.text*));
 #endif
@@ -188,14 +189,14 @@ SECTIONS
       _mainSegmentTextEnd = .;
 
       /* data */
-      BUILD_DIR/asm/n64_assert.o(.*data*);
-      BUILD_DIR/src/boot*.o(.*data*);
-      BUILD_DIR/src/audio*.o(.*data*);
+      BUILD_DIR/asm/n64_assert.o(.data*);
+      BUILD_DIR/src/boot*.o(.data*);
+      BUILD_DIR/src/audio*.o(.data*);
 #ifdef S2DEX_TEXT_ENGINE
-      BUILD_DIR/src/s2d_engine*.o(.*data*);
+      BUILD_DIR/src/s2d_engine*.o(.data*);
 #endif
 #ifdef LIBPL
-      BUILD_DIR/lib/libpl*.o(.*data*);
+      BUILD_DIR/lib/libpl*.o(.data*);
 #endif
       *ULTRALIB.a:*.o(.data*);
       */libhvqm2.a:*.o(.data*);
@@ -224,19 +225,19 @@ SECTIONS
    END_SEG(main)
    BEGIN_NOLOAD(main)
    {
-      BUILD_DIR/src/boot*.o(.*bss*);
-      BUILD_DIR/src/hvqm*.o(.*bss*);
-      BUILD_DIR/src/usb*.o(.*bss*);
-      BUILD_DIR/src/audio*.o(.*bss*);
+      BUILD_DIR/src/boot*.o(.bss*);
+      BUILD_DIR/src/hvqm*.o(.bss*);
+      BUILD_DIR/src/usb*.o(.bss*);
+      BUILD_DIR/src/audio*.o(.bss*);
 #ifdef S2DEX_TEXT_ENGINE
-      BUILD_DIR/src/s2d_engine*.o(.*bss*);
+      BUILD_DIR/src/s2d_engine*.o(.bss*);
 #endif
 #ifdef LIBPL
-      BUILD_DIR/lib/libpl*.o(.*bss*);
+      BUILD_DIR/lib/libpl*.o(.bss*);
 #endif
       *ULTRALIB.a:*.o(COMMON);
       *ULTRALIB.a:*.o(.scommon);
-      *ULTRALIB.a:*.o(.*bss*);
+      *ULTRALIB.a:*.o(.bss*);
       */libhvqm2.a:*.o(.bss*);
       */libz.a:*.o(.bss*);
       . = ALIGN(0x8);
@@ -263,10 +264,6 @@ SECTIONS
       BUILD_DIR/src/game*.o(.data*);
       BUILD_DIR/src/engine*.o(.data*);
       BUILD_DIR/src/usb*.o(.data*);
-      /* sdata */
-      BUILD_DIR/src/game*.o(.sdata*);
-      BUILD_DIR/src/engine*.o(.sdata*);
-      BUILD_DIR/src/usb*.o(.data*);
       /* rodata */
       BUILD_DIR/src/game*.o(.rodata*);
       BUILD_DIR/src/engine*.o(.rodata*);
@@ -276,13 +273,36 @@ SECTIONS
    END_SEG(engine)
    BEGIN_NOLOAD(engine)
    {
-      BUILD_DIR/src/game*.o(.*bss*);
+      BUILD_DIR/src/game*.o(.bss*);
       BUILD_DIR/src/engine*.o(.bss*);
       . = ALIGN(0x40);
    }
    END_NOLOAD(engine)
 
-   . = _engineSegmentBssEnd;
+#ifdef SDATA
+   _gp = . + 0x8000;
+   BEGIN_SEG(sdata, .)
+   {
+      BUILD_DIR/src/game*.o(.sdata*);
+      BUILD_DIR/src/audio*.o(.sdata*);
+      BUILD_DIR/src/engine*.o(.sdata*);
+      BUILD_DIR/src/usb*.o(.sdata*);
+      BUILD_DIR/src/menu*.o(.sdata*);
+      . = ALIGN(0x10);
+   }
+   END_SEG(sdata)
+   BEGIN_NOLOAD(sbss)
+   {
+      BUILD_DIR/src/game*.o(.sbss*);
+      BUILD_DIR/src/audio*.o(.sbss*);
+      BUILD_DIR/src/engine*.o(.sbss*);
+      BUILD_DIR/src/usb*.o(.sbss*);
+      BUILD_DIR/src/menu*.o(.sbss*);
+      . = ALIGN(0x40);
+   }
+   END_NOLOAD(sbss)
+#endif
+
    BEGIN_NOLOAD(framebuffers)
    {
       BUILD_DIR/src/buffers/framebuffers.o(.bss*);
@@ -409,7 +429,7 @@ SECTIONS
    /* 0x268020 0x268020-0 [0] */
    BEGIN_SEG(intro, 0x14000000)
    {
-      KEEP(BUILD_DIR/levels/intro/script.o(.*data));
+      KEEP(BUILD_DIR/levels/intro/script.o(.data*));
       KEEP(BUILD_DIR/levels/intro/script.o(.rodata*));
       KEEP(BUILD_DIR/levels/intro/script.o(.text*));
       KEEP(BUILD_DIR/levels/intro/geo.o(.data*));

src/boot/main.c

@@ -342,11 +342,18 @@ void check_stack_validity(void) {
 }
 #endif
 
-
+#ifdef SDATA
+extern void load_sdata(void);
+#else
+#define load_sdata()
+#endif
 extern void crash_screen_init(void);
 extern OSViMode VI;
+
 void thread3_main(UNUSED void *arg) {
+    setgp();
     setup_mesg_queues();
+    load_sdata();
     alloc_pool();
     load_engine_code_segment();
     detect_emulator();
@@ -504,6 +511,8 @@ void change_vi(OSViMode *mode, int width, int height) {
 }
 
 void get_audio_frequency(void) {
+    gConfig.audioFrequency = 1.0f;
+
     switch (gConfig.tvType) {
 #if defined(VERSION_JP) || defined(VERSION_US)
     case MODE_NTSC: gConfig.audioFrequency = 1.0f;    break;
@@ -521,6 +530,7 @@ void get_audio_frequency(void) {
  * Initialize hardware, start main thread, then idle.
  */
 void thread1_idle(UNUSED void *arg) {
+    setgp();
     osCreateViManager(OS_PRIORITY_VIMGR);
     switch (osTvType) {
         case OS_TV_NTSC:
@@ -579,6 +589,7 @@ void osInitialize_fakeisv() {
 #endif
 
 void main_func(void) {
+    setgp();
     ClearRAM();
     __osInitialize_common();
 #ifdef ISVPRINT

src/boot/memory.c

@@ -421,6 +421,23 @@ void *load_segment_decompress(s32 segment, u8 *srcStart, u8 *srcEnd) {
     return dest;
 }
 
+#ifdef SDATA
+extern u8 _gp[];
+extern u8 _sdataSegmentStart[];
+extern u8 _sdataSegmentEnd[];
+extern u8 _sdataSegmentRomStart[];
+extern u8 _sdataSegmentRomEnd[];
+void load_sdata(void) {
+    void *startAddr = (void *) _sdataSegmentStart;
+    u32 totalSize = _sdataSegmentEnd - _sdataSegmentStart;
+
+    bzero(startAddr, totalSize);
+    osWritebackDCacheAll();
+    dma_read(startAddr, _sdataSegmentRomStart, _sdataSegmentRomEnd);
+    osInvalDCache(startAddr, totalSize);
+}
+#endif
+
 void load_engine_code_segment(void) {
     void *startAddr = (void *) _engineSegmentStart;
     u32 totalSize = _engineSegmentEnd - _engineSegmentStart;

src/engine/level_script.c

@@ -334,8 +334,8 @@ static void level_cmd_init_level(void) {
     sCurrentCmd = CMD_NEXT;
 }
 
-extern s32 gTlbEntries;
-extern u8  gTlbSegments[NUM_TLB_SEGMENTS];
+extern SECTION_DATA s32 gTlbEntries;
+extern SECTION_DATA u8  gTlbSegments[NUM_TLB_SEGMENTS];
 
 // This clears all the temporary bank TLB maps. group0, common1 and behavourdata are always loaded,
 // and they're also loaded first, so that means we just leave the first 3 indexes mapped.

src/game/crash_screen.c

@@ -402,6 +402,7 @@ extern struct SequenceQueueItem sBackgroundMusicQueue[6];
 void thread2_crash_screen(UNUSED void *arg) {
     OSMesg mesg;
     OSThread *thread = NULL;
+    setgp();
 
     osSetEventMesg(OS_EVENT_CPU_BREAK, &gCrashScreen.mesgQueue, (OSMesg) 1);
     osSetEventMesg(OS_EVENT_FAULT,     &gCrashScreen.mesgQueue, (OSMesg) 2);

src/game/debug.h

@@ -40,9 +40,9 @@ void try_print_debug_mario_level_info(void);
 #define try_print_debug_mario_level_info()
 #endif
 
-extern char *__n64Assert_Filename;
-extern u32   __n64Assert_LineNum;
-extern char *__n64Assert_Message;
+extern SECTION_DATA char *__n64Assert_Filename;
+extern SECTION_DATA u32   __n64Assert_LineNum;
+extern SECTION_DATA char *__n64Assert_Message;
 extern void __n64Assert(char *fileName, u32 lineNum, char *message);
 
 /**

src/game/emutest.c

@@ -14,9 +14,9 @@
 #include "lib/libpl/libpl-emu.h"
 #endif
 
-extern OSMesgQueue gSIEventMesgQueue;
-extern u8 __osContPifRam[];
-extern u8 __osContLastCmd;
+extern SECTION_DATA OSMesgQueue gSIEventMesgQueue;
+extern SECTION_DATA u8 __osContPifRam[];
+extern SECTION_DATA u8 __osContLastCmd;
 extern void __osSiGetAccess(void);
 extern void __osSiRelAccess(void);
 extern void __osPiGetAccess(void);

src/game/envfx_snow.c

@@ -51,9 +51,9 @@ struct SnowFlakeVertex gSnowFlakeVertex1 = { -5, 5, 0 };
 struct SnowFlakeVertex gSnowFlakeVertex2 = { -5, -5, 0 };
 struct SnowFlakeVertex gSnowFlakeVertex3 = { 5, 5, 0 };
 
-extern void *tiny_bubble_dl_0B006AB0;
-extern void *tiny_bubble_dl_0B006A50;
-extern void *tiny_bubble_dl_0B006CD8;
+extern SECTION_DATA void *tiny_bubble_dl_0B006AB0;
+extern SECTION_DATA void *tiny_bubble_dl_0B006A50;
+extern SECTION_DATA void *tiny_bubble_dl_0B006CD8;
 
 /**
  * Initialize snow particles by allocating a buffer for storing their state

src/game/game_init.c

@@ -762,6 +762,7 @@ void setup_game_memory(void) {
  * Main game loop thread. Runs forever as long as the game continues.
  */
 void thread5_game_loop(UNUSED void *arg) {
+    setgp();
     setup_game_memory();
 #if ENABLE_RUMBLE
     init_rumble_pak_scheduler_queue();

src/game/gamecube_controller.c

@@ -165,7 +165,7 @@ typedef struct
     /* 0xC */ u8 l_trig;
     /* 0xD */ u8 r_trig;
 } __OSContGCNShortPollFormat;
-extern u8 __osContLastCmd;
+extern SECTION_DATA u8 __osContLastCmd;
 u8 __osGamecubeRumbleEnabled[MAXCONTROLLERS];
 
 typedef struct
@@ -370,9 +370,9 @@ static u16 __osTranslateGCNButtons(u16 input, s32 c_stick_x, s32 c_stick_y) {
 
 extern s32 __osContinitialized;
 
-extern OSPifRam __osContPifRam;
-extern u8 __osContLastCmd;
-extern u8 __osMaxControllers;
+extern SECTION_DATA OSPifRam __osContPifRam;
+extern SECTION_DATA u8 __osContLastCmd;
+extern SECTION_DATA u8 __osMaxControllers;
 extern u8 __osGamecubeRumbleEnabled[MAXCONTROLLERS];
 
 extern OSTimer __osEepromTimer;

src/game/geo_misc.c

@@ -28,7 +28,7 @@
  */
 
 #define NUM_FLYING_CARPET_VERTICES 21
-extern const s16 flying_carpet_static_vertex_data[NUM_FLYING_CARPET_VERTICES];
+extern SECTION_DATA const s16 flying_carpet_static_vertex_data[NUM_FLYING_CARPET_VERTICES];
 
 static s16 sCurAreaTimer = 1;
 static s16 sPrevAreaTimer = 0;

src/game/hud.c

@@ -493,6 +493,8 @@ void set_hud_camera_status(s16 status) {
     sCameraHUD.status = status;
 }
 
+extern SECTION_DATA Texture *main_hud_camera_lut[];
+
 /**
  * Renders camera HUD glyphs using a table list, depending of
  * the camera status called, a defined glyph is rendered.

src/game/main.h

@@ -47,7 +47,7 @@ struct RumbleSettings {
     s16 decay;
 };
 
-extern struct Config gConfig;
+extern SECTION_BSS struct Config gConfig;
 
 // extern OSThread gUnkThread;
 extern OSThread gIdleThread;
@@ -73,10 +73,10 @@ extern OSMesg gPIMesgBuf[32];
 extern OSMesg gSIEventMesgBuf[1];
 extern OSMesg gIntrMesgBuf[16];
 extern OSMesg gUnknownMesgBuf[16];
-extern OSIoMesg gDmaIoMesg;
-extern OSMesg gMainReceivedMesg;
-extern OSMesgQueue gDmaMesgQueue;
-extern OSMesgQueue gSIEventMesgQueue;
+extern SECTION_BSS OSIoMesg gDmaIoMesg;
+extern SECTION_BSS OSMesg gMainReceivedMesg;
+extern SECTION_BSS OSMesgQueue gDmaMesgQueue;
+extern SECTION_BSS OSMesgQueue gSIEventMesgQueue;
 #if ENABLE_RUMBLE
 extern OSMesg gRumblePakSchedulerMesgBuf[1];
 extern OSMesg gRumbleThreadVIMesgBuf[1];
@@ -88,13 +88,13 @@ extern struct RumbleSettings gCurrRumbleSettings;
 extern struct VblankHandler *gVblankHandler1;
 extern struct VblankHandler *gVblankHandler2;
 extern struct SPTask *gActiveSPTask;
-extern s8 gAudioEnabled;
-extern u32 gNumVblanks;
-extern s8 gResetTimer;
-extern s8 gNmiResetBarsTimer;
-extern s8 gDebugLevelSelect;
+extern SECTION_DATA s8 gAudioEnabled;
+extern SECTION_BSS u32 gNumVblanks;
+extern SECTION_BSS s8 gResetTimer;
+extern SECTION_BSS s8 gNmiResetBarsTimer;
+extern SECTION_BSS s8 gDebugLevelSelect;
 #ifdef VANILLA_DEBUG
-extern s8 gShowDebugText;
+extern SECTION_DATA s8 gShowDebugText;
 #endif
 
 // Special struct that keeps track of whether its timer has been set.
@@ -112,4 +112,10 @@ void dispatch_audio_sptask(struct SPTask *spTask);
 void exec_display_list(struct SPTask *spTask);
 void change_vi(OSViMode *mode, int width, int height);
 
+#ifdef SDATA
+void setgp(void);
+#else
+#define setgp()
+#endif
+
 #endif // MAIN_H

src/game/map_parser.c

@@ -2,6 +2,7 @@
 #include <PR/os_internal_error.h>
 #include <stdarg.h>
 #include <string.h>
+#include "macros.h"
 #include "segments.h"
 
 #define STACK_TRAVERSAL_LIMIT 100
@@ -14,7 +15,7 @@ struct MapEntry {
 };
 extern u8 gMapStrings[];
 extern struct MapEntry gMapEntries[];
-extern u32 gMapEntrySize;
+extern SECTION_DATA u32 gMapEntrySize;
 extern u8 _mapDataSegmentRomStart[];