all repos — mgba @ a9d370da0b4c3fdd319f2243f72bda2f74f33322

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

a9d370da0b4c3fdd319f2243f72bda2f74f33322

parent

584d37443326970f585b0914eac6f20c299c60a9

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

jump to
M CHANGES → CHANGES 
@@ -169,6 +169,7 @@ - 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.c → src/gba/timer.c 
@@ -28,7 +28,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)];