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

GBA Memory: De-inline GBALoadBad

This commit is contained in:
Vicki Pfau 2020-06-22 22:05:21 -07:00
parent eaaebf6b2f
commit 27e7837fa1
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/gba/memory.c
View File

@ -337,33 +337,7 @@ static void GBASetActiveRegion(struct ARMCore* cpu, uint32_t address) {
} }
#define LOAD_BAD \ #define LOAD_BAD \
if (gba->performingDMA || cpu->gprs[ARM_PC] - gba->dmaPC == (gba->cpu->executionMode == MODE_THUMB ? WORD_SIZE_THUMB : WORD_SIZE_ARM)) { \ value = GBALoadBad(cpu);
value = gba->bus; \
} else { \
value = cpu->prefetch[1]; \
if (cpu->executionMode == MODE_THUMB) { \
/* http://ngemu.com/threads/gba-open-bus.170809/ */ \
switch (cpu->gprs[ARM_PC] >> BASE_OFFSET) { \
case REGION_BIOS: \
case REGION_OAM: \
/* This isn't right half the time, but we don't have $+6 handy */ \
value <<= 16; \
value |= cpu->prefetch[0]; \
break; \
case REGION_WORKING_IRAM: \
/* This doesn't handle prefetch clobbering */ \
if (cpu->gprs[ARM_PC] & 2) { \
value <<= 16; \
value |= cpu->prefetch[0]; \
} else { \
value |= cpu->prefetch[0] << 16; \
} \
break; \
default: \
value |= value << 16; \
} \
} \
}
#define LOAD_BIOS \ #define LOAD_BIOS \
if (address < SIZE_BIOS) { \ if (address < SIZE_BIOS) { \
@ -375,7 +349,7 @@ static void GBASetActiveRegion(struct ARMCore* cpu, uint32_t address) {
} \ } \
} else { \ } else { \
mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load32: 0x%08X", address); \ mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load32: 0x%08X", address); \
LOAD_BAD; \ value = GBALoadBad(cpu); \
} }
#define LOAD_WORKING_RAM \ #define LOAD_WORKING_RAM \
@ -427,7 +401,33 @@ static void GBASetActiveRegion(struct ARMCore* cpu, uint32_t address) {
uint32_t GBALoadBad(struct ARMCore* cpu) { uint32_t GBALoadBad(struct ARMCore* cpu) {
struct GBA* gba = (struct GBA*) cpu->master; struct GBA* gba = (struct GBA*) cpu->master;
uint32_t value = 0; uint32_t value = 0;
LOAD_BAD; if (gba->performingDMA || cpu->gprs[ARM_PC] - gba->dmaPC == (gba->cpu->executionMode == MODE_THUMB ? WORD_SIZE_THUMB : WORD_SIZE_ARM)) {
value = gba->bus;
} else {
value = cpu->prefetch[1];
if (cpu->executionMode == MODE_THUMB) {
/* http://ngemu.com/threads/gba-open-bus.170809/ */
switch (cpu->gprs[ARM_PC] >> BASE_OFFSET) {
case REGION_BIOS:
case REGION_OAM:
/* This isn't right half the time, but we don't have $+6 handy */
value <<= 16;
value |= cpu->prefetch[0];
break;
case REGION_WORKING_IRAM:
/* This doesn't handle prefetch clobbering */
if (cpu->gprs[ARM_PC] & 2) {
value <<= 16;
value |= cpu->prefetch[0];
} else {
value |= cpu->prefetch[0] << 16;
}
break;
default:
value |= value << 16;
}
}
}
return value; return value;
} }
@ -507,8 +507,7 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
} }
} else { } else {
mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load16: 0x%08X", address); mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load16: 0x%08X", address);
LOAD_BAD; value = (GBALoadBad(cpu) >> ((address & 2) * 8)) & 0xFFFF;
value = (value >> ((address & 2) * 8)) & 0xFFFF;
} }
break; break;
case REGION_WORKING_RAM: case REGION_WORKING_RAM:
@ -591,8 +590,7 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
break; break;
default: default:
mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load16: 0x%08X", address); mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load16: 0x%08X", address);
LOAD_BAD; value = (GBALoadBad(cpu) >> ((address & 2) * 8)) & 0xFFFF;
value = (value >> ((address & 2) * 8)) & 0xFFFF;
break; break;
} }
@ -625,8 +623,7 @@ uint32_t GBALoad8(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
} }
} else { } else {
mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load8: 0x%08x", address); mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load8: 0x%08x", address);
LOAD_BAD; value = (GBALoadBad(cpu) >> ((address & 3) * 8)) & 0xFF;
value = (value >> ((address & 3) * 8)) & 0xFF;
} }
break; break;
case REGION_WORKING_RAM: case REGION_WORKING_RAM:
@ -701,8 +698,7 @@ uint32_t GBALoad8(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
break; break;
default: default:
mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load8: 0x%08x", address); mLOG(GBA_MEM, GAME_ERROR, "Bad memory Load8: 0x%08x", address);
LOAD_BAD; value = (GBALoadBad(cpu) >> ((address & 3) * 8)) & 0xFF;
value = (value >> ((address & 3) * 8)) & 0xFF;
break; break;
} }