lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove gpsp savegame method in favour of libretro's one 

This generates 128KB save files (instead of variable sized ones) to
prevent truncated savegames under some circumstances. Most other
emulators have no trouble loading them (and the unused data is simply
ignored).

Remove also config txt file that's now unused.
This commit is contained in:
David Guillen Fandos 2023-09-14 21:46:57 +02:00
parent bcd062ea1b
commit f0bacff91a
6 changed files with 9 additions and 1340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1143
game_config.txt
View File

File diff suppressed because it is too large Load Diff

132
gba_memory.c
View File

@ -384,7 +384,6 @@ u32 gbc_sound_wave_update = 0;
// Keep it 32KB until the upper 64KB is accessed, then make it 64KB.
u32 backup_type = BACKUP_NONE;
u32 sram_bankcount = SRAM_SIZE_32KB;
u32 flash_mode = FLASH_BASE_MODE;
u32 flash_command_position = 0;
@ -1032,7 +1031,6 @@ void function_cc write_backup(u32 address, u32 value)
if(backup_type == BACKUP_NONE)
backup_type = BACKUP_SRAM;
// gamepak SRAM or Flash ROM
if((address == 0x5555) && (flash_mode != FLASH_WRITE_MODE))
{
@ -1085,7 +1083,7 @@ void function_cc write_backup(u32 address, u32 value)
// Erase chip
if(flash_mode == FLASH_ERASE_MODE)
{
memset(gamepak_backup, 0xFF, 1024 * 64 * flash_bank_cnt);
memset(gamepak_backup, 0xFF, 1024 * 128);
flash_mode = FLASH_BASE_MODE;
}
break;
@ -1137,9 +1135,6 @@ void function_cc write_backup(u32 address, u32 value)
if(backup_type == BACKUP_SRAM)
{
// Write value to SRAM
// Hit 64KB territory?
if(address >= 0x8000)
sram_bankcount = SRAM_SIZE_64KB;
gamepak_backup[address] = value;
}
}
@ -1555,104 +1550,6 @@ cpu_alert_type function_cc write_memory32(u32 address, u32 value)
return CPU_ALERT_NONE;
}
char backup_filename[512];
u32 load_backup(char *name)
{
RFILE *fd = filestream_open(name, RETRO_VFS_FILE_ACCESS_READ,
RETRO_VFS_FILE_ACCESS_HINT_NONE);
if(fd)
{
int64_t backup_size = filestream_get_size(fd);
filestream_read(fd, gamepak_backup, backup_size);
filestream_close(fd);
// The size might give away what kind of backup it is.
switch(backup_size)
{
case 0x200:
backup_type = BACKUP_EEPROM;
eeprom_size = EEPROM_512_BYTE;
break;
case 0x2000:
backup_type = BACKUP_EEPROM;
eeprom_size = EEPROM_8_KBYTE;
break;
case 0x8000:
backup_type = BACKUP_SRAM;
sram_bankcount = SRAM_SIZE_32KB;
break;
// Could be either flash or SRAM, go with flash
case 0x10000:
backup_type = BACKUP_FLASH;
sram_bankcount = SRAM_SIZE_64KB;
break;
case 0x20000:
backup_type = BACKUP_FLASH;
flash_bank_cnt = FLASH_SIZE_128KB;
break;
}
return 1;
}
else
{
backup_type = BACKUP_NONE;
memset(gamepak_backup, 0xFF, 1024 * 128);
}
return 0;
}
u32 save_backup(char *name)
{
if(backup_type != BACKUP_NONE)
{
RFILE *fd = filestream_open(name, RETRO_VFS_FILE_ACCESS_WRITE,
RETRO_VFS_FILE_ACCESS_HINT_NONE);
if(fd)
{
u32 backup_size = 0;
switch(backup_type)
{
case BACKUP_SRAM:
backup_size = 0x8000 * sram_bankcount;
break;
case BACKUP_FLASH:
backup_size = 0x10000 * flash_bank_cnt;
break;
case BACKUP_EEPROM:
backup_size = 0x200 * eeprom_size;
break;
default:
break;
}
filestream_write(fd, gamepak_backup, backup_size);
filestream_close(fd);
return 1;
}
}
return 0;
}
void update_backup(void)
{
if (!use_libretro_save_method)
save_backup(backup_filename);
}
typedef struct
{
char gamepak_title[13];
@ -2383,7 +2280,6 @@ void init_memory(void)
backup_type = BACKUP_NONE;
sram_bankcount = SRAM_SIZE_32KB;
//flash_size = FLASH_SIZE_64KB;
flash_bank_num = 0;
@ -2417,9 +2313,8 @@ void memory_term(void)
bool memory_check_savestate(const u8 *src)
{
static const char *vars32[] = {
"backup-type", "sram-size",
"flash-mode", "flash-cmd-pos", "flash-bank-num", "flash-dev-id", "flash-size",
"eeprom-size", "eeprom-mode", "eeprom-addr", "eeprom-counter",
"backup-type","flash-mode", "flash-cmd-pos", "flash-bank-num", "flash-dev-id",
"flash-size", "eeprom-size", "eeprom-mode", "eeprom-addr", "eeprom-counter",
"rtc-state", "rtc-write-mode", "rtc-cmd", "rtc-status", "rtc-data-byte-cnt", "rtc-bit-cnt",
};
static const char *dmavars32[] = {
@ -2484,7 +2379,6 @@ bool memory_read_savestate(const u8 *src)
bson_read_bytes(memdoc, "ioregs", io_registers, sizeof(io_registers)) &&
bson_read_int32(bakdoc, "backup-type", &backup_type) &&
bson_read_int32(bakdoc, "sram-size", &sram_bankcount) &&
bson_read_int32(bakdoc, "flash-mode", &flash_mode) &&
bson_read_int32(bakdoc, "flash-cmd-pos", &flash_command_position) &&
@ -2544,7 +2438,6 @@ unsigned memory_write_savestate(u8 *dst)
bson_start_document(dst, "backup", wbptr);
bson_write_int32(dst, "backup-type", (u32)backup_type);
bson_write_int32(dst, "sram-size", sram_bankcount);
bson_write_int32(dst, "flash-mode", flash_mode);
bson_write_int32(dst, "flash-cmd-pos", flash_command_position);
@ -2634,30 +2527,11 @@ static s32 load_gamepak_raw(const char *name)
u32 load_gamepak(const struct retro_game_info* info, const char *name)
{
char *p;
char gamepak_filename[512];
gamepak_info_t gpinfo;
if (load_gamepak_raw(name))
return -1;
strncpy(gamepak_filename, name, sizeof(gamepak_filename));
gamepak_filename[sizeof(gamepak_filename) - 1] = 0;
p = strrchr(gamepak_filename, PATH_SEPARATOR_CHAR);
if (p)
p++;
else
p = gamepak_filename;
snprintf(backup_filename, sizeof(backup_filename), "%s%c%s", save_path, PATH_SEPARATOR_CHAR, p);
p = strrchr(backup_filename, '.');
if (p)
strcpy(p, ".sav");
if (!use_libretro_save_method)
load_backup(backup_filename);
// Buffer 0 always has the first 1MB chunk of the ROM
memset(&gpinfo, 0, sizeof(gpinfo));
memcpy(gpinfo.gamepak_title, &gamepak_buffers[0][0xA0], 12);

3
gba_memory.h
View File

@ -21,7 +21,6 @@
#define MEMORY_H
#include "libretro.h"
extern int use_libretro_save_method;
#define DMA_CHAN_CNT 4
@ -239,9 +238,7 @@ extern char gamepak_filename[512];
cpu_alert_type dma_transfer(unsigned dma_chan, int *cycles);
u8 *memory_region(u32 address, u32 *memory_limit);
u32 load_gamepak(const struct retro_game_info* info, const char *name);
u32 load_backup(char *name);
s32 load_bios(char *name);
void update_backup(void);
void init_memory(void);
void init_gamepak_buffer(void);
bool gamepak_must_swap(void);

69
libretro/libretro.c
View File

@ -88,7 +88,6 @@ static retro_environment_t environ_cb;
struct retro_perf_callback perf_cb;
int dynarec_enable;
int use_libretro_save_method = 0;
boot_mode selected_boot_mode = boot_game;
int sprite_limit = 1;
@ -676,7 +675,6 @@ void retro_set_controller_port_device(unsigned port, unsigned device) {}
void retro_reset(void)
{
update_backup();
reset_gba();
}
@ -875,19 +873,6 @@ static void check_variables(int started_from_load)
(post_process_mix != post_process_mix_prev))
init_post_processing();
if (started_from_load)
{
var.key = "gpsp_save_method";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (!strcmp(var.value, "libretro"))
use_libretro_save_method = 1;
else
use_libretro_save_method = 0;
}
}
var.key = "gpsp_turbo_period";
var.value = NULL;
turbo_period = TURBO_PERIOD_MIN;
@ -971,7 +956,6 @@ bool retro_load_game(const struct retro_game_info* info)
if (!info)
return false;
use_libretro_save_method = 0;
check_variables(1);
set_input_descriptors();
@ -984,11 +968,6 @@ bool retro_load_game(const struct retro_game_info* info)
extract_directory(main_path, info->path, sizeof(main_path));
if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir)
strcpy(save_path, dir);
else
strcpy(save_path, main_path);
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
strcpy(filename_bios, dir);
else
@ -1020,7 +999,7 @@ bool retro_load_game(const struct retro_game_info* info)
memcpy(bios_rom, open_gba_bios_rom, sizeof(bios_rom));
}
memset(gamepak_backup, -1, sizeof(gamepak_backup));
memset(gamepak_backup, 0xff, sizeof(gamepak_backup));
if (load_gamepak(info, info->path) != 0)
{
error_msg("Could not load the game file.");
@ -1042,8 +1021,6 @@ bool retro_load_game_special(unsigned game_type,
void retro_unload_game(void)
{
update_backup();
if (libretro_ff_enabled)
set_fastforward_override(false);
@ -1065,50 +1042,16 @@ unsigned retro_get_region(void)
void* retro_get_memory_data(unsigned id)
{
switch (id)
{
case RETRO_MEMORY_SAVE_RAM:
if (use_libretro_save_method)
return gamepak_backup;
break;
default:
break;
}
if (id == RETRO_MEMORY_SAVE_RAM)
return gamepak_backup;
return 0;
return NULL;
}
size_t retro_get_memory_size(unsigned id)
{
switch (id)
{
case RETRO_MEMORY_SAVE_RAM:
if (use_libretro_save_method)
{
switch(backup_type)
{
case BACKUP_SRAM:
return sram_bankcount * 0x8000;
case BACKUP_FLASH:
return 0x10000 * flash_bank_cnt;
case BACKUP_EEPROM:
return 0x200 * eeprom_size;
// assume 128KB save, regardless if rom supports battery saves
// this is needed because gba cannot provide initially the backup save size
// until a few cycles has passed (unless provided by a database)
case BACKUP_NONE:
default:
return (1024 * 128);
break;
}
}
break;
default:
break;
}
if (id == RETRO_MEMORY_SAVE_RAM)
return 0x20000; /* Assume 128KiB, biggest possible save */
return 0;
}

1
main.c
View File

@ -32,7 +32,6 @@ u32 gbc_update_count = 0;
u32 oam_update_count = 0;
char main_path[512];
char save_path[512];
void trigger_ext_event(void);

1
main.h
View File

@ -75,7 +75,6 @@ extern u32 skip_next_frame;
extern u32 flush_ram_count;
extern char main_path[512];
extern char save_path[512];
#define cycles_to_run(c) ((c) & 0x7FFF)
#define completed_frame(c) ((c) & 0x80000000)