all repos — mgba @ 6900d130ae1fc082ac98c53213a4d31b1f9928fb

mGBA Game Boy Advance Emulator

GBA Memory: Fix open bus from IWRAM (fixes #1575)
Vicki Pfau vi@endrift.com
Mon, 11 Nov 2019 18:24:49 -0800
commit

6900d130ae1fc082ac98c53213a4d31b1f9928fb

parent

77ab0ef7703b9a8f0eaf9b43cbd6341bca12f773

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

jump to
M CHANGESCHANGES

@@ -91,6 +91,7 @@ - ARM: Fix STR writeback pipeline stage

- ARM: Partially fix LDM/STM writeback with empty register list - GBA DMA: Fix case where DMAs could get misaligned (fixes mgba.io/i/1092) - GBA Video: Fix OpenGL renderer 512x512 backgrounds (fixes mgba.io/i/1572) + - GBA Memory: Fix open bus from IWRAM (fixes mgba.io/i/1575) Other fixes: - 3DS: Fix screen darkening (fixes mgba.io/i/1562) - Vita: Fix analog controls (fixes mgba.io/i/1554)
M src/gba/memory.csrc/gba/memory.c

@@ -353,10 +353,10 @@ break; \

case REGION_WORKING_IRAM: \ /* This doesn't handle prefetch clobbering */ \ if (cpu->gprs[ARM_PC] & 2) { \ - value |= cpu->prefetch[0] << 16; \ - } else { \ value <<= 16; \ value |= cpu->prefetch[0]; \ + } else { \ + value |= cpu->prefetch[0] << 16; \ } \ break; \ default: \