fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-22 13:11:32 +00:00
Code Issues Projects Releases Wiki Activity

Simplified EmscriptenGlobals initialization

Browse Source
This commit is contained in:
Syrus
2019-01-28 14:31:03 -08:00
parent 23492a4c53
commit fe1846d180
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/emscripten/src/lib.rs
View File

@ -284,12 +284,10 @@ pub struct EmscriptenGlobals {
} }
impl EmscriptenGlobals { impl EmscriptenGlobals {
pub fn new( pub fn new(module: &Module) -> Self {
table_min: u32, let (table_min, table_max) = get_emscripten_table_size(&module);
table_max: Option<u32>, let (memory_min, memory_max) = get_emscripten_memory_size(&module);
memory_min: u32,
memory_max: Option<u32>,
) -> Self {
// Memory initialization // Memory initialization
let memory_type = Memory { let memory_type = Memory {
min: memory_min, min: memory_min,

4
lib/emscripten/tests/emtests/_common.rs
View File

@ -15,9 +15,7 @@ macro_rules! assert_emscripten_output {
// let module = compile(&wasm_bytes[..]) // let module = compile(&wasm_bytes[..])
// .map_err(|err| format!("Can't create the WebAssembly module: {}", err)).unwrap(); // NOTE: Need to figure what the unwrap is for ?? // .map_err(|err| format!("Can't create the WebAssembly module: {}", err)).unwrap(); // NOTE: Need to figure what the unwrap is for ??
let (table_min, table_max) = wasmer_emscripten::get_emscripten_table_size(&module); let mut emscripten_globals = EmscriptenGlobals::new(&module);
let (memory_min, memory_max) = wasmer_emscripten::get_emscripten_memory_size(&module);
let mut emscripten_globals = EmscriptenGlobals::new(table_min, table_max, memory_min, memory_max);
let import_object = generate_emscripten_env(&mut emscripten_globals); let import_object = generate_emscripten_env(&mut emscripten_globals);
let mut instance = module.instantiate(import_object) let mut instance = module.instantiate(import_object)

5
src/bin/wasmer.rs
View File

@ -70,10 +70,7 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
.map_err(|e| format!("Can't compile module: {:?}", e))?; .map_err(|e| format!("Can't compile module: {:?}", e))?;
let (_abi, import_object, em_globals) = if wasmer_emscripten::is_emscripten_module(&module) { let (_abi, import_object, em_globals) = if wasmer_emscripten::is_emscripten_module(&module) {
let (table_min, table_max) = wasmer_emscripten::get_emscripten_table_size(&module); let mut emscripten_globals = wasmer_emscripten::EmscriptenGlobals::new(&module);
let (memory_min, memory_max) = wasmer_emscripten::get_emscripten_memory_size(&module);
let mut emscripten_globals =
wasmer_emscripten::EmscriptenGlobals::new(table_min, table_max, memory_min, memory_max);
( (
InstanceABI::Emscripten, InstanceABI::Emscripten,
wasmer_emscripten::generate_emscripten_env(&mut emscripten_globals), wasmer_emscripten::generate_emscripten_env(&mut emscripten_globals),