GBA: Fixed compilation on all targets

Author: ducalex

gbsp/components/gbsp-libretro/CMakeLists.txt

@@ -3,9 +3,10 @@ set(COMPONENT_ADD_INCLUDEDIRS ". libretro/libretro-common/include")
 set(COMPONENT_REQUIRES "retro-go")
 register_component()
 rg_setup_compile_options(
-    -O2
+    -O3
     -fomit-frame-pointer -ffast-math
     -DOVERCLOCK_60FPS
+    -DROM_BUFFER_SIZE=2
     -Wno-unused-variable
     -Wno-implicit-fallthrough
     -Wno-missing-field-initializers

gbsp/components/gbsp-libretro/cpu.cpp

@@ -1450,13 +1450,15 @@ u32 reg[64];
 u32 spsr[6];
 u32 reg_mode[7][7];
 
-EXT_RAM_ATTR u8 *memory_map_read [8 * 1024];
 u16 oam_ram[512];
 u16 palette_ram[512];
 u16 palette_ram_converted[512];
-EXT_RAM_ATTR u8 ewram[1024 * 256 * 2];
-EXT_RAM_ATTR u8 iwram[1024 * 32 * 2];
-EXT_RAM_ATTR u8 vram[1024 * 96];
+#ifndef RETRO_GO
+u8 ewram[1024 * 256 * 2];
+u8 iwram[1024 * 32 * 2];
+u8 vram[1024 * 96];
+u8 *memory_map_read[8 * 1024];
+#endif
 u16 io_registers[512];
 #endif
 

gbsp/components/gbsp-libretro/gba_memory.c

@@ -336,11 +336,12 @@ const u32 def_seq_cycles[16][2] =
   { 9, 17 }, // Gamepak (wait 2)
 };
 
-
-EXT_RAM_ATTR u8 bios_rom[1024 * 16];
+#ifndef RETRO_GO
+u8 bios_rom[1024 * 16];
 
 // Up to 128kb, store SRAM, flash ROM, or EEPROM here.
-EXT_RAM_ATTR u8 gamepak_backup[1024 * 128];
+u8 gamepak_backup[1024 * 128];
+#endif
 
 u32 dma_bus_val;
 dma_transfer_type dma[4];

gbsp/components/gbsp-libretro/gba_memory.h

@@ -258,7 +258,6 @@ extern u32 oam_update;
 extern u32 gbc_sound_wave_update;
 extern dma_transfer_type dma[DMA_CHAN_CNT];
 
-extern const u8 open_gba_bios_rom[1024*16];
 extern u16 palette_ram[512];
 extern u16 oam_ram[512];
 extern u16 palette_ram_converted[512];
@@ -328,4 +327,32 @@ bool memory_check_savestate(const u8*src);
 bool memory_read_savestate(const u8*src);
 unsigned memory_write_savestate(u8 *dst);
 
+
+#ifdef RETRO_GO
+// We wrap certain globals to move them under a dynamic allocation, whilst still preserving the functionality
+// of any code treating them as fixed arrays. This results in very minimal code changes to the rest of gbSP.
+typedef struct
+{
+  // TODO: Evaluate what is best left in internal memory for performance reasons (for the few that could fit)
+  u8 vram[1024 * 96];
+  u8 bios_rom[1024 * 16];
+  u8 ewram[1024 * 256 * 2];
+  u8 iwram[1024 * 32 * 2];
+  u8 *memory_map_read[8 * 1024];
+  u8 gamepak_backup[1024 * 128];
+  // There's also stuff from video.cpp to consider:
+  // u8 obj_priority_list[5][160][128];
+  // u8 obj_priority_count[5][160];
+  // u8 obj_alpha_count[160];
+} gbsp_memory_t;
+
+extern gbsp_memory_t *gbsp_memory;
+#define vram gbsp_memory->vram
+#define bios_rom gbsp_memory->bios_rom
+#define ewram gbsp_memory->ewram
+#define iwram gbsp_memory->iwram
+#define memory_map_read gbsp_memory->memory_map_read
+#define gamepak_backup gbsp_memory->gamepak_backup
+#endif
+
 #endif

gbsp/components/gbsp-libretro/gpsp_config.h

@@ -8,7 +8,7 @@
 
 /* Default ROM buffer size in megabytes (this is a maximum value!) */
 #ifndef ROM_BUFFER_SIZE
-#define ROM_BUFFER_SIZE 2
+#define ROM_BUFFER_SIZE 32
 #endif
 
 /* Cache sizes and their config knobs */

gbsp/main/main.c

@@ -20,13 +20,16 @@ boot_mode selected_boot_mode = boot_game;
 u32 skip_next_frame = 0;
 int sprite_limit = 1;
 
+gbsp_memory_t *gbsp_memory;
+
 static rg_surface_t *updates[2];
 static rg_surface_t *currentUpdate;
 static rg_app_t *app;
 
 void netpacket_poll_receive()
 {
 }
+
 void netpacket_send(uint16_t client_id, const void *buf, size_t len)
 {
 }
@@ -95,11 +98,14 @@ void app_main(void)
 
     updates[0] = rg_surface_create(GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT + 1, RG_PIXEL_565_LE, MEM_FAST);
     updates[0]->height = GBA_SCREEN_HEIGHT;
+    // updates[1] = rg_surface_create(GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT + 1, RG_PIXEL_565_LE, MEM_FAST);
+    // updates[1]->height = GBA_SCREEN_HEIGHT;
     currentUpdate = updates[0];
 
     gba_screen_pixels = currentUpdate->data;
 
-    RG_LOGI("GBA");
+    gbsp_memory = rg_alloc(sizeof(*gbsp_memory), MEM_ANY);
+    RG_LOGI("gbsp_memory=%p", gbsp_memory);
 
     libretro_supports_bitmasks = true;
     retro_set_input_state(input_cb);

rg_tool.py

@@ -21,7 +21,7 @@
   'prboom-go':    [0, 0, 851968],
   'gwenesis':     [0, 0, 983040],
   'fmsx':         [0, 0, 589824],
-  'gbsp':         [0, 0, 589824],
+  'gbsp':         [0, 0, 851968],
 }
 # PROJECT_APPS = {}
 # for t in glob.glob("*/CMakeLists.txt"):