paoda
/
gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: replace CALL instruction with RST in interrupt handler

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-03-23 02:11:06 -05:00
parent 342e6616ac
commit 6f11640f24
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cpu.rs
View File

@ -132,35 +132,35 @@ impl Cpu {
enabled.set_vblank(false); enabled.set_vblank(false);
// INT 40h // INT 40h
Some(0x0040) Some(0x40)
} else if req.lcd_stat() && enabled.lcd_stat() { } else if req.lcd_stat() && enabled.lcd_stat() {
// Handle LCD STAT Interrupt // Handle LCD STAT Interrupt
req.set_lcd_stat(false); req.set_lcd_stat(false);
enabled.set_lcd_stat(false); enabled.set_lcd_stat(false);
// INT 48h // INT 48h
Some(0x0048) Some(0x48)
} else if req.timer() && enabled.timer() { } else if req.timer() && enabled.timer() {
// Handle Timer Interrupt // Handle Timer Interrupt
req.set_timer(false); req.set_timer(false);
enabled.set_timer(false); enabled.set_timer(false);
// INT 50h // INT 50h
Some(0x0050) Some(0x50)
} else if req.serial() && enabled.serial() { } else if req.serial() && enabled.serial() {
// Handle Serial Interrupt // Handle Serial Interrupt
req.set_serial(false); req.set_serial(false);
enabled.set_serial(false); enabled.set_serial(false);
// INT 58h // INT 58h
Some(0x0058) Some(0x58)
} else if req.joypad() && enabled.joypad() { } else if req.joypad() && enabled.joypad() {
// Handle Joypad Interrupt // Handle Joypad Interrupt
req.set_joypad(false); req.set_joypad(false);
enabled.set_joypad(false); enabled.set_joypad(false);
// INT 60h // INT 60h
Some(0x0060) Some(0x60)
} else { } else {
None None
}; };
@ -173,7 +173,7 @@ impl Cpu {
// Disable all future interrupts // Disable all future interrupts
self.set_ime(false); self.set_ime(false);
self.execute(Instruction::CALL(Always, register)) self.execute(Instruction::RST(register))
} }
None => Cycles::new(0), // NO Interrupts were enabled and / or requested None => Cycles::new(0), // NO Interrupts were enabled and / or requested
}; };