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

GBA Memory: Fix prefetch values in Thumb mode

This commit is contained in:
Jeffrey Pfau 2015-01-19 01:16:18 -08:00
parent 6d43fb7890
commit ddfffd22de
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gba/gba-memory.c
View File

@ -304,7 +304,11 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
if (gba->performingDMA) { if (gba->performingDMA) {
LOAD_16(value, address & 2, &gba->bus); LOAD_16(value, address & 2, &gba->bus);
} else { } else {
LOAD_16(value, address & 2, &cpu->prefetch[1]); uint32_t prefetch = cpu->prefetch[1];
if (cpu->executionMode == MODE_THUMB) {
prefetch |= prefetch << 16;
}
LOAD_16(value, address & 2, &prefetch);
} }
} }
break; break;
@ -366,7 +370,11 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
if (gba->performingDMA) { if (gba->performingDMA) {
LOAD_16(value, address & 2, &gba->bus); LOAD_16(value, address & 2, &gba->bus);
} else { } else {
LOAD_16(value, address & 2, &cpu->prefetch[1]); uint32_t prefetch = cpu->prefetch[1];
if (cpu->executionMode == MODE_THUMB) {
prefetch |= prefetch << 16;
}
LOAD_16(value, address & 2, &prefetch);
} }
break; break;
} }
@ -399,7 +407,11 @@ uint32_t GBALoad8(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
if (gba->performingDMA) { if (gba->performingDMA) {
value = ((uint8_t*) &gba->bus)[address & 3]; value = ((uint8_t*) &gba->bus)[address & 3];
} else { } else {
value = ((uint8_t*) &cpu->prefetch[1])[address & 3]; uint32_t prefetch = cpu->prefetch[1];
if (cpu->executionMode == MODE_THUMB) {
prefetch |= prefetch << 16;
}
value = ((uint8_t*) &prefetch)[address & 3];
} }
} }
break; break;
@ -463,7 +475,11 @@ uint32_t GBALoad8(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
if (gba->performingDMA) { if (gba->performingDMA) {
value = ((uint8_t*) &gba->bus)[address & 3]; value = ((uint8_t*) &gba->bus)[address & 3];
} else { } else {
value = ((uint8_t*) &cpu->prefetch[1])[address & 3]; uint32_t prefetch = cpu->prefetch[1];
if (cpu->executionMode == MODE_THUMB) {
prefetch |= prefetch << 16;
}
value = ((uint8_t*) &prefetch)[address & 3];
} }
break; break;
} }