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

GBA I/O: Fix reading from a few invalid I/O registers (fixes #876)

This commit is contained in:
Vicki Pfau 2017-09-20 18:51:29 -07:00
parent 2c3adf2668
commit 380bc189c3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -27,6 +27,7 @@ Bugfixes:
- SDL: Fix potential race condition when pressing keys (fixes mgba.io/i/872) - SDL: Fix potential race condition when pressing keys (fixes mgba.io/i/872)
- GBA: Fix keypad IRQs not firing when extra buttons are pressed - GBA: Fix keypad IRQs not firing when extra buttons are pressed
- GBA Video: Fix broken sprite blending hack (fixes mgba.io/i/532) - GBA Video: Fix broken sprite blending hack (fixes mgba.io/i/532)
- GBA I/O: Fix reading from a few invalid I/O registers (fixes mgba.io/i/876)
Misc: Misc:
- Qt: Don't rebuild library view if style hasn't changed - Qt: Don't rebuild library view if style hasn't changed
- SDL: Fix 2.0.5 build on macOS under some circumstances - SDL: Fix 2.0.5 build on macOS under some circumstances

19
src/gba/io.c
View File

@ -889,14 +889,17 @@ uint16_t GBAIORead(struct GBA* gba, uint32_t address) {
break; break;
case REG_MAX: case REG_MAX:
// Some bad interrupt libraries will read from this // Some bad interrupt libraries will read from this
break; case 0x066:
case 0x66: case 0x06E:
case 0x6E: case 0x076:
case 0x76: case 0x07A:
case 0x7A: case 0x07E:
case 0x7E: case 0x086:
case 0x86: case 0x08A:
case 0x8A: case 0x136:
case 0x142:
case 0x15A:
case 0x206:
mLOG(GBA_IO, GAME_ERROR, "Read from unused I/O register: %03X", address); mLOG(GBA_IO, GAME_ERROR, "Read from unused I/O register: %03X", address);
return 0; return 0;
case REG_DEBUG_ENABLE: case REG_DEBUG_ENABLE: