From c9145e18d7504e07c3d67aaadae7de5e22ea3179 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sun, 19 Nov 2017 07:29:37 -0800 Subject: [PATCH] Partially revert "GB: Fix execution state and HALT getting out of sync" This reverts commit 5d9e4d217a273bec4dfdddafdea85e25eda7a45f. --- src/gb/gb.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gb/gb.c b/src/gb/gb.c index 91e2503dc..6ecaaf74f 100644 --- a/src/gb/gb.c +++ b/src/gb/gb.c @@ -622,8 +622,6 @@ void GBProcessEvents(struct LR35902Core* cpu) { } if (cpu->halted) { cpu->cycles = cpu->nextEvent; - cpu->executionState += cpu->nextEvent; - cpu->executionState &= 3; if (!gb->memory.ie || !gb->memory.ime) { break; } @@ -681,8 +679,6 @@ static void _enableInterrupts(struct mTiming* timing, void* user, uint32_t cycle void GBHalt(struct LR35902Core* cpu) { struct GB* gb = (struct GB*) cpu->master; if (!(gb->memory.ie & gb->memory.io[REG_IF])) { - cpu->executionState += cpu->nextEvent - cpu->cycles; - cpu->executionState &= 3; cpu->cycles = cpu->nextEvent; cpu->halted = true; } else if (gb->model < GB_MODEL_CGB) {