fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-24 04:01:57 +00:00
Code Issues Projects Releases Wiki Activity

call && call_indirect are working

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2017-06-19 11:01:59 +03:00
parent 0fc044cb5a
commit 8d7d39d80b
6 changed files with 187 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/interpreter/env_native.rs
View File

@ -90,7 +90,7 @@ impl<'a> ModuleInstanceInterface for NativeModuleInstance<'a> {
ItemIndex::IndexSpace(index) | ItemIndex::Internal(index) => index,
ItemIndex::External(_) => unreachable!("trying to call function, exported by native env module"),
};
println!("=== env_native.function_type({})", index);
if index < NATIVE_INDEX_FUNC_MIN {
return self.env.function_type(function_index, externals);
}
@ -101,6 +101,10 @@ impl<'a> ModuleInstanceInterface for NativeModuleInstance<'a> {
.map(|f| FunctionType::new(f.params.clone(), f.result.clone()))
}
fn function_type_by_index<'b>(&self, type_index: u32) -> Result<FunctionType, Error> {
self.function_type(ItemIndex::Internal(type_index), None)
}
fn table(&self, index: ItemIndex) -> Result<Arc<TableInstance>, Error> {
self.env.table(index)
}
@ -121,15 +125,16 @@ impl<'a> ModuleInstanceInterface for NativeModuleInstance<'a> {
self.env.function_reference_indirect(table_idx, type_idx, func_idx, externals)
}
fn function_body<'b>(&'b self, internal_index: u32) -> Result<Option<InternalFunction<'b>>, Error> {
self.env.function_body(internal_index)
fn function_body<'b>(&'b self, internal_index: u32, function_type: Option<&FunctionType>) -> Result<Option<InternalFunction<'b>>, Error> {
Ok(None)
//self.env.function_body(internal_index, function_type)
}
fn call_internal_function(&self, outer: CallerContext, index: u32, function_type: Option<&FunctionType>) -> Result<Option<RuntimeValue>, Error> {
if index < NATIVE_INDEX_FUNC_MIN {
return self.env.call_internal_function(outer, index, function_type);
}
println!("=== env_native.args({:?})", outer.value_stack);
// TODO: check type
self.functions
.get((index - NATIVE_INDEX_FUNC_MIN) as usize)