Website Summary Files Commits Branches @commit @diff @stats
path: root / vm / src
diff options
context:
space:
mode:
Commitc8955f48580db8067765f76c8967e44dbb06517a (patch)
Author
 Syndamia <kamen@syndamia.com>
2025-02-14 15:34:23 +0200
Committer
 Syndamia <kamen@syndamia.com>
2025-02-14 15:34:23 +0200
Filesc3d21c730957dfdc9fe8a6262caa6ae030902076 /vm/src
tonkobali-c8955f48580db8067765f76c8967e44dbb06517a.tar
tonkobali-c8955f48580db8067765f76c8967e44dbb06517a.tar.gz
tonkobali-c8955f48580db8067765f76c8967e44dbb06517a.zip
Parent991e6fdd96296bf7bcbee10c47c4f56dd1f83cf9 (diff)
feat(vmm): User interface commands
5 files changed, 91 insertions, 11 deletions
-rw-r--r--vm/src/main.rs2
-rw-r--r--vm/src/vm/mod.rs8
-rw-r--r--vm/src/vm/primitive.rs6
-rw-r--r--vm/src/vmm/command.rs39
-rw-r--r--vm/src/vmm/mod.rs47
diff --git a/vm/src/main.rs b/vm/src/main.rs
index b3907ea..1753eb3 100644
--- a/vm/src/main.rs
+++ b/vm/src/main.rs
@@ -15,7 +15,7 @@ struct Args {
#[arg(short, long, default_value_t = 10)]
tick_gap: u64,
- #[arg(short, long, default_value_t = 500)]
+ #[arg(short, long, default_value_t = 200)]
refresh: u64,
}
diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs
index 5545e43..9c92551 100644
--- a/vm/src/vm/mod.rs
+++ b/vm/src/vm/mod.rs
@@ -5,7 +5,7 @@ use std::{
sync::{ Arc, Mutex }, thread, time, fs
};
-use primitive::PrimitiveVirtualMachine;
+use primitive::{spa, PrimitiveVirtualMachine};
use memory::Word;
pub(crate) type VirtualMachine = Arc<Mutex<PrimitiveVirtualMachine>>;
@@ -15,6 +15,7 @@ pub(crate) trait VirtualMachineInterface {
fn create_from_file(tick_gap: u64, path: &str) -> VirtualMachine;
fn start(&self);
+ fn set_start(&mut self, index: Word);
fn get_word(&self, index: usize) -> Word;
}
@@ -54,6 +55,11 @@ impl VirtualMachineInterface for VirtualMachine {
}
}
+ fn set_start(&mut self, index: Word) {
+ let mut vm = (*self).lock().unwrap();
+ vm.set_word(spa::PROGRAM_COUNTER, index);
+ }
+
fn get_word(&self, index: usize) -> Word {
let vm = (*self).lock().unwrap();
vm.get_word(index)
diff --git a/vm/src/vm/primitive.rs b/vm/src/vm/primitive.rs
index 6b0a7c8..e9d0d66 100644
--- a/vm/src/vm/primitive.rs
+++ b/vm/src/vm/primitive.rs
@@ -1,7 +1,7 @@
use crate::vm::memory::{ Memory, Word };
// Special addrs
-mod spa {
+pub mod spa {
pub(crate) const PROGRAM_COUNTER: usize = 2;
}
@@ -80,6 +80,10 @@ impl PrimitiveVirtualMachine {
self.mem[index]
}
+ pub fn set_word(&mut self, index: usize, value: Word) {
+ *self.mem.get_mut(index) = value;
+ }
+
fn current_word(&self) -> &Word {
&self.mem[*self.pc() as usize]
}
diff --git a/vm/src/vmm/command.rs b/vm/src/vmm/command.rs
new file mode 100644
index 0000000..2688b5f
--- /dev/null
+++ b/vm/src/vmm/command.rs
@@ -0,0 +1,39 @@
+use crate::vm::{ VirtualMachineInterface, VirtualMachine };
+
+fn expects_n_args(args: &Vec<&str>, n: usize) -> Result<(), String> {
+ if args.len() - 1 != n {
+ Err(format!("Command '{}' expected {n} arguments, {} were given!", args[0], args.len() - 1))
+ }
+ else {
+ Ok(())
+ }
+}
+
+pub(super) fn parse_and_exec(input: String, vm: &mut VirtualMachine) -> Result<(), String> {
+ let args = input
+ .split(&[' ', '\t', '\n', '\r'])
+ .filter(|x| !x.is_empty())
+ .collect::<Vec<&str>>();
+
+ if args.len() == 0 {
+ println!();
+ return Ok(());
+ }
+
+ match args[0] {
+ "s" | "start" => {
+ expects_n_args(&args, 1)?;
+ vm.set_start(args[1].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]));
+ }
+ },
+ }
+ Ok(())
+}
diff --git a/vm/src/vmm/mod.rs b/vm/src/vmm/mod.rs
index ac08ffe..afd8840 100644
--- a/vm/src/vmm/mod.rs
+++ b/vm/src/vmm/mod.rs
@@ -1,7 +1,8 @@
-use std::{
- thread,
- time
-};
+mod command;
+
+use std::{ thread, time, sync::mpsc, io::{ stdout, stdin, Write } };
+
+use command::parse_and_exec;
use super::vm::VirtualMachine;
@@ -9,6 +10,12 @@ pub(crate) struct VirtualMachineMonitor {
refresh_rate: u64,
}
+macro_rules! above {
+ ($str:expr) => {
+ concat!("\x1B7\x1B[1F|", $str, "|\x1B8")
+ };
+}
+
impl VirtualMachineMonitor {
pub(crate) fn new(refresh_rate: u64) -> VirtualMachineMonitor {
VirtualMachineMonitor {
@@ -16,16 +23,40 @@ impl VirtualMachineMonitor {
}
}
- pub(crate) fn start(&mut self, vm: VirtualMachine) {
+ pub(crate) fn start(&mut self, mut vm: VirtualMachine) {
+ // Spawn input handling thread
+ let (tx, rx) = mpsc::channel::<String>();
+ thread::spawn(move || loop {
+ let mut buffer = String::new();
+ stdin().read_line(&mut buffer).unwrap();
+ tx.send(buffer).unwrap();
+ });
+
+ print!("\n> ");
loop {
+ match rx.try_recv() {
+ Ok(input) => {
+ if let Err(msg) = parse_and_exec(input, &mut vm) {
+ if msg.is_empty() {
+ break;
+ }
+ else {
+ println!("{}", msg);
+ }
+ }
+ print!("\n> ");
+ },
+ _ => {},
+ }
+
{
let vm = (*vm).lock().unwrap();
- println!("{}", vm.get_word(1));
if vm.is_halted() {
- println!("HALTED!");
- break;
+ print!(above!("HALTED!"));
}
}
+
+ let _ = stdout().flush();
thread::sleep(time::Duration::from_millis(self.refresh_rate));
}
}