fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-24 09:52:14 +00:00
Code Issues Projects Releases Wiki Activity

Added ___emscripten_environ_constructor initializer

Browse Source
This commit is contained in:
Syrus Akbary 2018-11-29 22:16:36 -08:00
parent d94e13778a
commit a6f47fa17d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/wasmer.rs
View File

@ -62,6 +62,14 @@ fn execute_wasm(wasm_path: PathBuf) -> Result<(), String> {
.map_err(|err| format!("Can't instantiate the WebAssembly module: {}", err))?; .map_err(|err| format!("Can't instantiate the WebAssembly module: {}", err))?;
if instance.emscripten_data.as_ref().is_some() { if instance.emscripten_data.as_ref().is_some() {
// Emscripten __ATINIT__
if let Some(&webassembly::Export::Function(environ_constructor_index)) = module.info.exports.get("___emscripten_environ_constructor") {
debug!("emscripten::___emscripten_environ_constructor");
let ___emscripten_environ_constructor: extern "C" fn(&webassembly::Instance) =
get_instance_function!(instance, environ_constructor_index);
call_protected!(___emscripten_environ_constructor(&instance)).map_err(|err| format!("{}", err))?;
};
// TODO: We also need to handle TTY.init() and SOCKFS.root = FS.mount(SOCKFS, {}, null)
let func_index = match module.info.exports.get("_main") { let func_index = match module.info.exports.get("_main") {
Some(&webassembly::Export::Function(index)) => index, Some(&webassembly::Export::Function(index)) => index,
_ => panic!("_main emscripten function not found"), _ => panic!("_main emscripten function not found"),
@ -69,6 +77,7 @@ fn execute_wasm(wasm_path: PathBuf) -> Result<(), String> {
let main: extern "C" fn(u32, u32, &webassembly::Instance) = let main: extern "C" fn(u32, u32, &webassembly::Instance) =
get_instance_function!(instance, func_index); get_instance_function!(instance, func_index);
return call_protected!(main(0, 0, &instance)).map_err(|err| format!("{}", err)); return call_protected!(main(0, 0, &instance)).map_err(|err| format!("{}", err));
// TODO: We should implement emscripten __ATEXIT__
} else { } else {
let func_index = let func_index =
instance instance