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

GB, GBA: Clean up some corner cases with ROM fd closing

This commit is contained in:
Vicki Pfau 2024-10-08 04:34:30 -07:00
parent 7e474db93a
commit eaf45b9ab8
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gb/gb.c
View File

@ -483,12 +483,10 @@ void GBApplyPatch(struct GB* gb, struct Patch* patch) {
mappedMemoryFree(newRom, GB_SIZE_CART_MAX); mappedMemoryFree(newRom, GB_SIZE_CART_MAX);
return; return;
} }
if (gb->romVf) { if (gb->romVf && gb->isPristine) {
#ifndef FIXED_ROM_BUFFER #ifndef FIXED_ROM_BUFFER
gb->romVf->unmap(gb->romVf, gb->memory.rom, gb->pristineRomSize); gb->romVf->unmap(gb->romVf, gb->memory.rom, gb->pristineRomSize);
#endif #endif
gb->romVf->close(gb->romVf);
gb->romVf = NULL;
} }
gb->isPristine = false; gb->isPristine = false;
if (gb->memory.romBase == gb->memory.rom) { if (gb->memory.romBase == gb->memory.rom) {

2
src/gb/memory.c
View File

@ -1017,8 +1017,6 @@ void _pristineCow(struct GB* gb) {
} }
if (gb->romVf) { if (gb->romVf) {
gb->romVf->unmap(gb->romVf, gb->memory.rom, gb->memory.romSize); gb->romVf->unmap(gb->romVf, gb->memory.rom, gb->memory.romSize);
gb->romVf->close(gb->romVf);
gb->romVf = NULL;
} }
gb->memory.rom = newRom; gb->memory.rom = newRom;
GBMBCSwitchBank(gb, gb->memory.currentBank); GBMBCSwitchBank(gb, gb->memory.currentBank);

3
src/gba/core.c
View File

@ -668,6 +668,9 @@ static size_t _GBACoreROMSize(const struct mCore* core) {
if (gba->romVf) { if (gba->romVf) {
return gba->romVf->size(gba->romVf); return gba->romVf->size(gba->romVf);
} }
if (gba->mbVf) {
return gba->mbVf->size(gba->mbVf);
}
return gba->pristineRomSize; return gba->pristineRomSize;
} }

6
src/gba/gba.c
View File

@ -557,16 +557,14 @@ void GBAApplyPatch(struct GBA* gba, struct Patch* patch) {
mappedMemoryFree(newRom, GBA_SIZE_ROM0); mappedMemoryFree(newRom, GBA_SIZE_ROM0);
return; return;
} }
if (gba->romVf) { if (gba->memory.rom) {
#ifndef FIXED_ROM_BUFFER #ifndef FIXED_ROM_BUFFER
if (!gba->isPristine) { if (!gba->isPristine) {
mappedMemoryFree(gba->memory.rom, GBA_SIZE_ROM0); mappedMemoryFree(gba->memory.rom, gba->memory.romSize);
} else { } else {
gba->romVf->unmap(gba->romVf, gba->memory.rom, gba->pristineRomSize); gba->romVf->unmap(gba->romVf, gba->memory.rom, gba->pristineRomSize);
} }
#endif #endif
gba->romVf->close(gba->romVf);
gba->romVf = NULL;
} }
gba->isPristine = false; gba->isPristine = false;
gba->memory.rom = newRom; gba->memory.rom = newRom;

2
src/gba/memory.c
View File

@ -1894,8 +1894,6 @@ void _pristineCow(struct GBA* gba) {
} }
if (gba->romVf) { if (gba->romVf) {
gba->romVf->unmap(gba->romVf, gba->memory.rom, gba->memory.romSize); gba->romVf->unmap(gba->romVf, gba->memory.rom, gba->memory.romSize);
gba->romVf->close(gba->romVf);
gba->romVf = NULL;
} }
gba->memory.rom = newRom; gba->memory.rom = newRom;
gba->memory.hw.gpioBase = &((uint16_t*) gba->memory.rom)[GPIO_REG_DATA >> 1]; gba->memory.hw.gpioBase = &((uint16_t*) gba->memory.rom)[GPIO_REG_DATA >> 1];