FranLMSP/rmg-001
1
0
Fork 0
mirror of https://github.com/FranLMSP/rmg-001.git synced 2024-11-23 18:21:31 +00:00
Code Issues Projects Releases Wiki Activity

Remove hardcoded roms

Browse Source
This commit is contained in:
Franco Colmenarez 2021-11-12 11:18:09 -05:00
parent 0f0784b2ed
commit 6404593f2c
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bus.rs
View File

@ -57,26 +57,13 @@ pub struct Bus {
impl Bus { impl Bus {
pub fn new() -> Self { pub fn new() -> Self {
let game_rom = match ROM::load_file("/home/fran/Development/Personal/Rust/rmg-001/ignore/mario-land.gb".to_string()) { let args: Vec<String> = std::env::args().collect();
// let game_rom = match ROM::load_file("ignore/dmg-acid2.gb".to_string()) { if args.len() < 2 {
// let game_rom = match ROM::load_file("ignore/mario-land.gb".to_string()) { panic!("Please, specify a ROM");
// let game_rom = match ROM::load_file("ignore/tetris.gb".to_string()) { }
// let game_rom = match ROM::load_file("ignore/mooneye/emulator-only/mbc1/bits_bank1.gb".to_string()) { let game_rom = match ROM::load_file(&args[1]) {
// let game_rom = match ROM::load_file("roms/cpu_instrs.gb".to_string()) {
// 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/02-interrupts.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/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()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/08-misc instrs.gb".to_string()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/09-op r,r.gb".to_string()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/10-bit ops.gb".to_string()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/11-op a,(hl).gb".to_string()) {
Ok(rom) => rom, Ok(rom) => rom,
// _ => ROM::from_bytes(&[0; 0xFFFF]) Err(_) => panic!("Could not read ROM"),
_ => panic!("Could not read ROM"),
}; };
let mut data = [0x00; 0x10000]; let mut data = [0x00; 0x10000];
// Hardware registers after the bootrom // Hardware registers after the bootrom

2
src/rom.rs
View File

@ -154,7 +154,7 @@ pub struct ROM {
} }
impl ROM { impl ROM {
pub fn load_file(filename: String) -> std::io::Result<Self> { pub fn load_file(filename: &str) -> std::io::Result<Self> {
let mut file = File::open(filename)?; let mut file = File::open(filename)?;
let mut data = vec![]; let mut data = vec![];
file.read_to_end(&mut data)?; file.read_to_end(&mut data)?;