all repos — mgba @ d7ecdb5e4eda3e195d6d319f94280486d01d0bc3

mGBA Game Boy Advance Emulator

GBA: Fix timing advancing too quickly in rare cases
Vicki Pfau vi@endrift.com
Sat, 30 May 2020 17:00:07 -0700
commit

d7ecdb5e4eda3e195d6d319f94280486d01d0bc3

parent

00aa6476c885fa66e9621960fc9555533ed19bcd

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

jump to
M CHANGES → CHANGES 
@@ -11,6 +11,7 @@ - GB MBC: Support 4MB MBC30 ROMs (fixes mgba.io/i/1713)
  - GB Video: Fix state after skipping BIOS (fixes mgba.io/i/1715 and mgba.io/i/1716)
  - GB Video: Fix BGPS value after skipping BIOS (fixes mgba.io/i/1717)
  - GBA: Add missing RTC overrides for Legendz games
+ - GBA: Fix timing advancing too quickly in rare cases
  - GBA BIOS: Implement dummy sound driver calls
  - GBA BIOS: Improve HLE BIOS timing
  - GBA BIOS: Reset renderer when RegisterRamReset called (fixes mgba.io/i/1756)
M src/gba/gba.c → src/gba/gba.c 
@@ -282,7 +282,7 @@ if (cycles < 0) {
 				mLOG(GBA, FATAL, "Negative cycles passed: %i", cycles);
 			}
 #endif
-			nextEvent = mTimingTick(&gba->timing, nextEvent + cycles);
+			nextEvent = mTimingTick(&gba->timing, cycles < nextEvent ? nextEvent : cycles);
 		} while (gba->cpuBlocked);
 
 		cpu->nextEvent = nextEvent;