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

GBA DMA: Fix invalid DMA handling (fixes #1301)

This commit is contained in:
Vicki Pfau 2019-02-24 11:06:19 -08:00
parent ab4de2301f
commit d6ff7538ee
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -20,6 +20,7 @@ Bugfixes:
- Qt: Fix quick load recent accidentally saving (fixes mgba.io/i/1309) - Qt: Fix quick load recent accidentally saving (fixes mgba.io/i/1309)
- GBA: Fix video timing when skipping BIOS (fixes mgba.io/i/1318) - GBA: Fix video timing when skipping BIOS (fixes mgba.io/i/1318)
- 3DS: Work around menu freezing (fixes mgba.io/i/1294) - 3DS: Work around menu freezing (fixes mgba.io/i/1294)
- GBA DMA: Fix invalid DMA handling (fixes mgba.io/i/1301)
Misc: Misc:
- GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1274) - GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1274)
- Qt: Updated Italian translation (by Vecna) - Qt: Updated Italian translation (by Vecna)

11
src/gba/dma.c
View File

@ -260,8 +260,6 @@ void GBADMAService(struct GBA* gba, int number, struct GBADMA* info) {
} }
gba->bus = memory->dmaTransferRegister; gba->bus = memory->dmaTransferRegister;
cpu->memory.store32(cpu, dest, memory->dmaTransferRegister, 0); cpu->memory.store32(cpu, dest, memory->dmaTransferRegister, 0);
memory->dmaTransferRegister &= 0xFFFF0000;
memory->dmaTransferRegister |= memory->dmaTransferRegister >> 16;
} else { } else {
if (sourceRegion == REGION_CART2_EX && memory->savedata.type == SAVEDATA_EEPROM) { if (sourceRegion == REGION_CART2_EX && memory->savedata.type == SAVEDATA_EEPROM) {
if (memory->savedata.type == SAVEDATA_AUTODETECT) { if (memory->savedata.type == SAVEDATA_AUTODETECT) {
@ -269,10 +267,10 @@ void GBADMAService(struct GBA* gba, int number, struct GBADMA* info) {
GBASavedataInitEEPROM(&memory->savedata); GBASavedataInitEEPROM(&memory->savedata);
} }
memory->dmaTransferRegister = GBASavedataReadEEPROM(&memory->savedata); memory->dmaTransferRegister = GBASavedataReadEEPROM(&memory->savedata);
} else { memory->dmaTransferRegister |= memory->dmaTransferRegister << 16;
if (source) { } else if (source) {
memory->dmaTransferRegister = cpu->memory.load16(cpu, source, 0); memory->dmaTransferRegister = cpu->memory.load16(cpu, source, 0);
} memory->dmaTransferRegister |= memory->dmaTransferRegister << 16;
} }
if (destRegion == REGION_CART2_EX) { if (destRegion == REGION_CART2_EX) {
if (memory->savedata.type == SAVEDATA_AUTODETECT) { if (memory->savedata.type == SAVEDATA_AUTODETECT) {
@ -286,7 +284,6 @@ void GBADMAService(struct GBA* gba, int number, struct GBADMA* info) {
cpu->memory.store16(cpu, dest, memory->dmaTransferRegister, 0); cpu->memory.store16(cpu, dest, memory->dmaTransferRegister, 0);
} }
memory->dmaTransferRegister |= memory->dmaTransferRegister << 16;
gba->bus = memory->dmaTransferRegister; gba->bus = memory->dmaTransferRegister;
} }
int sourceOffset = DMA_OFFSET[GBADMARegisterGetSrcControl(info->reg)] * width; int sourceOffset = DMA_OFFSET[GBADMARegisterGetSrcControl(info->reg)] * width;