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

tco in interp

Browse source
This commit is contained in:
Graham Kelly 2024-03-09 15:22:00 -05:00
parent 252be6e5fc
commit 89e48a7129
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/interp.rs
View file

@ -91,14 +91,16 @@ impl InterpContext {
}) })
} }
pub fn call(&mut self, module: &Module<'_>, func: Func, args: &[ConstVal]) -> InterpResult { pub fn call(&mut self, module: &Module<'_>, mut func: Func, args: &[ConstVal]) -> InterpResult {
let mut args = args.to_vec();
'redo: loop{
let body = match &module.funcs[func] { let body = match &module.funcs[func] {
FuncDecl::Lazy(..) => panic!("Un-expanded function"), FuncDecl::Lazy(..) => panic!("Un-expanded function"),
FuncDecl::Compiled(..) => panic!("Already-compiled function"), FuncDecl::Compiled(..) => panic!("Already-compiled function"),
FuncDecl::Import(..) => { FuncDecl::Import(..) => {
let import = &module.imports[func.index()]; let import = &module.imports[func.index()];
assert_eq!(import.kind, ImportKind::Func(func)); assert_eq!(import.kind, ImportKind::Func(func));
return self.call_import(&import.name[..], args); return self.call_import(&import.name[..], &args);
} }
FuncDecl::Body(_, _, body) => body, FuncDecl::Body(_, _, body) => body,
FuncDecl::None => panic!("FuncDecl::None in call()"), FuncDecl::None => panic!("FuncDecl::None in call()"),
@ -232,9 +234,9 @@ impl InterpContext {
&Terminator::ReturnCallIndirect { &Terminator::ReturnCallIndirect {
sig, sig,
table, table,
ref args, args: ref args2,
} => { } => {
let args = args let args2 = args2
.iter() .iter()
.map(|&arg| { .map(|&arg| {
let arg = body.resolve_alias(arg); let arg = body.resolve_alias(arg);
@ -243,13 +245,16 @@ impl InterpContext {
multivalue[0] multivalue[0]
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let idx = args.last().unwrap().as_u32().unwrap() as usize; let idx = args2.last().unwrap().as_u32().unwrap() as usize;
let func = self.tables[table].elements[idx]; let fu = self.tables[table].elements[idx];
let result = self.call(module, func, &args[..args.len() - 1]); func = fu;
return result; args = args2[..args2.len()-1].to_vec();
continue 'redo;
// let result = self.call(module, func, &args[..args.len() - 1]);
// return result;
} }
&Terminator::ReturnCall { func, ref args } => { &Terminator::ReturnCall { func: fu, args: ref args2 } => {
let args = args let args2 = args2
.iter() .iter()
.map(|&arg| { .map(|&arg| {
let arg = body.resolve_alias(arg); let arg = body.resolve_alias(arg);
@ -258,8 +263,9 @@ impl InterpContext {
multivalue[0] multivalue[0]
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let result = self.call(module, func, &args[..]); func = fu;
return result; args = args2;
continue 'redo;
} }
&Terminator::None => { &Terminator::None => {
return InterpResult::Trap(frame.func, frame.cur_block, u32::MAX) return InterpResult::Trap(frame.func, frame.cur_block, u32::MAX)
@ -312,6 +318,7 @@ impl InterpContext {
} }
} }
} }
}
fn call_import(&mut self, name: &str, args: &[ConstVal]) -> InterpResult { fn call_import(&mut self, name: &str, args: &[ConstVal]) -> InterpResult {
let mut r = self.import_hander.take().unwrap(); let mut r = self.import_hander.take().unwrap();