xenia/fox32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fox32: Use ../fox32rom/fox32.rom if ./fox32.rom doesn't exist

Browse Source
This commit is contained in:
ry755 2022-01-27 16:57:54 -08:00 committed by Ry
parent 99621394ec
commit abee6efc82
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@ -41,6 +41,15 @@ pub struct Overlay {
framebuffer_pointer: u32, framebuffer_pointer: u32,
} }
fn read_rom() -> Vec<u8> {
read("fox32.rom").unwrap_or_else(|_| {
println!("fox32.rom not found, attempting to open ../fox32rom/fox32.rom instead");
read("../fox32rom/fox32.rom").unwrap_or_else(|_| {
panic!("oh fuck");
})
})
}
fn main() { fn main() {
let args: Vec<String> = env::args().collect(); let args: Vec<String> = env::args().collect();
/*if args.len() != 2 { /*if args.len() != 2 {
@ -61,7 +70,7 @@ fn main() {
let mut cpu = { let mut cpu = {
let cpu_shared_memory = Arc::clone(&shared_memory); let cpu_shared_memory = Arc::clone(&shared_memory);
let cpu_overlays = Arc::clone(&display.overlays); let cpu_overlays = Arc::clone(&display.overlays);
let cpu_read_only_memory = read("fox32.rom").expect("fox32.rom not found!"); let cpu_read_only_memory = read_rom();
// 32 MiB of CPU-only memory // 32 MiB of CPU-only memory
let memory = Memory::new(0x02000000, cpu_shared_memory, cpu_overlays, cpu_read_only_memory); let memory = Memory::new(0x02000000, cpu_shared_memory, cpu_overlays, cpu_read_only_memory);