all repos — mgba @ 8b4b63498923c80d52454fb0dbb9f3f7263866d0

mGBA Game Boy Advance Emulator

GBA Timer: Fix count-up timing overflowing timer 3
Vicki Pfau vi@endrift.com
Sun, 09 Jul 2017 11:07:22 -0700
commit

8b4b63498923c80d52454fb0dbb9f3f7263866d0

parent

b71ffe711c4ccb485b3b1171d65a4e1449640397

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

jump to
M CHANGESCHANGES

@@ -1,6 +1,5 @@

0.7.0: (Future) Bugfixes: - - GB Audio: Fix zombie mode bit masking - GB Audio: Make audio unsigned with bias (fixes mgba.io/i/749) Misc: - GBA Timer: Use global cycles for timers

@@ -177,6 +176,8 @@ - Qt: Fix patch loading while a game is running

- Qt: Fix shader selector on Ubuntu (fixes mgba.io/i/767) - GB Serialize: Fix timer serialization - GB Audio: Fix incorrect channel 4 iteration + - GB Audio: Fix zombie mode bit masking + - GBA Timer: Fix count-up timing overflowing timer 3 Misc: - Qt: Add language selector - GBA Timer: Improve accuracy of timers
M src/gba/timer.csrc/gba/timer.c

@@ -70,7 +70,7 @@ GBAAudioSampleFIFO(&gba->audio, 1, cyclesLate);

} } - if (timerId < 4) { + if (timerId < 3) { struct GBATimer* nextTimer = &gba->timers[timerId + 1]; if (GBATimerFlagsIsCountUp(nextTimer->flags)) { // TODO: Does this increment while disabled? ++gba->memory.io[(REG_TM1CNT_LO >> 1) + (timerId << 1)];