diff options
2 files changed, 17 insertions, 8 deletions
| -rw-r--r-- | vm/src/vmm/command.rs | 22 | ||||
| -rw-r--r-- | vm/src/vmm/mod.rs | 3 |
diff --git a/vm/src/vmm/command.rs b/vm/src/vmm/command.rs index 2688b5f..0811da3 100644 --- a/vm/src/vmm/command.rs +++ b/vm/src/vmm/command.rs @@ -21,17 +21,27 @@ pub(super) fn parse_and_exec(input: String, vm: &mut VirtualMachine) -> Result<( } match args[0] { - "s" | "start" => { + "r" | "run" => { expects_n_args(&args, 1)?; + if ! vm.is_halted() { + return Err(format!("Machine already running!")); + } vm.set_start(args[1].parse().unwrap()); }, + "s" | "store" => { + expects_n_args(&args, 2)?; + + vm.set_word(args[1].parse().unwrap(), args[2].parse().unwrap()); + }, "q" | "quit" | "e" | "exit" => return Err(String::new()), _ => { - if let Some(num) = args[0].parse::<usize>().ok() { - println!("{}", vm.get_word(num)); - } - else { - return Err(format!("Unknown command '{}'!", args[0])); + for arg in args { + if let Some(num) = arg.parse::<usize>().ok() { + println!("{}", vm.get_word(num)); + } + else { + return Err(format!("Unknown command '{}'!", arg)); + } } }, } diff --git a/vm/src/vmm/mod.rs b/vm/src/vmm/mod.rs index afd8840..9ad250f 100644 --- a/vm/src/vmm/mod.rs +++ b/vm/src/vmm/mod.rs @@ -4,7 +4,7 @@ use std::{ thread, time, sync::mpsc, io::{ stdout, stdin, Write } }; use command::parse_and_exec; -use super::vm::VirtualMachine; +use super::vm::{ VirtualMachine, VirtualMachineInterface }; pub(crate) struct VirtualMachineMonitor { refresh_rate: u64, @@ -50,7 +50,6 @@ impl VirtualMachineMonitor { } { - let vm = (*vm).lock().unwrap(); if vm.is_halted() { print!(above!("HALTED!")); } |
