mirror of
https://github.com/fluencelabs/wasmer
synced 2024-12-13 06:15:33 +00:00
Improved execute wasm to use emscripten conditionally
This commit is contained in:
parent
914addc1f3
commit
34e9e52b56
@ -67,16 +67,28 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
|
||||
// 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 webassembly::ResultObject { module, mut instance } =
|
||||
webassembly::instantiate(wasm_binary, import_object, Some(webassembly::InstanceOptions {
|
||||
|
||||
|
||||
let isa = webassembly::get_isa();
|
||||
|
||||
debug!("webassembly - creating module");
|
||||
let module = webassembly::compile(wasm_binary).map_err(|err| format!("Can't create the WebAssembly module: {}", err))?;
|
||||
|
||||
let instance_options = webassembly::InstanceOptions {
|
||||
mock_missing_imports: true,
|
||||
mock_missing_globals: true,
|
||||
mock_missing_tables: true,
|
||||
use_emscripten: true,
|
||||
use_emscripten: apis::is_emscripten_module(&module),
|
||||
show_progressbar: true,
|
||||
isa: webassembly::get_isa(),
|
||||
}))
|
||||
.map_err(|err| format!("Can't instantiate the WebAssembly module: {}", err))?;
|
||||
isa: isa,
|
||||
};
|
||||
|
||||
debug!("webassembly - creating instance");
|
||||
let mut instance = webassembly::Instance::new(
|
||||
&module,
|
||||
import_object,
|
||||
instance_options,
|
||||
).map_err(|err| format!("Can't instantiate the WebAssembly module: {}", err))?;
|
||||
|
||||
webassembly::start_instance(&module, &mut instance, options.path.to_str().unwrap(), options.args.iter().map(|arg| arg.as_str()).collect())
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user