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

GBA Memory: Better DMA address blacklisting

This commit is contained in:
Jeffrey Pfau 2015-11-06 21:08:50 -08:00
parent a9956087bc
commit b69e5392a1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gba/memory.c
View File

@ -1326,10 +1326,24 @@ void GBAAdjustWaitstates(struct GBA* gba, uint16_t parameters) {
cpu->memory.activeNonseqCycles16 = memory->waitstatesNonseq16[memory->activeRegion]; cpu->memory.activeNonseqCycles16 = memory->waitstatesNonseq16[memory->activeRegion];
} }
static bool _isValidDMASAD(int dma, uint32_t address) {
if (dma == 0 && address >= BASE_CART0 && address < BASE_CART_SRAM) {
return false;
}
return address >= BASE_WORKING_RAM && address < 0x10000000;
}
static bool _isValidDMADAD(int dma, uint32_t address) {
if (dma < 3 && address >= BASE_CART0 && address < 0x10000000) {
return false;
}
return address >= BASE_WORKING_RAM && address < 0x10000000;
}
uint32_t GBAMemoryWriteDMASAD(struct GBA* gba, int dma, uint32_t address) { uint32_t GBAMemoryWriteDMASAD(struct GBA* gba, int dma, uint32_t address) {
struct GBAMemory* memory = &gba->memory; struct GBAMemory* memory = &gba->memory;
address &= 0x0FFFFFFE; address &= 0x0FFFFFFE;
if ((dma > 0 || address < BASE_CART0) && address >= BASE_WORKING_RAM && address < BASE_CART_SRAM) { if (_isValidDMASAD(dma, address)) {
memory->dma[dma].source = address; memory->dma[dma].source = address;
} }
return memory->dma[dma].source; return memory->dma[dma].source;
@ -1338,7 +1352,7 @@ uint32_t GBAMemoryWriteDMASAD(struct GBA* gba, int dma, uint32_t address) {
uint32_t GBAMemoryWriteDMADAD(struct GBA* gba, int dma, uint32_t address) { uint32_t GBAMemoryWriteDMADAD(struct GBA* gba, int dma, uint32_t address) {
struct GBAMemory* memory = &gba->memory; struct GBAMemory* memory = &gba->memory;
address &= 0x0FFFFFFE; address &= 0x0FFFFFFE;
if ((dma > 2 || address < BASE_CART0) && address >= BASE_WORKING_RAM && address < BASE_CART_SRAM) { if (_isValidDMADAD(dma, address)) {
memory->dma[dma].dest = address; memory->dma[dma].dest = address;
} }
return memory->dma[dma].dest; return memory->dma[dma].dest;