ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB, GBA: Fix global cycle counter discrepancy

This commit is contained in:
Vicki Pfau 2020-12-29 01:59:38 -08:00
parent 0026249806
commit 2ee7642d0b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gb/gb.c
View File

@ -707,13 +707,13 @@ void GBProcessEvents(struct SM83Core* cpu) {
int32_t nextEvent;
cpu->cycles = 0;
#ifdef USE_DEBUGGERS
gb->timing.globalCycles += cycles;
#endif
cpu->nextEvent = INT_MAX;
nextEvent = cycles;
do {
#ifdef USE_DEBUGGERS
gb->timing.globalCycles += nextEvent;
#endif
nextEvent = mTimingTick(&gb->timing, nextEvent);
} while (gb->cpuBlocked && !gb->earlyExit);
cpu->nextEvent = nextEvent;

2
src/gba/gba.c
View File

@ -288,7 +288,7 @@ static void GBAProcessEvents(struct ARMCore* cpu) {
int32_t cycles = cpu->cycles;
cpu->cycles = 0;
#ifdef USE_DEBUGGERS
gba->timing.globalCycles += cycles;
gba->timing.globalCycles += cycles < nextEvent ? nextEvent : cycles;
#endif
#ifndef NDEBUG
if (cycles < 0) {