diff options
| -rw-r--r-- | crates/runrom/src/main.rs | 14 | ||||
| -rw-r--r-- | lib/vnf/src/lib.rs | 11 |
2 files changed, 13 insertions, 12 deletions
diff --git a/crates/runrom/src/main.rs b/crates/runrom/src/main.rs index de11390..3a18946 100644 --- a/crates/runrom/src/main.rs +++ b/crates/runrom/src/main.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use std::fs::File; use std::io::{BufRead, BufReader, ErrorKind, Read, Seek, SeekFrom}; use std::path::{Path, PathBuf}; -use vnf::{Machine, MemoryInitialValue, MemoryPolicy}; +use vnf::{Machine, MemoryPolicy}; /// Version for this program. const VERSION: &str = "0.1.0"; @@ -261,17 +261,7 @@ fn run( assume_function: bool, dump_memory: bool, ) -> Result<(), String> { - let mut machine = Machine::from( - file, - start, - #[allow(clippy::single_range_in_vec_init)] - MemoryPolicy { - initial_value: MemoryInitialValue::Fixed(0), - allowed_reads: vec![(0..0x800)], - allowed_writes: vec![(0..0x800)], - minimum_stack_value: 0, - }, - )?; + let mut machine = Machine::from(file, start, MemoryPolicy::default())?; machine.verbose = true; machine.run_function_mode = assume_function; diff --git a/lib/vnf/src/lib.rs b/lib/vnf/src/lib.rs index f2524cd..b1b596b 100644 --- a/lib/vnf/src/lib.rs +++ b/lib/vnf/src/lib.rs @@ -143,6 +143,17 @@ pub struct MemoryPolicy { pub minimum_stack_value: u8, } +impl Default for MemoryPolicy { + fn default() -> Self { + Self { + initial_value: MemoryInitialValue::Fixed(0), + allowed_reads: vec![(0..0x800)], + allowed_writes: vec![(0..0x800)], + minimum_stack_value: 0, + } + } +} + /// The state of the Joypad handshake process. #[derive(Copy, Clone, Debug, Default)] pub enum JoypadState { |