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

Slightly more readable code.

This commit is contained in:
Lior Halphon 2016-09-13 01:20:18 +03:00
parent 71a9b7eb77
commit 43be91f032
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/z80_cpu.c
View File

@ -1418,11 +1418,13 @@ void GB_cpu_run(GB_gameboy_t *gb)
return; return;
} }
if (gb->ime && interrupt) { bool effecitve_ime = gb->ime;
if (gb->ime_toggle) { if (gb->ime_toggle) {
gb->ime = !gb->ime; gb->ime = !gb->ime;
gb->ime_toggle = false; gb->ime_toggle = false;
} }
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];
while (!(interrupt_queue & 1)) { while (!(interrupt_queue & 1)) {
@ -1431,17 +1433,12 @@ void GB_cpu_run(GB_gameboy_t *gb)
} }
gb->io_registers[GB_IO_IF] &= ~(1 << interrupt_bit); gb->io_registers[GB_IO_IF] &= ~(1 << interrupt_bit);
gb->ime = false; gb->ime = false;
gb->ime_toggle = false;
nop(gb, 0); nop(gb, 0);
gb->pc -= 2; gb->pc -= 2;
/* Run pseudo instructions rst 40-60*/ /* Run pseudo instructions rst 40-60*/
rst(gb, 0x87 + interrupt_bit * 8); rst(gb, 0x87 + interrupt_bit * 8);
} }
else if(!gb->halted && !gb->stopped) { else if(!gb->halted && !gb->stopped) {
if (gb->ime_toggle) {
gb->ime = !gb->ime;
gb->ime_toggle = false;
}
uint8_t opcode = GB_read_memory(gb, gb->pc); uint8_t opcode = GB_read_memory(gb, gb->pc);
opcodes[opcode](gb, opcode); opcodes[opcode](gb, opcode);
} }