fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

Fixing merge issues

Browse Source
This commit is contained in:
Lachlan Sneff 2018-12-06 22:44:16 -05:00
parent 0e024aa722
commit a29b480e85
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ mod utils;
mod varargs;
pub use self::storage::{align_memory, static_alloc};
pub use self::utils::{is_emscripten_module, copy_cstr_array_into_wasm, allocate_on_stack, allocate_cstr_on_stack};
pub use self::utils::{is_emscripten_module, allocate_on_stack, allocate_cstr_on_stack};
// TODO: Magic number - how is this calculated?
const TOTAL_STACK: u32 = 5242880;

26
src/apis/emscripten/utils.rs
View File

@ -33,32 +33,6 @@ pub unsafe fn copy_cstr_into_wasm(instance: &mut Instance, cstr: *const c_char)
space_offset
}
pub unsafe fn copy_cstr_array_into_wasm(array_count: u32, array: *mut *mut c_char, instance: &mut Instance) -> u32 {
let array_offset = (instance.emscripten_data.as_ref().unwrap().malloc)((array_count as usize * size_of::<u32>()) as _, instance);
space_offset
}
pub unsafe fn copy_cstr_array_into_wasm_stack(array_count: u32, array: *mut *mut c_char, instance: &mut Instance) -> u32 {
let array_offset = (instance.emscripten_data.as_ref().unwrap().stack_alloc)(((array_count as usize + 1) * size_of::<u32>()) as _, instance);
let array_addr = instance.memory_offset_addr(0, array_offset as _) as *mut u32;
let array_slice = slice::from_raw_parts_mut(array_addr, array_count as usize);
for (i, ptr) in array_slice.iter_mut().enumerate() {
let offset = copy_cstr_into_wasm(instance, *array.add(i));
*ptr = offset;
}
// println!("###### x = {:?}", *array_addr.add(array_count as usize));
*array_addr.add(array_count as usize) = 0;
// let arg_addr = instance.memory_offset_addr(0, *array_addr.offset(0) as _) as *const i8;
// debug!("###### argv[0] = {:?}", CStr::from_ptr(arg_addr));
array_offset
}
pub unsafe fn allocate_on_stack<'a, T: Copy>(count: u32, instance: &'a Instance) -> (u32, &'a mut [T]) {
let offset = (instance.emscripten_data.as_ref().unwrap().stack_alloc)(count * (size_of::<T>() as u32), instance);
let addr = instance.memory_offset_addr(0, offset as _) as *mut T;

2
src/apis/mod.rs
View File

@ -1,4 +1,4 @@
pub mod emscripten;
pub mod host;
pub use self::emscripten::{align_memory, generate_emscripten_env, is_emscripten_module, copy_cstr_array_into_wasm_stack};
pub use self::emscripten::{align_memory, generate_emscripten_env, is_emscripten_module};