fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-25 14:41:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix call_indirect.

Browse Source
This commit is contained in:
losfair
2019-03-12 11:31:55 +08:00
parent c5ef0a96e9
commit 683cb2090c
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/dynasm-backend/src/codegen_x64.rs
View File

@ -3141,25 +3141,24 @@ unsafe extern "C" fn call_indirect(
if elem_index >= table.count as usize {
panic!("element index out of bounds");
}
let func_index = *(table.base as *mut u32).offset(elem_index as isize) as usize;
let anyfunc = &*(table.base as *mut vm::Anyfunc).offset(elem_index as isize);
let ctx: &X64ExecutionContext =
&*CURRENT_EXECUTION_CONTEXT.with(|x| *x.borrow().last().unwrap());
println!(
"SIG INDEX = {}, FUNC INDEX = {}, ELEM INDEX = {}",
sig_index, func_index, elem_index
);
let func_index = anyfunc.func_index.unwrap();
// TODO: Fix table reading. Hardcoding func index = 1 for debugging here.
let func_index = 1usize;
/*println!(
"SIG INDEX = {}, FUNC INDEX = {:?}, ELEM INDEX = {}",
sig_index, func_index, elem_index
);*/
if ctx.signatures[SigIndex::new(sig_index)]
!= ctx.signatures[ctx.function_signatures[FuncIndex::new(func_index)]]
!= ctx.signatures[ctx.function_signatures[func_index]]
{
panic!("signature mismatch");
}
let func = ctx.function_pointers[func_index].0;
let func = ctx.function_pointers[func_index.index() as usize].0;
CALL_WASM(
stack_top,
stack_base as usize - stack_top as usize,