all repos — mgba @ d983f31b38b57cd0541d62368ac3296b506f104f

mGBA Game Boy Advance Emulator

GBA: Fix savestate loading of DISPSTAT and WAITCNT registers
Jeffrey Pfau jeffrey@endrift.com
Wed, 18 Feb 2015 02:37:21 -0800
commit

d983f31b38b57cd0541d62368ac3296b506f104f

parent

0cdb26df54bcf2f7612a247bddf9f11d53941488

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

jump to
M CHANGESCHANGES

@@ -38,6 +38,7 @@ - Debugger: Disassembly now lists PSR bitmasks (fixes #191)

- GBA BIOS: Prevent CpuSet and CpuFastSet from using BIOS addresses as a source (fixes #184) - GBA RR: Fix fallthrough error when reading tags from a movie - GBA Thread: Fix possible deadlock in video sync + - GBA: Fix savestate loading of DISPSTAT and WAITCNT registers Misc: - GBA Audio: Change internal audio sample buffer from 32-bit to 16-bit samples - GBA Memory: Simplify memory API and use fixed bus width
M src/gba/io.csrc/gba/io.c

@@ -241,7 +241,7 @@ };

static const int _isSpecialRegister[REG_MAX >> 1] = { // Video - 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

@@ -278,7 +278,7 @@ 0, 0, 0, 0, 0, 0, 0, 0,

0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Interrupts - 1, 1, 1, 0, 1 + 1, 1, 0, 0, 1 }; void GBAIOInit(struct GBA* gba) {