mirror of https://github.com/mgba-emu/mgba.git
GBA Memory: Fix misaligned BIOS reads
This commit is contained in:
parent
82df0e1cab
commit
4cbcc41e35
1
CHANGES
1
CHANGES
|
@ -4,6 +4,7 @@ Features:
|
|||
Bugfixes:
|
||||
- LR35902: Fix core never exiting with certain event patterns
|
||||
- GB Timer: Improve DIV reset behavior
|
||||
- GBA Memory: Fix misaligned BIOS reads
|
||||
Misc:
|
||||
- SDL: Remove scancode key input
|
||||
- GBA Video: Clean up unused timers
|
||||
|
|
|
@ -352,7 +352,7 @@ static void GBASetActiveRegion(struct ARMCore* cpu, uint32_t address) {
|
|||
#define LOAD_BIOS \
|
||||
if (address < SIZE_BIOS) { \
|
||||
if (memory->activeRegion == REGION_BIOS) { \
|
||||
LOAD_32(value, address, memory->bios); \
|
||||
LOAD_32(value, address & -4, memory->bios); \
|
||||
} else { \
|
||||
mLOG(GBA_MEM, GAME_ERROR, "Bad BIOS Load32: 0x%08X", address); \
|
||||
value = memory->biosPrefetch; \
|
||||
|
@ -479,7 +479,7 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
|
|||
case REGION_BIOS:
|
||||
if (address < SIZE_BIOS) {
|
||||
if (memory->activeRegion == REGION_BIOS) {
|
||||
LOAD_16(value, address, memory->bios);
|
||||
LOAD_16(value, address & -2, memory->bios);
|
||||
} else {
|
||||
mLOG(GBA_MEM, GAME_ERROR, "Bad BIOS Load16: 0x%08X", address);
|
||||
value = (memory->biosPrefetch >> ((address & 2) * 8)) & 0xFFFF;
|
||||
|
|
Loading…
Reference in New Issue