all repos — mgba @ 7db12fae966329ed95f256cd0e4fc1604adb127f

mGBA Game Boy Advance Emulator

GBA Memory: Fix 32-bit loads from unaddress cartridge space
Jeffrey Pfau jeffrey@endrift.com
Sat, 18 Apr 2015 13:53:26 -0700
commit

7db12fae966329ed95f256cd0e4fc1604adb127f

parent

717f4ec4937cd4392301a718ae8d89a3719deb57

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -14,6 +14,7 @@ - GBA: Add initial I/O register settings for background matrix registers

- Qt: Fix potential crash if a gamepad causes focus to change - GBA Memory: Allow SRAM to be 64kB - Qt: Fix controller axis querying + - GBA Memory: Fix 32-bit loads from unaddress cartridge space Misc: - Qt: Show multiplayer numbers in window title
M src/gba/memory.csrc/gba/memory.c

@@ -324,7 +324,7 @@ LOAD_32(value, address & (SIZE_CART0 - 1), memory->rom); \

} else { \ GBALog(gba, GBA_LOG_GAME_ERROR, "Out of bounds ROM Load32: 0x%08X", address); \ value = (address >> 1) & 0xFFFF; \ - value |= value << 16; \ + value |= ((address + 2) >> 1) << 16; \ } #define LOAD_SRAM \