From a4659dc14734f0372f794f02f4b2b0114e247b32 Mon Sep 17 00:00:00 2001 From: Franco Colmenarez Date: Tue, 19 Oct 2021 22:36:10 -0500 Subject: [PATCH] Testing more roms --- src/bus.rs | 5 ++++- src/console.rs | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bus.rs b/src/bus.rs index b3c7f28..8b83b68 100644 --- a/src/bus.rs +++ b/src/bus.rs @@ -45,7 +45,10 @@ impl Bus { pub fn new() -> Self { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/01-special.gb".to_string()) { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/03-op sp,hl.gb".to_string()) { - let game_rom = match ROM::load_file("roms/cpu_instrs_individual/04-op r,imm.gb".to_string()) { + // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/04-op r,imm.gb".to_string()) { + // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/05-op rp.gb".to_string()) { + // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/06-ld r,r.gb".to_string()) { + let game_rom = match ROM::load_file("roms/cpu_instrs_individual/07-jr,jp,call,ret,rst.gb".to_string()) { Ok(rom) => rom, _ => ROM::from_bytes(&[0; 0xFFFF]) }; diff --git a/src/console.rs b/src/console.rs index 5774cfa..88f54e2 100644 --- a/src/console.rs +++ b/src/console.rs @@ -27,7 +27,11 @@ impl Console { // thread::sleep(time::Duration::from_millis(100)); // exit = self.cpu.get_exec_calls_count() >= 1258895; // log 1 // exit = self.cpu.get_exec_calls_count() >= 1068422; // log 3 - exit = self.cpu.get_exec_calls_count() >= 1262766; // log 4 + // exit = self.cpu.get_exec_calls_count() >= 1262766; // log 4 + // exit = self.cpu.get_exec_calls_count() >= 1763388; // log 5 + // exit = self.cpu.get_exec_calls_count() >= 1763388; // log 5 + // exit = self.cpu.get_exec_calls_count() >= 243272; // log 6 + exit = self.cpu.get_exec_calls_count() >= 287416; // log 7 } } }