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

Call indirect fully working

Browse Source
This commit is contained in:
Syrus Akbary
2018-10-23 11:40:17 +02:00
parent a796056c5f
commit 46742c9aaf
8 changed files with 2856 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/webassembly/instance.rs
View File

@ -70,13 +70,12 @@ fn get_function_addr(
// #[derive(Debug)]
#[repr(C)]
#[repr(C, packed)]
pub struct VmCtx<'phantom> {
pub user_data: UserData,
pub globals: UncheckedSlice<u8>,
pub memories: UncheckedSlice<UncheckedSlice<u8>>,
pub tables: UncheckedSlice<BoundedSlice<usize>>,
pub test: String,
globals: UncheckedSlice<u8>,
memories: UncheckedSlice<UncheckedSlice<u8>>,
tables: UncheckedSlice<BoundedSlice<usize>>,
// globals: Vec<u8>,
// memories: Vec<Vec<u8>>,
// pub tables: Vec<Vec<usize>>,
@ -84,7 +83,7 @@ pub struct VmCtx<'phantom> {
}
// #[derive(Debug)]
#[repr(C)]
#[repr(C, packed)]
pub struct UserData {
// pub process: Dispatch<Process>,
pub instance: Instance,
@ -507,14 +506,12 @@ impl Instance {
}
pub fn generate_context(&mut self) -> VmCtx {
let mut memories: Vec<UncheckedSlice<u8>> = self.memories.iter().map(|mem| mem[..].into()).collect();
let memories: Vec<UncheckedSlice<u8>> = self.memories.iter().map(|mem| mem[..].into()).collect();
let tables: Vec<BoundedSlice<usize>> = self.tables.iter().map(|table| table[..].into()).collect();
println!("GENERATING CONTEXT {:?}", self.tables);
let globals: UncheckedSlice<u8> = self.globals[..].into();
// println!("GENERATING CONTEXT {:?}", self.tables);
// assert!(memories.len() >= 1, "modules must have at least one memory");
// the first memory has a space of `mem::size_of::<VmCtxData>()` rounded
// up to the 4KiB before it. We write the VmCtxData into that.
@ -527,7 +524,6 @@ impl Instance {
// process,
instance: instance,
},
test: "TEST".to_string(),
phantom: PhantomData,
};
data