fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-09 21:11:38 +00:00
Code Issues Projects Releases Wiki Activity

various fixes, code cleanup

Browse Source 
fix: exclude imports from function index
This commit is contained in:
fro 2017-07-17 14:51:59 +03:00
parent bf12f12af5
commit 1b8ecf11a5
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
examples/invoke.rs
View File

@ -3,14 +3,7 @@ extern crate parity_wasm;
use std::env::args; use std::env::args;
use parity_wasm::{interpreter, ModuleInstanceInterface, RuntimeValue}; use parity_wasm::{interpreter, ModuleInstanceInterface, RuntimeValue};
use parity_wasm::elements::ExportEntry; use parity_wasm::elements::{Internal, Type, FunctionType, ValueType};
use parity_wasm::elements::ExportSection;
use parity_wasm::elements::FunctionSection;
use parity_wasm::elements::TypeSection;
use parity_wasm::elements::Internal;
use parity_wasm::elements::Type;
use parity_wasm::elements::FunctionType;
use parity_wasm::elements::ValueType;
fn main() { fn main() {
let args: Vec<_> = args().collect(); let args: Vec<_> = args().collect();
@ -27,36 +20,44 @@ fn main() {
total_memory: 2*1024*1024, total_memory: 2*1024*1024,
allow_memory_growth: false, allow_memory_growth: false,
} }
).expect("Failed to load program"); ).expect("Program instance to load");
let module_def = parity_wasm::deserialize_file(&args[1]).expect("Failed to load module"); let module = parity_wasm::deserialize_file(&args[1]).expect("File to be deserialized");
let execution_params = { let execution_params = {
let export_section: &ExportSection = module_def.export_section().expect("No export section found"); let export_section = module.export_section().expect("No export section found");
let function_section: &FunctionSection = module_def.function_section().expect("No function section found"); let function_section = module.function_section().expect("No function section found");
let type_section: &TypeSection = module_def.type_section().expect("No type section found"); let type_section = module.type_section().expect("No type section found");
let found_entry: &ExportEntry = export_section.entries().iter()
.find(|entry| func_name.eq(entry.field())).unwrap(); let found_entry= export_section.entries().iter()
let function_index = match found_entry.internal() { .find(|entry| func_name == entry.field()).expect(&format!("No export with name {} found", func_name));
&Internal::Function(index) => index,
// Function index with imported functions
let function_index: usize = match found_entry.internal() {
&Internal::Function(index) => index as usize,
_ => panic!("Founded export is not a function"), _ => panic!("Founded export is not a function"),
}; };
let func_type_ref: u32 = function_section.entries()[function_index as usize].type_ref(); let import_section_len: usize = match module.import_section() {
let type_: &Type = &type_section.types()[func_type_ref as usize]; Some(import) => import.entries().len(),
let function_type: &FunctionType = match type_ { None => 0,
};
let function_index_in_section = function_index - import_section_len;
let func_type_ref: usize = function_section.entries()[function_index_in_section].type_ref() as usize;
let function_type: &FunctionType = match &type_section.types()[func_type_ref] {
&Type::Function(ref func_type) => func_type, &Type::Function(ref func_type) => func_type,
}; };
let args: Vec<RuntimeValue> = function_type.params().iter().enumerate().map(|(i, value)| match value { let args: Vec<RuntimeValue> = function_type.params().iter().enumerate().map(|(i, value)| match value {
&ValueType::I32 => RuntimeValue::I32(program_args[i].parse::<i32>().unwrap()), &ValueType::I32 => RuntimeValue::I32(program_args[i].parse::<i32>().expect(&format!("Can't parse arg #{} as i32", program_args[i]))),
&ValueType::I64 => RuntimeValue::I64(program_args[i].parse::<i64>().unwrap()), &ValueType::I64 => RuntimeValue::I64(program_args[i].parse::<i64>().expect(&format!("Can't parse arg #{} as i64", program_args[i]))),
&ValueType::F32 => RuntimeValue::F32(program_args[i].parse::<f32>().unwrap()), &ValueType::F32 => RuntimeValue::F32(program_args[i].parse::<f32>().expect(&format!("Can't parse arg #{} as f32", program_args[i]))),
&ValueType::F64 => RuntimeValue::F64(program_args[i].parse::<f64>().unwrap()), &ValueType::F64 => RuntimeValue::F64(program_args[i].parse::<f64>().expect(&format!("Can't parse arg #{} as f64", program_args[i]))),
}).collect(); }).collect();
interpreter::ExecutionParams::from(args) interpreter::ExecutionParams::from(args)
}; };
let module_def = program.add_module("main", module_def, None).expect("Failed to initialize module"); let module = program.add_module("main", module, None).expect("Failed to initialize module");
println!("Result: {:?}", module_def.execute_export(func_name, execution_params)); println!("Result: {:?}", module.execute_export(func_name, execution_params).expect(""));
} }