fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-07-31 15:22:03 +00:00
Code Issues Projects Releases Wiki Activity

Fixed heap reference to memory. Added address spectest

Browse Source
This commit is contained in:
Syrus Akbary
2018-10-27 13:33:08 +02:00
parent 0e1dc88d9c
commit b94049f949
5 changed files with 3798 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/webassembly/module.rs
View File

@@ -344,18 +344,28 @@ impl<'environment> FuncEnvironmentTrait for FuncEnvironment<'environment> {
}
}
fn make_heap(&mut self, func: &mut ir::Function, _index: MemoryIndex) -> ir::Heap {
fn make_heap(&mut self, func: &mut ir::Function, index: MemoryIndex) -> ir::Heap {
// Create a static heap whose base address is stored at `vmctx+104`.
let vmctx = func.create_global_value(ir::GlobalValueData::VMContext);
let base = func.create_global_value(ir::GlobalValueData::Load {
let heap_base_addr = func.create_global_value(ir::GlobalValueData::Load {
base: vmctx,
offset: Offset32::new(104),
global_type: self.pointer_type(),
});
let pointer_bytes = self.pointer_bytes();
let memories_offset = (index * pointer_bytes as usize) as i32;
// We de-reference the vm_context.memories addr
let heap_base = func.create_global_value(ir::GlobalValueData::Load {
base: heap_base_addr,
offset: Offset32::new(memories_offset),
global_type: self.pointer_type(),
});
func.create_heap(ir::HeapData {
base: base,
base: heap_base,
min_size: Imm64::new(0),
guard_size: Imm64::new(LinearMemory::DEFAULT_GUARD_SIZE as i64),
style: ir::HeapStyle::Static {