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

Make emscripten “work”

Browse Source
This commit is contained in:
Syrus Akbary
2018-11-20 19:24:23 -08:00
parent fca2eb3884
commit 0ad10a4900
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/apis/emscripten/io.rs
View File

@ -7,6 +7,7 @@ pub use libc::putchar;
/// printf
pub extern "C" fn printf(memory_offset: i32, extra: i32, instance: &Instance) -> i32 {
debug!("emscripten::printf");
let mem = &instance.memories[0];
return unsafe {
let base_memory_offset = mem.mmap.as_ptr().offset(memory_offset as isize) as *const i8;

7
src/apis/emscripten/memory.rs
View File

@ -8,6 +8,7 @@ use crate::webassembly::{Instance};
/// emscripten: _emscripten_memcpy_big
pub extern "C" fn _emscripten_memcpy_big(dest: u32, src: u32, len: u32, instance: &mut Instance) -> u32 {
debug!("emscripten::_emscripten_memcpy_big");
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;
unsafe { memcpy(dest_addr, src_addr, len as size_t); }
@ -16,10 +17,12 @@ pub extern "C" fn _emscripten_memcpy_big(dest: u32, src: u32, len: u32, instance
/// emscripten: getTotalMemory
pub extern "C" fn get_total_memory(instance: &mut Instance) -> u32 {
debug!("emscripten::get_total_memory");
instance.memories[0].current_size()
}
/// emscripten: enlargeMemory
pub extern "C" fn enlarge_memory() {
// stub
pub extern "C" fn enlarge_memory(instance: &mut Instance) {
debug!("emscripten::enlarge_memory");
// instance.memories[0].grow(100);
}

6
src/apis/emscripten/mod.rs
View File

@ -12,17 +12,17 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> {
let mut import_object = ImportObject::new();
import_object.set("env", "printf", ImportValue::Func(io::printf as *const u8));
import_object.set("env", "putchar", ImportValue::Func(io::putchar as *const u8));
// EMSCRIPTEN SYSCALLS
// // EMSCRIPTEN SYSCALLS
import_object.set("env", "___syscall1", ImportValue::Func(host::sys_exit as *const u8));
import_object.set("env", "___syscall3", ImportValue::Func(host::sys_read as *const u8));
import_object.set("env", "___syscall5", ImportValue::Func(host::sys_open as *const u8));
import_object.set("env", "___syscall6", ImportValue::Func(host::sys_close as *const u8));
// EMSCRIPTEN APIS
// // EMSCRIPTEN APIS
import_object.set("env", "abort", ImportValue::Func(process::em_abort as *const u8));
import_object.set("env", "_abort", ImportValue::Func(process::_abort as *const u8));
import_object.set("env", "abortOnCannotGrowMemory", ImportValue::Func(process::abort_on_cannot_grow_memory as *const u8));
import_object.set("env", "_emscripten_memcpy_big", ImportValue::Func(memory::_emscripten_memcpy_big as *const u8));
import_object.set("env", "enlargeMemory", ImportValue::Func(memory::enlarge_memory as *const u8));
// import_object.set("env", "enlargeMemory", ImportValue::Func(memory::enlarge_memory as *const u8));
import_object.set("env", "getTotalMemory", ImportValue::Func(memory::get_total_memory as *const u8));
import_object
}

4
src/apis/emscripten/process.rs
View File

@ -11,17 +11,20 @@ use std::ffi::CStr;
use crate::webassembly::{Instance};
extern "C" fn abort_with_message(message: &str) {
debug!("emscripten::abort_with_message");
println!("{}", message);
_abort();
}
/// emscripten: _abort
pub extern "C" fn _abort() {
debug!("emscripten::_abort");
unsafe { abort(); }
}
/// emscripten: abort
pub extern "C" fn em_abort(message: u32, instance: &mut Instance) {
debug!("emscripten::em_abort");
let message_addr = instance.memory_offset_addr(0, message as usize) as *mut c_char;
unsafe {
let message = CStr::from_ptr(message_addr)
@ -34,6 +37,7 @@ pub extern "C" fn em_abort(message: u32, instance: &mut Instance) {
/// emscripten: abortOnCannotGrowMemory
pub extern "C" fn abort_on_cannot_grow_memory() {
debug!("emscripten::abort_on_cannot_grow_memory");
abort_with_message("Cannot enlarge memory arrays!");
}

4
src/main.rs
View File

@ -85,8 +85,8 @@ fn execute_wasm(wasm_path: PathBuf) -> Result<(), String> {
Some(&webassembly::Export::Function(index)) => index,
_ => panic!("Main function not found"),
});
let main: fn(&webassembly::Instance) = get_instance_function!(instance, func_index);
main(&instance);
let main: extern fn(u32, u32, &webassembly::Instance) = get_instance_function!(instance, func_index);
main(0, 0, &instance);
Ok(())
}