fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-29 22:51:56 +00:00
Code Issues Projects Releases Wiki Activity

Clean

Browse Source
This commit is contained in:
Sergey Pepyakin
2017-12-13 14:38:08 +01:00
parent 9e09508cf5
commit 8b355f32d4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/interpreter/program.rs
View File

@ -70,10 +70,10 @@ impl ProgramInstance {
args: Vec<RuntimeValue>, args: Vec<RuntimeValue>,
state: &mut St, state: &mut St,
) -> Result<Option<RuntimeValue>, Error> { ) -> Result<Option<RuntimeValue>, Error> {
let module_id = self.modules.get(module_name).ok_or_else(|| { let module_instance = self.modules.get(module_name).ok_or_else(|| {
Error::Program(format!("Module {} not found", module_name)) Error::Program(format!("Module {} not found", module_name))
})?; })?;
let extern_val = module_id let extern_val = module_instance
.export_by_name(func_name) .export_by_name(func_name)
.ok_or_else(|| { .ok_or_else(|| {
Error::Program(format!( Error::Program(format!(
@ -83,8 +83,8 @@ impl ProgramInstance {
)) ))
})?; })?;
let func_id = match extern_val { let func_instance = match extern_val {
ExternVal::Func(func_id) => func_id, ExternVal::Func(func_instance) => func_instance,
unexpected => { unexpected => {
return Err(Error::Program(format!( return Err(Error::Program(format!(
"Export {} is not a function, but {:?}", "Export {} is not a function, but {:?}",
@ -94,7 +94,7 @@ impl ProgramInstance {
} }
}; };
self.store.invoke(func_id, args, state) self.store.invoke(func_instance, args, state)
} }
pub fn invoke_index<St: 'static>( pub fn invoke_index<St: 'static>(
@ -104,13 +104,13 @@ impl ProgramInstance {
args: Vec<RuntimeValue>, args: Vec<RuntimeValue>,
state: &mut St, state: &mut St,
) -> Result<Option<RuntimeValue>, Error> { ) -> Result<Option<RuntimeValue>, Error> {
let module_id = self.modules.get(module_name).cloned().ok_or_else(|| { let module_instance = self.modules.get(module_name).cloned().ok_or_else(|| {
Error::Program(format!("Module {} not found", module_name)) Error::Program(format!("Module {} not found", module_name))
})?; })?;
let func_id = module_id.func_by_index(func_idx).ok_or_else(|| { let func_instance = module_instance.func_by_index(func_idx).ok_or_else(|| {
Error::Program(format!("Module doesn't contain function at index {}", func_idx)) Error::Program(format!("Module doesn't contain function at index {}", func_idx))
})?; })?;
self.invoke_func(func_id, args, state) self.invoke_func(func_instance, args, state)
} }
pub fn invoke_func<St: 'static>( pub fn invoke_func<St: 'static>(

6
src/interpreter/store.rs
View File

@ -374,9 +374,9 @@ impl Store {
} }
} }
for table in module.table_section().map(|ts| ts.entries()).unwrap_or(&[]) { for table_type in module.table_section().map(|ts| ts.entries()).unwrap_or(&[]) {
let table_id = self.alloc_table(table)?; let table = self.alloc_table(table_type)?;
instance.push_table(table_id); instance.push_table(table);
} }
for memory_type in module for memory_type in module