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

Add emscripten imports conditionally

Browse Source
This commit is contained in:
Syrus 2018-12-10 21:07:41 -08:00
parent 34e9e52b56
commit eefea5ebee
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/wasmer.rs
View File

@ -64,25 +64,30 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
.map_err(|err| format!("Can't convert from wast to wasm: {:?}", err))?; .map_err(|err| format!("Can't convert from wast to wasm: {:?}", err))?;
} }
// TODO: We should instantiate after compilation, so we provide the
// emscripten environment conditionally based on the module
let import_object = apis::generate_emscripten_env();
let isa = webassembly::get_isa(); let isa = webassembly::get_isa();
debug!("webassembly - creating module"); debug!("webassembly - creating module");
let module = webassembly::compile(wasm_binary).map_err(|err| format!("Can't create the WebAssembly module: {}", err))?; let module = webassembly::compile(wasm_binary).map_err(|err| format!("Can't create the WebAssembly module: {}", err))?;
let is_emscripten = apis::is_emscripten_module(&module);
let instance_options = webassembly::InstanceOptions { let instance_options = webassembly::InstanceOptions {
mock_missing_imports: true, mock_missing_imports: true,
mock_missing_globals: true, mock_missing_globals: true,
mock_missing_tables: true, mock_missing_tables: true,
use_emscripten: apis::is_emscripten_module(&module), use_emscripten: is_emscripten,
show_progressbar: true, show_progressbar: true,
isa: isa, isa: isa,
}; };
let import_object = if is_emscripten {
apis::generate_emscripten_env()
}
else {
webassembly::ImportObject::new()
};
debug!("webassembly - creating instance"); debug!("webassembly - creating instance");
let mut instance = webassembly::Instance::new( let mut instance = webassembly::Instance::new(
&module, &module,