Partially revert "GB: Fix execution state and HALT getting out of sync" This reverts commit 5d9e4d217a273bec4dfdddafdea85e25eda7a45f.
Vicki Pfau vi@endrift.com
Sun, 19 Nov 2017 07:29:37 -0800
1 files changed,
0 insertions(+),
4 deletions(-)
jump to
M
src/gb/gb.c
→
src/gb/gb.c
@@ -622,8 +622,6 @@ break;
} 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 @@
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) {