all repos — mgba @ a20061e925f00eb6bcfd1387a498d0db51bd6f23

mGBA Game Boy Advance Emulator

GBA Memory: Fix ldm {pc}
Jeffrey Pfau jeffrey@endrift.com
Sun, 04 Sep 2016 02:20:58 -0700
commit

a20061e925f00eb6bcfd1387a498d0db51bd6f23

parent

2b71e5c797516e6a0c8dcf1ca014549c31fb55a4

2 files changed, 4 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -37,6 +37,7 @@ - VFS: Fix reading multiple files from a 7z archive

- GBA: Fix filehandle leak with savegames - GBA: Timer 0 cannot be count up - Qt: Fix being unable to pause manually when using auto-pausing + - GBA Memory: Fix ldm {pc} Misc: - 3DS: Use blip_add_delta_fast for a small speed improvement - OpenGL: Log shader compilation failure
M src/gba/memory.csrc/gba/memory.c

@@ -1354,6 +1354,9 @@ address += 4; \

} \ if (UNLIKELY(mask & (8 << i))) { \ value = cpu->gprs[i + 3]; \ + if (i + 3 == ARM_PC) { \ + value += WORD_SIZE_ARM; \ + } \ STM; \ ++wait; \ address += 4; \