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

GBA Memory: Fix ldm {pc}

This commit is contained in:
Jeffrey Pfau 2016-09-04 02:20:58 -07:00
parent 2b71e5c797
commit a20061e925
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -37,6 +37,7 @@ Bugfixes:
- GBA: Fix filehandle leak with savegames - GBA: Fix filehandle leak with savegames
- GBA: Timer 0 cannot be count up - GBA: Timer 0 cannot be count up
- Qt: Fix being unable to pause manually when using auto-pausing - Qt: Fix being unable to pause manually when using auto-pausing
- GBA Memory: Fix ldm {pc}
Misc: Misc:
- 3DS: Use blip_add_delta_fast for a small speed improvement - 3DS: Use blip_add_delta_fast for a small speed improvement
- OpenGL: Log shader compilation failure - OpenGL: Log shader compilation failure

3
src/gba/memory.c
View File

@ -1354,6 +1354,9 @@ uint32_t GBALoadMultiple(struct ARMCore* cpu, uint32_t address, int mask, enum L
} \ } \
if (UNLIKELY(mask & (8 << i))) { \ if (UNLIKELY(mask & (8 << i))) { \
value = cpu->gprs[i + 3]; \ value = cpu->gprs[i + 3]; \
if (i + 3 == ARM_PC) { \
value += WORD_SIZE_ARM; \
} \
STM; \ STM; \
++wait; \ ++wait; \
address += 4; \ address += 4; \