Update to new runtime

This commit is contained in:
Brandon Fish
2019-01-23 01:27:13 -06:00
parent 3e9ef57d9d
commit 157183d212
17 changed files with 397 additions and 414 deletions

View File

@ -1,20 +1,15 @@
use super::process::abort_with_message;
use libc::{c_int, c_void, memcpy, size_t};
use wasmer_runtime_core::Instance;
use wasmer_runtime_core::vm::Ctx;
/// emscripten: _emscripten_memcpy_big
pub extern "C" fn _emscripten_memcpy_big(
dest: u32,
src: u32,
len: u32,
instance: &mut Instance,
) -> u32 {
pub extern "C" fn _emscripten_memcpy_big(dest: u32, src: u32, len: u32, vmctx: &mut Ctx) -> u32 {
debug!(
"emscripten::_emscripten_memcpy_big {}, {}, {}",
dest, src, len
);
let dest_addr = instance.memory_offset_addr(0, dest as usize) as *mut c_void;
let src_addr = instance.memory_offset_addr(0, src as usize) as *mut c_void;
let dest_addr = vmctx.memory(0)[dest as usize] as *mut c_void;
let src_addr = vmctx.memory(0)[src as usize] as *mut c_void;
unsafe {
memcpy(dest_addr, src_addr, len as size_t);
}
@ -22,16 +17,18 @@ pub extern "C" fn _emscripten_memcpy_big(
}
/// emscripten: getTotalMemory
pub extern "C" fn get_total_memory(_instance: &mut Instance) -> u32 {
pub extern "C" fn get_total_memory(_vmctx: &mut Ctx) -> u32 {
debug!("emscripten::get_total_memory");
// instance.memories[0].current_pages()
// TODO: Fix implementation
16_777_216
}
/// emscripten: enlargeMemory
pub extern "C" fn enlarge_memory(_instance: &mut Instance) {
pub extern "C" fn enlarge_memory(_vmctx: &mut Ctx) {
debug!("emscripten::enlarge_memory");
// instance.memories[0].grow(100);
// TODO: Fix implementation
}
/// emscripten: abortOnCannotGrowMemory