portal/waffle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

better interpreter

Browse source
This commit is contained in:
Graham Kelly 2024-03-09 15:10:11 -05:00
parent 11953b625e
commit 252be6e5fc
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/interp.rs
View file

@ -18,6 +18,7 @@ pub struct InterpContext {
pub globals: PerEntity<Global, ConstVal>, pub globals: PerEntity<Global, ConstVal>,
pub fuel: u64, pub fuel: u64,
pub trace_handler: Option<Box<dyn Fn(usize, Vec<ConstVal>) -> bool + Send>>, pub trace_handler: Option<Box<dyn Fn(usize, Vec<ConstVal>) -> bool + Send>>,
pub import_hander: Option<Box<dyn FnMut(&mut InterpContext,&str,&[ConstVal]) -> InterpResult>>
} }
type MultiVal = SmallVec<[ConstVal; 2]>; type MultiVal = SmallVec<[ConstVal; 2]>;
@ -86,6 +87,7 @@ impl InterpContext {
globals, globals,
fuel: u64::MAX, fuel: u64::MAX,
trace_handler: None, trace_handler: None,
import_hander: None,
}) })
} }
@ -312,10 +314,10 @@ impl InterpContext {
} }
fn call_import(&mut self, name: &str, args: &[ConstVal]) -> InterpResult { fn call_import(&mut self, name: &str, args: &[ConstVal]) -> InterpResult {
if let Some(ret) = wasi::call_wasi(&mut self.memories[Memory::from(0)], name, args) { let mut r = self.import_hander.take().unwrap();
return ret; let rs = r(self,name,args);
} self.import_hander = Some(r);
panic!("Unknown import: {} with args: {:?}", name, args); return rs;
} }
} }