fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-20 12:16:30 +00:00
Code Issues Projects Releases Wiki Activity

Add EmscriptenData to instance and update usages

Browse Source
This commit is contained in:
Brandon Fish
2019-01-23 23:49:34 -06:00
parent 82e7ab6394
commit 99bc454c5b
5 changed files with 132 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
lib/emscripten/src/env.rs
View File

@ -8,25 +8,15 @@ use std::mem;
use std::os::raw::c_char;
use super::utils::{allocate_on_stack, copy_cstr_into_wasm, copy_terminated_array_of_cstrs};
use super::EmscriptenData;
use wasmer_runtime_core::{types::Value, vm::Ctx};
//use super::EmscriptenData;
//impl Instance {
// pub fn memory_offset_addr(&self, index: usize, offset: usize) -> *const usize {
// unimplemented!("TODO replace this stub")
// }
//
// pub fn emscripten_data(&self) -> &'static mut Option<EmscriptenData> {
// unimplemented!("TODO replace this stub")
// }
//}
// #[no_mangle]
/// emscripten: _getenv // (name: *const char) -> *const c_char;
pub extern "C" fn _getenv(name: c_int, vmctx: &mut Ctx) -> u32 {
pub extern "C" fn _getenv(name: c_int, ctx: &mut Ctx) -> u32 {
debug!("emscripten::_getenv");
let name_addr = vmctx.memory(0)[name as usize] as *const c_char;
let name_addr = ctx.memory(0)[name as usize] as *const c_char;
debug!("=> name({:?})", unsafe { CStr::from_ptr(name_addr) });
@ -35,15 +25,15 @@ pub extern "C" fn _getenv(name: c_int, vmctx: &mut Ctx) -> u32 {
return 0;
}
unsafe { copy_cstr_into_wasm(vmctx, c_str) }
unsafe { copy_cstr_into_wasm(ctx, c_str) }
}
/// emscripten: _setenv // (name: *const char, name: *const value, overwrite: int);
pub extern "C" fn _setenv(name: c_int, value: c_int, overwrite: c_int, vmctx: &mut Ctx) -> c_int {
pub extern "C" fn _setenv(name: c_int, value: c_int, overwrite: c_int, ctx: &mut Ctx) -> c_int {
debug!("emscripten::_setenv");
let name_addr = vmctx.memory(0)[name as usize] as *const c_char;
let value_addr = vmctx.memory(0)[value as usize] as *const c_char;
let name_addr = ctx.memory(0)[name as usize] as *const c_char;
let value_addr = ctx.memory(0)[value as usize] as *const c_char;
debug!("=> name({:?})", unsafe { CStr::from_ptr(name_addr) });
debug!("=> value({:?})", unsafe { CStr::from_ptr(value_addr) });
@ -52,10 +42,10 @@ pub extern "C" fn _setenv(name: c_int, value: c_int, overwrite: c_int, vmctx: &m
}
/// emscripten: _putenv // (name: *const char);
pub extern "C" fn _putenv(name: c_int, vmctx: &mut Ctx) -> c_int {
pub extern "C" fn _putenv(name: c_int, ctx: &mut Ctx) -> c_int {
debug!("emscripten::_putenv");
let name_addr = vmctx.memory(0)[name as usize] as *const c_char;
let name_addr = ctx.memory(0)[name as usize] as *const c_char;
debug!("=> name({:?})", unsafe { CStr::from_ptr(name_addr) });
@ -63,10 +53,10 @@ pub extern "C" fn _putenv(name: c_int, vmctx: &mut Ctx) -> c_int {
}
/// emscripten: _unsetenv // (name: *const char);
pub extern "C" fn _unsetenv(name: c_int, vmctx: &mut Ctx) -> c_int {
pub extern "C" fn _unsetenv(name: c_int, ctx: &mut Ctx) -> c_int {
debug!("emscripten::_unsetenv");
let name_addr = vmctx.memory(0)[name as usize] as *const c_char;
let name_addr = ctx.memory(0)[name as usize] as *const c_char;
debug!("=> name({:?})", unsafe { CStr::from_ptr(name_addr) });
@ -74,7 +64,7 @@ pub extern "C" fn _unsetenv(name: c_int, vmctx: &mut Ctx) -> c_int {
}
#[allow(clippy::cast_ptr_alignment)]
pub extern "C" fn _getpwnam(name_ptr: c_int, vmctx: &mut Ctx) -> c_int {
pub extern "C" fn _getpwnam(name_ptr: c_int, ctx: &mut Ctx) -> c_int {
debug!("emscripten::_getpwnam {}", name_ptr);
#[repr(C)]
@ -89,20 +79,20 @@ pub extern "C" fn _getpwnam(name_ptr: c_int, vmctx: &mut Ctx) -> c_int {
}
let name = unsafe {
let memory_name_ptr = vmctx.memory(0)[name_ptr as usize] as *const c_char;
let memory_name_ptr = ctx.memory(0)[name_ptr as usize] as *const c_char;
CStr::from_ptr(memory_name_ptr)
};
unsafe {
let passwd = &*libc_getpwnam(name.as_ptr());
let passwd_struct_offset = call_malloc(mem::size_of::<GuestPasswd>() as _, vmctx);
let passwd_struct_offset = call_malloc(mem::size_of::<GuestPasswd>() as _, ctx);
let passwd_struct_ptr = vmctx.memory(0)[passwd_struct_offset as usize] as *mut GuestPasswd;
(*passwd_struct_ptr).pw_name = copy_cstr_into_wasm(vmctx, passwd.pw_name);
(*passwd_struct_ptr).pw_passwd = copy_cstr_into_wasm(vmctx, passwd.pw_passwd);
(*passwd_struct_ptr).pw_gecos = copy_cstr_into_wasm(vmctx, passwd.pw_gecos);
(*passwd_struct_ptr).pw_dir = copy_cstr_into_wasm(vmctx, passwd.pw_dir);
(*passwd_struct_ptr).pw_shell = copy_cstr_into_wasm(vmctx, passwd.pw_shell);
let passwd_struct_ptr = ctx.memory(0)[passwd_struct_offset as usize] as *mut GuestPasswd;
(*passwd_struct_ptr).pw_name = copy_cstr_into_wasm(ctx, passwd.pw_name);
(*passwd_struct_ptr).pw_passwd = copy_cstr_into_wasm(ctx, passwd.pw_passwd);
(*passwd_struct_ptr).pw_gecos = copy_cstr_into_wasm(ctx, passwd.pw_gecos);
(*passwd_struct_ptr).pw_dir = copy_cstr_into_wasm(ctx, passwd.pw_dir);
(*passwd_struct_ptr).pw_shell = copy_cstr_into_wasm(ctx, passwd.pw_shell);
(*passwd_struct_ptr).pw_uid = passwd.pw_uid;
(*passwd_struct_ptr).pw_gid = passwd.pw_gid;
@ -111,7 +101,7 @@ pub extern "C" fn _getpwnam(name_ptr: c_int, vmctx: &mut Ctx) -> c_int {
}
#[allow(clippy::cast_ptr_alignment)]
pub extern "C" fn _getgrnam(name_ptr: c_int, vmctx: &mut Ctx) -> c_int {
pub extern "C" fn _getgrnam(name_ptr: c_int, ctx: &mut Ctx) -> c_int {
debug!("emscripten::_getgrnam {}", name_ptr);
#[repr(C)]
@ -123,69 +113,38 @@ pub extern "C" fn _getgrnam(name_ptr: c_int, vmctx: &mut Ctx) -> c_int {
}
let name = unsafe {
let memory_name_ptr = vmctx.memory(0)[name_ptr as usize] as *const c_char;
let memory_name_ptr = ctx.memory(0)[name_ptr as usize] as *const c_char;
CStr::from_ptr(memory_name_ptr)
};
unsafe {
let group = &*libc_getgrnam(name.as_ptr());
let group_struct_offset = call_malloc(mem::size_of::<GuestGroup>() as _, vmctx);
let group_struct_offset = call_malloc(mem::size_of::<GuestGroup>() as _, ctx);
let group_struct_ptr = vmctx.memory(0)[group_struct_offset as usize] as *mut GuestGroup;
(*group_struct_ptr).gr_name = copy_cstr_into_wasm(vmctx, group.gr_name);
(*group_struct_ptr).gr_passwd = copy_cstr_into_wasm(vmctx, group.gr_passwd);
let group_struct_ptr = ctx.memory(0)[group_struct_offset as usize] as *mut GuestGroup;
(*group_struct_ptr).gr_name = copy_cstr_into_wasm(ctx, group.gr_name);
(*group_struct_ptr).gr_passwd = copy_cstr_into_wasm(ctx, group.gr_passwd);
(*group_struct_ptr).gr_gid = group.gr_gid;
(*group_struct_ptr).gr_mem = copy_terminated_array_of_cstrs(vmctx, group.gr_mem);
(*group_struct_ptr).gr_mem = copy_terminated_array_of_cstrs(ctx, group.gr_mem);
group_struct_offset as c_int
}
}
pub fn call_malloc(size: i32, vmctx: &mut Ctx) -> u32 {
unimplemented!()
// let ret = instance
// .call("_malloc", &[Value::I32(size)])
// .expect("_malloc call failed");
// if let [Value::I32(x)] = ret.as_slice() {
// *x as u32
// } else {
// panic!("unexpected value from _malloc: {:?}", ret);
// }
pub fn call_malloc(size: i32, ctx: &mut Ctx) -> u32 {
(get_emscripten_data(ctx).malloc)(size, ctx)
}
pub fn call_memalign(alignment: u32, size: u32, vmctx: &mut Ctx) -> u32 {
unimplemented!()
// let ret =
// call(
// vmctx,
// "_memalign",
// &[Value::I32(alignment as i32), Value::I32(size as i32)],
// )
// .expect("_memalign call failed");
// if let [Value::I32(x)] = ret.as_slice() {
// *x as u32
// } else {
// panic!("unexpected value from _memalign {:?}", ret);
// }
pub fn call_memalign(alignment: u32, size: u32, ctx: &mut Ctx) -> u32 {
(get_emscripten_data(ctx).memalign)(alignment, size, ctx)
}
pub fn call_memset(pointer: u32, value: i32, size: u32, vmctx: &mut Ctx) -> u32 {
unimplemented!()
// let ret = instance
// .call(
// "_memset",
// &[
// Value::I32(pointer as i32),
// Value::I32(value),
// Value::I32(size as i32),
// ],
// )
// .expect("_memset call failed");
// if let [Value::I32(x)] = ret.as_slice() {
// *x as u32
// } else {
// panic!("unexpected value from _memset {:?}", ret);
// }
pub fn call_memset(pointer: u32, value: i32, size: u32, ctx: &mut Ctx) -> u32 {
(get_emscripten_data(ctx).memset)(pointer, value, size, ctx)
}
pub(crate) fn get_emscripten_data(ctx: &mut Ctx) -> &mut EmscriptenData {
unsafe { &mut *(ctx.data as *mut EmscriptenData) }
}
pub extern "C" fn _getpagesize() -> u32 {
@ -194,18 +153,18 @@ pub extern "C" fn _getpagesize() -> u32 {
}
#[allow(clippy::cast_ptr_alignment)]
pub extern "C" fn ___build_environment(environ: c_int, vmctx: &mut Ctx) {
pub extern "C" fn ___build_environment(environ: c_int, ctx: &mut Ctx) {
debug!("emscripten::___build_environment {}", environ);
const MAX_ENV_VALUES: u32 = 64;
const TOTAL_ENV_SIZE: u32 = 1024;
let mut environment = vmctx.memory(0)[environ as usize] as *mut c_int;
let mut environment = ctx.memory(0)[environ as usize] as *mut c_int;
unsafe {
let (pool_offset, _pool_slice): (u32, &mut [u8]) =
allocate_on_stack(TOTAL_ENV_SIZE as u32, vmctx);
allocate_on_stack(TOTAL_ENV_SIZE as u32, ctx);
let (env_offset, _env_slice): (u32, &mut [u8]) =
allocate_on_stack((MAX_ENV_VALUES * 4) as u32, vmctx);
let mut env_ptr = vmctx.memory(0)[env_offset as usize] as *mut c_int;
let mut _pool_ptr = vmctx.memory(0)[pool_offset as usize] as *mut c_int;
allocate_on_stack((MAX_ENV_VALUES * 4) as u32, ctx);
let mut env_ptr = ctx.memory(0)[env_offset as usize] as *mut c_int;
let mut _pool_ptr = ctx.memory(0)[pool_offset as usize] as *mut c_int;
*env_ptr = pool_offset as i32;
*environment = env_offset as i32;
@ -216,13 +175,13 @@ pub extern "C" fn ___build_environment(environ: c_int, vmctx: &mut Ctx) {
// };
}
pub extern "C" fn _sysconf(name: c_int, _vmctx: &mut Ctx) -> c_long {
pub extern "C" fn _sysconf(name: c_int, _ctx: &mut Ctx) -> c_long {
debug!("emscripten::_sysconf {}", name);
// TODO: Implement like emscripten expects regarding memory/page size
unsafe { sysconf(name) }
}
pub extern "C" fn ___assert_fail(a: c_int, b: c_int, c: c_int, d: c_int, _vmctx: &mut Ctx) {
pub extern "C" fn ___assert_fail(a: c_int, b: c_int, c: c_int, d: c_int, _ctx: &mut Ctx) {
debug!("emscripten::___assert_fail {} {} {} {}", a, b, c, d);
// TODO: Implement like emscripten expects regarding memory/page size
unimplemented!()