fogti/fogtix
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix(vm): trivial errors found during initial testing

Browse source
This commit is contained in:
Alain Zscheile 2022-09-23 21:49:12 +02:00
parent a7c2068b01
commit bc96f9f130
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/fogtix-vm/src/main.rs
View file

@ -1,6 +1,5 @@
use fogtix_bytecode::{Atom, Parse, Pointer, Value as BcValue};
use std::marker::PhantomData;
use std::path::PathBuf;
use std::sync::Arc;
mod noop;
@ -65,6 +64,7 @@ impl Process {
use fogtix_bytecode::consts::{AtomOp, MathBinOp};
use fogtix_bytecode::Instr;
let previptr = self.instrp.1;
tracing::trace!("previptr = {}", previptr);
let nxti_arr = match self.instrp.0.h.get(previptr..) {
None => {
tracing::error!(
@ -86,7 +86,7 @@ impl Process {
}
Ok(x) => x,
};
self.instrp.1 += nxtiptr.len() - nxti_arr.len();
self.instrp.1 += nxti_arr.len() - nxtiptr.len();
match nxti {
Instr::Label => {}
Instr::CallRemote(atom, arity) => {
@ -196,7 +196,7 @@ impl Process {
Instr::Return => match self.callstack.pop() {
Some(x) => self.instrp = x,
None => {
tracing::error!("return called on empty callstack @ {}", previptr);
//tracing::error!("return called on empty callstack @ {}", previptr);
break;
}
},
@ -338,13 +338,14 @@ fn main() {
Arg::new("main")
.short('m')
.help("the module whose entry point should be used")
.takes_value(true)
.required(true),
)
.get_matches();
tracing_subscriber::fmt::init();
let main_mod_path = matches.get_one::<PathBuf>("main").unwrap();
let main_mod_path = matches.get_one::<String>("main").unwrap();
let main_mod = Arc::new(Module {
h: readfilez::read_from_file(std::fs::File::open(&main_mod_path))