GBA: Do not allocate BIOS when using built-in one

Saves 16KB

Author: ducalex

gbsp/main/bios.h renamed to gbsp/components/gbsp-libretro/bios/open_gba_bios.h

@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "streams/file_stream.h"
+#include "bios/open_gba_bios.h"
 
 /* Sound */
 #define gbc_sound_tone_control_low(channel, regn)                             \
@@ -336,9 +337,10 @@ const u32 def_seq_cycles[16][2] =
   { 9, 17 }, // Gamepak (wait 2)
 };
 
-#ifndef RETRO_GO
-u8 bios_rom[1024 * 16];
+static u8 *bios_rom_alloc; // [1024 * 16];
+const u8 *bios_rom = open_gba_bios_rom; // [1024 * 16];
 
+#ifndef RETRO_GO
 // Up to 128kb, store SRAM, flash ROM, or EEPROM here.
 u8 gamepak_backup[1024 * 128];
 #endif
@@ -2578,13 +2580,21 @@ u32 load_gamepak(const struct retro_game_info* info, const char *name,
 s32 load_bios(char *name)
 {
   FILE *fd = fopen(name, "rb");
-
-  if(!fd)
+  if (!fd)
     return -1;
 
-  fread(bios_rom, 0x4000, 1, fd);
+  if (!bios_rom_alloc)
+    bios_rom_alloc = malloc(0x4000);
+
+  if (bios_rom_alloc && fread(bios_rom_alloc, 0x4000, 1, fd))
+  {
+    bios_rom = bios_rom_alloc;
+    fclose(fd);
+    return 0;
+  }
+fail:
   fclose(fd);
-  return 0;
+  return -1;
 }
 
 

gbsp/components/gbsp-libretro/gba_memory.c

@@ -271,7 +271,7 @@ extern u16 oam_ram[512];
 extern u16 palette_ram_converted[512];
 extern u16 io_registers[512];
 extern u8 vram[1024 * 96];
-extern u8 bios_rom[1024 * 16];
+extern const u8 *bios_rom; // [1024 * 16];
 // Double buffer used for SMC detection
 extern u8 ewram[(1024 * 256) << SMC_DETECTION];
 extern u8 iwram[(1024 * 32) << SMC_DETECTION];
@@ -343,7 +343,6 @@ 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) << SMC_DETECTION];
   u8 iwram[(1024 * 32) << SMC_DETECTION];
   u8 *memory_map_read[8 * 1024];
@@ -356,7 +355,6 @@ typedef struct
 
 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

gbsp/components/gbsp-libretro/gba_memory.h

@@ -11,8 +11,6 @@
 #define AUDIO_SAMPLE_RATE (GBA_SOUND_FREQUENCY)
 #define AUDIO_BUFFER_LENGTH (AUDIO_SAMPLE_RATE / 60 + 1)
 
-#include "bios.h"
-
 u32 idle_loop_target_pc = 0xFFFFFFFF;
 u32 translation_gate_target_pc[MAX_TRANSLATION_GATES];
 u32 translation_gate_targets = 0;
@@ -151,9 +149,7 @@ void app_main(void)
     retro_set_input_state(input_cb);
     init_gamepak_buffer();
     init_sound();
-
-    if (load_bios(RG_BASE_PATH_BIOS "/gba_bios.bin") != 0)
-        memcpy(bios_rom, open_gba_bios_rom, sizeof(bios_rom));
+    // load_bios(RG_BASE_PATH_BIOS "/gba_bios.bin");
 
     memset(gamepak_backup, 0xff, sizeof(gamepak_backup));
     if (load_gamepak(NULL, app->romPath, FEAT_DISABLE, FEAT_DISABLE, SERIAL_MODE_DISABLED) != 0)