Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refined HALT bug behavior, fixed Robocop

Browse Source
This commit is contained in:
Lior Halphon 2016-09-22 01:51:09 +03:00
parent bc3cab7dfa
commit 0991705379
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/gb.h
View File

@ -226,6 +226,7 @@ typedef struct GB_gameboy_s {
bool stopped; bool stopped;
bool boot_rom_finished; bool boot_rom_finished;
bool ime_toggle; /* ei (and di in CGB) have delayed effects.*/ bool ime_toggle; /* ei (and di in CGB) have delayed effects.*/
bool halt_bug;
/* Misc state*/ /* Misc state*/
/* IR */ /* IR */

15
Core/z80_cpu.c
View File

@ -684,6 +684,11 @@ static void halt(GB_gameboy_t *gb, uint8_t opcode)
{ {
GB_advance_cycles(gb, 4); GB_advance_cycles(gb, 4);
gb->halted = true; gb->halted = true;
/* Despite what some online documentations say, the HALT bug also happens on a CGB, in both CGB and DMG modes. */
if (!gb->ime && (gb->interrupt_enable & gb->io_registers[GB_IO_IF] & 0x1F) != 0) {
gb->halted = false;
gb->halt_bug = true;
}
} }
static void ret_cc(GB_gameboy_t *gb, uint8_t opcode) static void ret_cc(GB_gameboy_t *gb, uint8_t opcode)
@ -1332,12 +1337,9 @@ static GB_opcode_t *opcodes[256] = {
void GB_cpu_run(GB_gameboy_t *gb) void GB_cpu_run(GB_gameboy_t *gb)
{ {
gb->vblank_just_occured = false; gb->vblank_just_occured = false;
bool interrupt = gb->interrupt_enable & gb->io_registers[GB_IO_IF]; bool interrupt = gb->interrupt_enable & gb->io_registers[GB_IO_IF] & 0x1F;
bool halt_bug = false;
if (interrupt) { if (interrupt) {
/* Despite what some online documentations say, the HALT bug also happens on a CGB, in both CGB and DMG modes. */
halt_bug = gb->halted;
gb->halted = false; gb->halted = false;
} }
@ -1354,7 +1356,7 @@ void GB_cpu_run(GB_gameboy_t *gb)
if (effecitve_ime && interrupt) { if (effecitve_ime && interrupt) {
uint8_t interrupt_bit = 0; uint8_t interrupt_bit = 0;
uint8_t interrupt_queue = gb->interrupt_enable & gb->io_registers[GB_IO_IF]; uint8_t interrupt_queue = gb->interrupt_enable & gb->io_registers[GB_IO_IF] & 0x1F;
while (!(interrupt_queue & 1)) { while (!(interrupt_queue & 1)) {
interrupt_queue >>= 1; interrupt_queue >>= 1;
interrupt_bit++; interrupt_bit++;
@ -1367,8 +1369,9 @@ void GB_cpu_run(GB_gameboy_t *gb)
} }
else if(!gb->halted && !gb->stopped) { else if(!gb->halted && !gb->stopped) {
uint8_t opcode = GB_read_memory(gb, gb->pc++); uint8_t opcode = GB_read_memory(gb, gb->pc++);
if (halt_bug) { if (gb->halt_bug) {
gb->pc--; gb->pc--;
gb->halt_bug = false;
} }
opcodes[opcode](gb, opcode); opcodes[opcode](gb, opcode);
} }