Skip to content
Snippets Groups Projects
Verified Commit 4a9c6fc8 authored by João Magalhães's avatar João Magalhães :rocket:
Browse files

fix: else if in interrup handling

parent 3dca80bf
No related branches found
No related tags found
No related merge requests found
Pipeline #939 passed
...@@ -85,14 +85,14 @@ fn main() { ...@@ -85,14 +85,14 @@ fn main() {
game_boy.load_boot_default(); game_boy.load_boot_default();
//game_boy.load_rom_file("../../res/roms.prop/tetris.gb"); //game_boy.load_rom_file("../../res/roms.prop/tetris.gb");
game_boy.load_rom_file("../../res/roms.prop/dr_mario.gb"); //game_boy.load_rom_file("../../res/roms.prop/dr_mario.gb");
//game_boy.load_rom_file("../../res/roms.prop/alleyway.gb"); //game_boy.load_rom_file("../../res/roms.prop/alleyway.gb");
//game_boy.load_rom_file("../../res/roms/firstwhite.gb"); //game_boy.load_rom_file("../../res/roms/firstwhite.gb");
//game_boy.load_rom_file("../../res/roms/opus5.gb"); //game_boy.load_rom_file("../../res/roms/opus5.gb");
//game_boy.load_rom_file("../../res/roms/paradius/cpu/01-special.gb"); // PASSED //game_boy.load_rom_file("../../res/roms/paradius/cpu/01-special.gb"); // PASSED
//game_boy.load_rom_file("../../res/roms/paradius/cpu/02-interrupts.gb"); game_boy.load_rom_file("../../res/roms/paradius/cpu/02-interrupts.gb");
//game_boy.load_rom_file("../../res/roms/paradius/cpu/03-op sp,hl.gb"); // PASSED //game_boy.load_rom_file("../../res/roms/paradius/cpu/03-op sp,hl.gb"); // PASSED
//game_boy.load_rom_file("../../res/roms/paradius/cpu/04-op r,imm.gb"); // PASSED //game_boy.load_rom_file("../../res/roms/paradius/cpu/04-op r,imm.gb"); // PASSED
//game_boy.load_rom_file("../../res/roms/paradius/cpu/05-op rp.gb"); // PASSED //game_boy.load_rom_file("../../res/roms/paradius/cpu/05-op rp.gb"); // PASSED
......
...@@ -130,9 +130,8 @@ impl Cpu { ...@@ -130,9 +130,8 @@ impl Cpu {
return 16; return 16;
} }
// @todo aggregate the handling of these interrupts // @todo aggregate the handling of these interrupts
if (self.mmu.ie & 0x04 == 0x04) && self.mmu.timer().int_tima() { else if (self.mmu.ie & 0x04 == 0x04) && self.mmu.timer().int_tima() {
println!("Going to run Timer interrupt handler (0x50)"); println!("Going to run Timer interrupt handler (0x50)");
self.disable_int(); self.disable_int();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment