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

GBA Memory: Return correct byte in out of bounds ROM read

This commit is contained in:
jsmolka 2020-11-21 16:47:37 +01:00 committed by Vicki Pfau
parent 11f0b9c08d
commit 65c988aaad
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -3,6 +3,7 @@ Emulation fixes:
- ARM: Fix Addressing mode 1 shifter on rs == pc (fixes mgba.io/i/1926)
- GBA I/O: Ignore high bits on IME
- GBA Memory: Mark Famicom Mini games 22 through 28 as non-mirroring
- GBA Memory: Return correct byte for odd ROM open bus addresses
Other fixes:
- CMake: Fix build with downstream minizip that exports incompatible symbols
- Core: Fix threading improperly setting paused state while interrupted

2
src/gba/memory.c
View File

@ -670,7 +670,7 @@ uint32_t GBALoad8(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
value = GBAVFameGetPatternValue(address, 8);
} else {
mLOG(GBA_MEM, GAME_ERROR, "Out of bounds ROM Load8: 0x%08X", address);
value = (address >> 1) & 0xFF;
value = ((address >> 1) >> ((address & 1) * 8)) & 0xFF;
}
break;
case REGION_CART_SRAM: