RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

split memories away from Pico

Browse source 
saves ~3k of code on ARM because Pico no longer crosses ldr limit
This commit is contained in:
notaz 2017-10-05 02:06:21 +03:00
parent e64886365d
commit 88fd63ad10
30 changed files with 633 additions and 587 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/common/common.mak
View file

@ -49,7 +49,7 @@ SRCS_COMMON += $(R)pico/draw_arm.S $(R)pico/draw2_arm.S
endif
ifeq "$(asm_memory)" "1"
DEFINES += _ASM_MEMORY_C
SRCS_COMMON += $(R)pico/memory_arm.s
SRCS_COMMON += $(R)pico/memory_arm.S
endif
ifeq "$(asm_ym2612)" "1"
DEFINES += _ASM_YM2612_C
@ -62,7 +62,7 @@ SRCS_COMMON += $(R)pico/cd/misc_arm.s
endif
ifeq "$(asm_cdmemory)" "1"
DEFINES += _ASM_CD_MEMORY_C
SRCS_COMMON += $(R)pico/cd/memory_arm.s
SRCS_COMMON += $(R)pico/cd/memory_arm.S
endif
ifeq "$(asm_32xdraw)" "1"
DEFINES += _ASM_32X_DRAW

16
platform/common/emu.c
View file

@ -889,7 +889,7 @@ int emu_save_load_game(int load, int sram)
{
if (PicoOpt & POPT_EN_MCD_RAMCART) {
sram_size = 0x12000;
sram_data = SRam.data;
sram_data = Pico.sv.data;
if (sram_data)
memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);
} else {
@ -898,11 +898,11 @@ int emu_save_load_game(int load, int sram)
truncate = 0; // the .brm may contain RAM cart data after normal brm
}
} else {
sram_size = SRam.size;
sram_data = SRam.data;
sram_size = Pico.sv.size;
sram_data = Pico.sv.data;
}
if (sram_data == NULL)
return 0; // SRam forcefully disabled for this game
return 0; // cart saves forcefully disabled for this game
if (load)
{
@ -1262,9 +1262,9 @@ void emu_init(void)
void emu_finish(void)
{
// save SRAM
if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && Pico.sv.changed) {
emu_save_load_game(0, 1);
SRam.changed = 0;
Pico.sv.changed = 0;
}
if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG)) {
@ -1514,10 +1514,10 @@ void emu_loop(void)
emu_set_fastforward(0);
// save SRAM
if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && Pico.sv.changed) {
plat_status_msg_busy_first("Writing SRAM/BRAM...");
emu_save_load_game(0, 1);
SRam.changed = 0;
Pico.sv.changed = 0;
}
pemu_loop_end();