ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB: Fix temporary saves

This commit is contained in:
Vicki Pfau 2022-01-20 22:15:03 -08:00
parent b127178377
commit ee68e9742d
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -25,6 +25,7 @@ Emulation fixes:
Other fixes: Other fixes:
- Core: Don't attempt to restore rewind diffs past start of rewind - Core: Don't attempt to restore rewind diffs past start of rewind
- FFmpeg: Fix crash when encoding audio with some containers - FFmpeg: Fix crash when encoding audio with some containers
- GB: Fix temporary saves
Misc: Misc:
- Core: Suspend runloop when a core crashes - Core: Suspend runloop when a core crashes
- GB Video: Add default SGB border - GB Video: Add default SGB border

20
src/gb/gb.c
View File

@ -202,6 +202,14 @@ void GBResizeSram(struct GB* gb, size_t size) {
if (gb->memory.sram) { if (gb->memory.sram) {
vf->unmap(vf, gb->memory.sram, gb->sramSize); vf->unmap(vf, gb->memory.sram, gb->sramSize);
} }
if (vf->size(vf) < gb->sramSize) {
void* sram = vf->map(vf, vf->size(vf), MAP_READ);
struct VFile* newVf = VFileMemChunk(sram, vf->size(vf));
vf->unmap(vf, sram,vf->size(vf));
vf = newVf;
gb->sramVf = newVf;
vf->truncate(vf, size);
}
gb->memory.sram = vf->map(vf, size, MAP_READ); gb->memory.sram = vf->map(vf, size, MAP_READ);
} }
if (gb->memory.sram == (void*) -1) { if (gb->memory.sram == (void*) -1) {
@ -239,10 +247,12 @@ void GBSramClean(struct GB* gb, uint32_t frameCount) {
if (gb->memory.mbcType == GB_MBC3_RTC) { if (gb->memory.mbcType == GB_MBC3_RTC) {
GBMBCRTCWrite(gb); GBMBCRTCWrite(gb);
} }
if (gb->memory.sram && gb->sramVf->sync(gb->sramVf, gb->memory.sram, gb->sramSize)) { if (gb->sramVf == gb->sramRealVf) {
mLOG(GB_MEM, INFO, "Savedata synced"); if (gb->memory.sram && gb->sramVf->sync(gb->sramVf, gb->memory.sram, gb->sramSize)) {
} else { mLOG(GB_MEM, INFO, "Savedata synced");
mLOG(GB_MEM, INFO, "Savedata failed to sync!"); } else {
mLOG(GB_MEM, INFO, "Savedata failed to sync!");
}
} }
size_t c; size_t c;
@ -263,7 +273,7 @@ void GBSavedataMask(struct GB* gb, struct VFile* vf, bool writeback) {
} }
gb->sramVf = vf; gb->sramVf = vf;
gb->sramMaskWriteback = writeback; gb->sramMaskWriteback = writeback;
gb->memory.sram = vf->map(vf, gb->sramSize, MAP_READ); GBResizeSram(gb, gb->sramSize);
GBMBCSwitchSramBank(gb, gb->memory.sramCurrentBank); GBMBCSwitchSramBank(gb, gb->memory.sramCurrentBank);
} }