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

renaming

Browse Source
This commit is contained in:
Lachlan Sneff
2019-01-29 14:15:59 -08:00
parent 581363119b
commit bc78738bb7
9 changed files with 96 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/runtime-core/src/memory/dynamic.rs
View File

@ -30,13 +30,13 @@ impl DynamicMemory {
pub(super) fn new(desc: MemoryDescriptor, local: &mut vm::LocalMemory) -> Option<Box<Self>> {
let memory = {
let mut memory =
sys::Memory::with_size((desc.min as usize * WASM_PAGE_SIZE) + DYNAMIC_GUARD_SIZE)
sys::Memory::with_size((desc.minimum as usize * WASM_PAGE_SIZE) + DYNAMIC_GUARD_SIZE)
.ok()?;
if desc.min != 0 {
if desc.minimum != 0 {
unsafe {
memory
.protect(
0..(desc.min as usize * WASM_PAGE_SIZE),
0..(desc.minimum as usize * WASM_PAGE_SIZE),
sys::Protect::ReadWrite,
)
.ok()?;
@ -48,13 +48,13 @@ impl DynamicMemory {
let mut storage = Box::new(DynamicMemory {
memory,
current: desc.min,
max: desc.max,
current: desc.minimum,
max: desc.maximum,
});
let storage_ptr: *mut DynamicMemory = &mut *storage;
local.base = storage.memory.as_ptr();
local.bound = desc.min as usize * WASM_PAGE_SIZE;
local.bound = desc.minimum as usize * WASM_PAGE_SIZE;
local.memory = storage_ptr as *mut ();
Some(storage)