wasm2js: Generalize to allow 2-level imports This removes any hard-coded references to `env` (the mangic module name used by llvm and emscripten) and instead imports from whatever module name is used in import declaration.
diff --git a/src/wasm2js.h b/src/wasm2js.h index ab9fae0..73a35c7 100644 --- a/src/wasm2js.h +++ b/src/wasm2js.h
@@ -302,7 +302,11 @@ // on operations. std::unordered_set<Name> functionsCallableFromOutside; + std::unordered_set<Name> seenModuleImports; + void addBasics(Ref ast, Module* wasm); + void ensureModuleImport(Ref ast, Name module); + void addTableImport(Ref ast, Table* import); void addFunctionImport(Ref ast, Function* import); void addGlobalImport(Ref ast, Global* import); void addTable(Ref ast, Module* wasm); @@ -415,30 +419,17 @@ ret[1]->push_back(asmFunc); ValueBuilder::appendArgumentToFunction(asmFunc, importObject); - // Retrieve `env` object from info. Older version of emscripten pass `env` - // *as* `info` so for now we make this conditional. - // TODO(sbc): Remove the makeBinary here once emscripten change has landed. - Ref envVar = ValueBuilder::makeVar(); - asmFunc[3]->push_back(envVar); - ValueBuilder::appendToVar( - envVar, - ENV, - ValueBuilder::makeBinary( - ValueBuilder::makeDot(ValueBuilder::makeName(importObject), - ValueBuilder::makeName(ENV)), - "||", - ValueBuilder::makeName(importObject))); - // add memory import if (!wasm->memories.empty()) { if (wasm->memories[0]->imported()) { + ensureModuleImport(asmFunc[3], wasm->memories[0]->module); // find memory and buffer in imports Ref theVar = ValueBuilder::makeVar(); asmFunc[3]->push_back(theVar); ValueBuilder::appendToVar( theVar, "memory", - ValueBuilder::makeDot(ValueBuilder::makeName(ENV), + ValueBuilder::makeDot(ValueBuilder::makeName(wasm->memories[0]->module), ValueBuilder::makeName(wasm->memories[0]->base))); // Assign `buffer = memory.buffer` @@ -474,14 +465,8 @@ } // add imported tables - ModuleUtils::iterImportedTables(*wasm, [&](Table* table) { - Ref theVar = ValueBuilder::makeVar(); - asmFunc[3]->push_back(theVar); - ValueBuilder::appendToVar( - theVar, - FUNCTION_TABLE, - ValueBuilder::makeDot(ValueBuilder::makeName(ENV), table->base)); - }); + ModuleUtils::iterImportedTables( + *wasm, [&](Table* import) { addTableImport(asmFunc[3], import); }); // create heaps, etc addBasics(asmFunc[3], wasm); @@ -542,7 +527,7 @@ if (hasActiveSegments(*wasm)) { asmFunc[3]->push_back( ValueBuilder::makeCall(ValueBuilder::makeName("initActiveSegments"), - ValueBuilder::makeName(ENV))); + ValueBuilder::makeName(importObject))); } addTable(asmFunc[3], wasm); @@ -599,29 +584,61 @@ infinityVar, "infinity", ValueBuilder::makeName("Infinity")); } +static Ref maybeSub(Name object, Name key) { + auto mangled = stringToIString(asmangle(key.str)); + if (mangled != key) { + return ValueBuilder::makeSub(ValueBuilder::makeName(object), + ValueBuilder::makeString(key)); + } else { + return ValueBuilder::makeDot(ValueBuilder::makeName(object), + ValueBuilder::makeName(key)); + } +} + +void Wasm2JSBuilder::ensureModuleImport(Ref ast, Name module) { + if (seenModuleImports.count(module) != 0) { + return; + } + seenModuleImports.insert(module); + Ref theVar = ValueBuilder::makeVar(); + auto mangled = stringToIString(asmangle(module.str)); + ValueBuilder::appendToVar(theVar, mangled, maybeSub(importObject, module)); + ast->push_back(theVar); +} + +void Wasm2JSBuilder::addTableImport(Ref ast, Table* import) { + ensureModuleImport(ast, import->module); + + Ref theVar = ValueBuilder::makeVar(); + ast->push_back(theVar); + auto mangled = stringToIString(asmangle(import->module.str)); + ValueBuilder::appendToVar( + theVar, FUNCTION_TABLE, maybeSub(mangled, import->base)); +} + void Wasm2JSBuilder::addFunctionImport(Ref ast, Function* import) { // The scratch memory helpers are emitted in the glue, see code and comments // below. if (ABI::wasm2js::isHelper(import->base)) { return; } + ensureModuleImport(ast, import->module); + Ref theVar = ValueBuilder::makeVar(); ast->push_back(theVar); - // TODO: handle nested module imports - Ref module = ValueBuilder::makeName(ENV); - ValueBuilder::appendToVar( - theVar, - fromName(import->name, NameScope::Top), - ValueBuilder::makeDot(module, fromName(import->base, NameScope::Top))); + auto mangled = stringToIString(asmangle(import->module.str)); + ValueBuilder::appendToVar(theVar, + fromName(import->name, NameScope::Top), + maybeSub(mangled, import->base)); } void Wasm2JSBuilder::addGlobalImport(Ref ast, Global* import) { + ensureModuleImport(ast, import->module); + Ref theVar = ValueBuilder::makeVar(); ast->push_back(theVar); - // TODO: handle nested module imports - Ref module = ValueBuilder::makeName(ENV); - Ref value = - ValueBuilder::makeDot(module, fromName(import->base, NameScope::Top)); + auto mangled = stringToIString(asmangle(import->module.str)); + Ref value = maybeSub(mangled, import->base); if (import->type == Type::i32) { value = makeJsCoercion(value, JS_INT); } @@ -2638,14 +2655,8 @@ // // Note that the translation here expects that the lower values of this memory // can be used for conversions, so make sure there's at least one page. - if (!wasm.memories.empty() && wasm.memories[0]->imported()) { - out << "var mem" << moduleName.str << " = new ArrayBuffer(" - << wasm.memories[0]->initial.addr * Memory::kPageSize << ");\n"; - } - - // Actually invoke the `asmFunc` generated function, passing in all global - // values followed by all imports - out << "var ret" << moduleName.str << " = " << moduleName.str << "({\n"; + std::map<Name, std::vector<const Importable*>> module_map; + std::map<const Importable*, std::string> import_values; ModuleUtils::iterImportedFunctions(wasm, [&](Function* import) { // The special helpers are emitted in the glue, see code and comments @@ -2653,29 +2664,46 @@ if (ABI::wasm2js::isHelper(import->base)) { return; } - out << " " << asmangle(import->base.str) << ",\n"; + module_map[import->module].push_back(import); }); ModuleUtils::iterImportedMemories(wasm, [&](Memory* import) { - // The special helpers are emitted in the glue, see code and comments - // below. - if (ABI::wasm2js::isHelper(import->base)) { - return; - } - out << " " << asmangle(import->base.str) << ": { buffer : mem" - << moduleName.str << " }\n"; + module_map[import->module].push_back(import); + import_values[import] = + std::string("{ buffer : mem") + moduleName.str + " }"; }); - ModuleUtils::iterImportedTables(wasm, [&](Table* import) { - // The special helpers are emitted in the glue, see code and comments - // below. - if (ABI::wasm2js::isHelper(import->base)) { - return; - } - out << " " << asmangle(import->base.str) << ",\n"; - }); + ModuleUtils::iterImportedTables( + wasm, [&](Table* import) { module_map[import->module].push_back(import); }); - out << "});\n"; + // Actually invoke the `asmFunc` generated function, passing in all global + // values followed by all imports + if (module_map.size()) { + if (!wasm.memories.empty() && wasm.memories[0]->imported()) { + out << "var mem" << moduleName.str << " = new ArrayBuffer(" + << wasm.memories[0]->initial.addr * Memory::kPageSize << ");\n"; + } + out << "var ret" << moduleName.str << " = " << moduleName.str << "({\n"; + for (auto& [module, module_imports] : module_map) { + if (module.str == asmangle(module.str)) { + out << " " << module.str << ": {\n"; + } else { + out << " '" << module.str << "': {\n"; + } + for (const auto* import : module_imports) { + auto value = import_values[import]; + if (value.size()) { + out << " " << asmangle(import->base.str) << ": " << value << ",\n"; + } else { + out << " " << asmangle(import->base.str) << ",\n"; + } + } + out << " }\n"; + } + out << "});\n"; + } else { + out << "var ret" << moduleName.str << " = " << moduleName.str << "();\n"; + } if (flags.allowAsserts) { return; @@ -2781,8 +2809,9 @@ } if (auto* get = segment.offset->dynCast<GlobalGet>()) { auto internalName = get->name; - auto importedName = wasm.getGlobal(internalName)->base; - return std::string("imports[") + asmangle(importedName.str) + "]"; + auto* importedGlobal = wasm.getGlobal(internalName); + return std::string("imports.") + importedGlobal->module.str + "[" + + asmangle(importedGlobal->base.str) + "]"; } Fatal() << "non-constant offsets aren't supported yet\n"; };
diff --git a/test/binaryen.js/emit_asmjs.js.txt b/test/binaryen.js/emit_asmjs.js.txt index a91383f..5d9ea47 100644 --- a/test/binaryen.js/emit_asmjs.js.txt +++ b/test/binaryen.js/emit_asmjs.js.txt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -23,7 +22,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var main = retasmFunc.main;
diff --git a/test/wasm2js.asserts.js b/test/wasm2js.asserts.js index e04de29..502103b 100644 --- a/test/wasm2js.asserts.js +++ b/test/wasm2js.asserts.js
@@ -31,7 +31,6 @@ } function asmFunc0(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -67,8 +66,7 @@ }; } -var retasmFunc0 = asmFunc0({ -}); +var retasmFunc0 = asmFunc0(); function check1() { retasmFunc0.empty(); return 1 | 0;
diff --git a/test/wasm2js.traps.js b/test/wasm2js.traps.js index 31d9557..07b0293 100644 --- a/test/wasm2js.traps.js +++ b/test/wasm2js.traps.js
@@ -31,7 +31,6 @@ } function asmFunc0(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -67,8 +66,7 @@ }; } -var retasmFunc0 = asmFunc0({ -}); +var retasmFunc0 = asmFunc0(); function check1() { retasmFunc0.empty(); return 1 | 0;
diff --git a/test/wasm2js/add_div.2asm.js b/test/wasm2js/add_div.2asm.js index ff9bdc0..1cd9195 100644 --- a/test/wasm2js/add_div.2asm.js +++ b/test/wasm2js/add_div.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -23,6 +22,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/add_div.2asm.js.opt b/test/wasm2js/add_div.2asm.js.opt index 142330e..e9b2974 100644 --- a/test/wasm2js/add_div.2asm.js.opt +++ b/test/wasm2js/add_div.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -23,6 +22,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/atomic_fence.2asm.js b/test/wasm2js/atomic_fence.2asm.js index efe1761..18efe72 100644 --- a/test/wasm2js/atomic_fence.2asm.js +++ b/test/wasm2js/atomic_fence.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(1507328); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -56,6 +55,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var atomic_fence = retasmFunc.atomic_fence;
diff --git a/test/wasm2js/atomic_fence.2asm.js.opt b/test/wasm2js/atomic_fence.2asm.js.opt index 543f6b6..0885dac 100644 --- a/test/wasm2js/atomic_fence.2asm.js.opt +++ b/test/wasm2js/atomic_fence.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -22,6 +21,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var atomic_fence = retasmFunc.atomic_fence;
diff --git a/test/wasm2js/atomics_32.2asm.js b/test/wasm2js/atomics_32.2asm.js index 6d97947..1e13b9a 100644 --- a/test/wasm2js/atomics_32.2asm.js +++ b/test/wasm2js/atomics_32.2asm.js
@@ -90,7 +90,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(16777216); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -153,6 +152,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var test = retasmFunc.test;
diff --git a/test/wasm2js/atomics_32.2asm.js.opt b/test/wasm2js/atomics_32.2asm.js.opt index 0a7e3a2..f06d662 100644 --- a/test/wasm2js/atomics_32.2asm.js.opt +++ b/test/wasm2js/atomics_32.2asm.js.opt
@@ -90,7 +90,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(16777216); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -149,6 +148,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var test = retasmFunc.test;
diff --git a/test/wasm2js/base64.2asm.js b/test/wasm2js/base64.2asm.js index 35bd685..e5abf22 100644 --- a/test/wasm2js/base64.2asm.js +++ b/test/wasm2js/base64.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/base64.2asm.js.opt b/test/wasm2js/base64.2asm.js.opt index 35bd685..e5abf22 100644 --- a/test/wasm2js/base64.2asm.js.opt +++ b/test/wasm2js/base64.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/br.2asm.js b/test/wasm2js/br.2asm.js index 9e2c48d..bd12fe6 100644 --- a/test/wasm2js/br.2asm.js +++ b/test/wasm2js/br.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function dummy() { @@ -717,7 +717,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var type_i32 = retasmFunc.type_i32; export var type_i64 = retasmFunc.type_i64;
diff --git a/test/wasm2js/br_table.2asm.js b/test/wasm2js/br_table.2asm.js index dbc584d..7c610c0 100644 --- a/test/wasm2js/br_table.2asm.js +++ b/test/wasm2js/br_table.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function dummy() { @@ -13422,7 +13422,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var type_i32 = retasmFunc.type_i32; export var type_i64 = retasmFunc.type_i64;
diff --git a/test/wasm2js/br_table_hoisting.2asm.js b/test/wasm2js/br_table_hoisting.2asm.js index 8a4fad1..110097a 100644 --- a/test/wasm2js/br_table_hoisting.2asm.js +++ b/test/wasm2js/br_table_hoisting.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -177,8 +176,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var foo1 = retasmFunc.foo1; export var foo2 = retasmFunc.foo2; export var foo3 = retasmFunc.foo3;
diff --git a/test/wasm2js/br_table_hoisting.2asm.js.opt b/test/wasm2js/br_table_hoisting.2asm.js.opt index 3966c2b..a2e21a0 100644 --- a/test/wasm2js/br_table_hoisting.2asm.js.opt +++ b/test/wasm2js/br_table_hoisting.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -167,8 +166,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var foo1 = retasmFunc.foo1; export var foo2 = retasmFunc.foo2; export var foo3 = retasmFunc.foo3;
diff --git a/test/wasm2js/br_table_temp.2asm.js b/test/wasm2js/br_table_temp.2asm.js index 2c81be4..ea1eea7 100644 --- a/test/wasm2js/br_table_temp.2asm.js +++ b/test/wasm2js/br_table_temp.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -13264,8 +13263,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var type_i32 = retasmFunc.type_i32; export var type_i64 = retasmFunc.type_i64; export var type_f32 = retasmFunc.type_f32;
diff --git a/test/wasm2js/br_table_temp.2asm.js.opt b/test/wasm2js/br_table_temp.2asm.js.opt index d1407a5..8b380af 100644 --- a/test/wasm2js/br_table_temp.2asm.js.opt +++ b/test/wasm2js/br_table_temp.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -12685,8 +12684,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var type_i32 = retasmFunc.type_i32; export var type_i64 = retasmFunc.type_i64; export var type_f32 = retasmFunc.type_f32;
diff --git a/test/wasm2js/br_table_to_loop.2asm.js b/test/wasm2js/br_table_to_loop.2asm.js index 9d318bf..729d1b6 100644 --- a/test/wasm2js/br_table_to_loop.2asm.js +++ b/test/wasm2js/br_table_to_loop.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -41,7 +40,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var exp1 = retasmFunc.exp1; export var exp2 = retasmFunc.exp2;
diff --git a/test/wasm2js/br_table_to_loop.2asm.js.opt b/test/wasm2js/br_table_to_loop.2asm.js.opt index fb8e7f9..4f9a52a 100644 --- a/test/wasm2js/br_table_to_loop.2asm.js.opt +++ b/test/wasm2js/br_table_to_loop.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -27,7 +26,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var exp1 = retasmFunc.exp1; export var exp2 = retasmFunc.exp2;
diff --git a/test/wasm2js/break-drop.2asm.js b/test/wasm2js/break-drop.2asm.js index 2954ee9..b632b43 100644 --- a/test/wasm2js/break-drop.2asm.js +++ b/test/wasm2js/break-drop.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -32,8 +31,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var br = retasmFunc.br; export var br_if = retasmFunc.br_if; export var br_table = retasmFunc.br_table;
diff --git a/test/wasm2js/bulk-memory.2asm.js b/test/wasm2js/bulk-memory.2asm.js index 3712f6a..9cd8acf 100644 --- a/test/wasm2js/bulk-memory.2asm.js +++ b/test/wasm2js/bulk-memory.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,8 +17,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); var bufferView; @@ -31,7 +29,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -98,8 +95,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var fill = retasmFunc.fill; export var load8_u = retasmFunc.load8_u; @@ -134,7 +130,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -169,7 +164,7 @@ } bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; } @@ -180,8 +175,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var copy = retasmFunc.copy; export var load8_u = retasmFunc.load8_u; @@ -215,7 +209,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -282,8 +275,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var init = retasmFunc.init; export var load8_u = retasmFunc.load8_u; @@ -325,7 +317,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -364,7 +355,7 @@ } bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; } @@ -399,8 +390,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var drop_passive = retasmFunc.drop_passive; export var init_passive = retasmFunc.init_passive; export var drop_active = retasmFunc.drop_active;
diff --git a/test/wasm2js/bulk-memory.2asm.js.opt b/test/wasm2js/bulk-memory.2asm.js.opt index eb58d15..085a5c5 100644 --- a/test/wasm2js/bulk-memory.2asm.js.opt +++ b/test/wasm2js/bulk-memory.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,8 +17,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); var bufferView; @@ -31,7 +29,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -98,8 +95,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var fill = retasmFunc.fill; export var load8_u = retasmFunc.load8_u; @@ -134,7 +130,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -169,7 +164,7 @@ } bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; } @@ -180,8 +175,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var copy = retasmFunc.copy; export var load8_u = retasmFunc.load8_u; @@ -215,7 +209,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -282,8 +275,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var init = retasmFunc.init; export var load8_u = retasmFunc.load8_u; @@ -291,7 +283,6 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -358,8 +349,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var drop_passive = retasmFunc.drop_passive; export var init_passive = retasmFunc.init_passive; export var drop_active = retasmFunc.drop_active;
diff --git a/test/wasm2js/comments.2asm.js b/test/wasm2js/comments.2asm.js index 9eab5c8..f2d501b 100644 --- a/test/wasm2js/comments.2asm.js +++ b/test/wasm2js/comments.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,11 +17,9 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -40,5 +37,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/conversions-modified.2asm.js b/test/wasm2js/conversions-modified.2asm.js index cfc4073..8d31a68 100644 --- a/test/wasm2js/conversions-modified.2asm.js +++ b/test/wasm2js/conversions-modified.2asm.js
@@ -31,7 +31,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -44,6 +43,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0(x) { @@ -620,7 +620,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i64_extend_s_i32 = retasmFunc.i64_extend_s_i32; export var i64_extend_u_i32 = retasmFunc.i64_extend_u_i32;
diff --git a/test/wasm2js/conversions-modified.2asm.js.opt b/test/wasm2js/conversions-modified.2asm.js.opt index 97ad690..dc3c4b2 100644 --- a/test/wasm2js/conversions-modified.2asm.js.opt +++ b/test/wasm2js/conversions-modified.2asm.js.opt
@@ -31,7 +31,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -44,6 +43,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $3($0) { @@ -197,7 +197,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i64_extend_s_i32 = retasmFunc.i64_extend_s_i32; export var i64_extend_u_i32 = retasmFunc.i64_extend_u_i32;
diff --git a/test/wasm2js/deterministic.2asm.js b/test/wasm2js/deterministic.2asm.js index 2fd3780..38800fa 100644 --- a/test/wasm2js/deterministic.2asm.js +++ b/test/wasm2js/deterministic.2asm.js
@@ -3,7 +3,7 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.memory; var buffer = memory.buffer; var HEAP8 = new Int8Array(buffer); @@ -46,6 +46,8 @@ var memasmFunc = new ArrayBuffer(65536); var retasmFunc = asmFunc({ - memory: { buffer : memasmFunc } + env: { + memory: { buffer : memasmFunc }, + } }); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/deterministic.2asm.js.opt b/test/wasm2js/deterministic.2asm.js.opt index 4c9e0a1..9c7c01b 100644 --- a/test/wasm2js/deterministic.2asm.js.opt +++ b/test/wasm2js/deterministic.2asm.js.opt
@@ -3,7 +3,7 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.memory; var buffer = memory.buffer; var HEAP8 = new Int8Array(buffer); @@ -45,6 +45,8 @@ var memasmFunc = new ArrayBuffer(65536); var retasmFunc = asmFunc({ - memory: { buffer : memasmFunc } + env: { + memory: { buffer : memasmFunc }, + } }); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/dot_import.2asm.js b/test/wasm2js/dot_import.2asm.js index d49304e..dc9449b 100644 --- a/test/wasm2js/dot_import.2asm.js +++ b/test/wasm2js/dot_import.2asm.js
@@ -1,7 +1,6 @@ import { ba_se } from 'mod.ule'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,7 +13,8 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; - var base = env.ba_se; + var mod_ule = importObject["mod.ule"]; + var base = mod_ule["ba.se"]; function $0() { base(); } @@ -25,6 +25,8 @@ } var retasmFunc = asmFunc({ + 'mod.ule': { ba_se, + } }); export var exported = retasmFunc.exported;
diff --git a/test/wasm2js/dot_import.2asm.js.opt b/test/wasm2js/dot_import.2asm.js.opt index d49304e..dc9449b 100644 --- a/test/wasm2js/dot_import.2asm.js.opt +++ b/test/wasm2js/dot_import.2asm.js.opt
@@ -1,7 +1,6 @@ import { ba_se } from 'mod.ule'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,7 +13,8 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; - var base = env.ba_se; + var mod_ule = importObject["mod.ule"]; + var base = mod_ule["ba.se"]; function $0() { base(); } @@ -25,6 +25,8 @@ } var retasmFunc = asmFunc({ + 'mod.ule': { ba_se, + } }); export var exported = retasmFunc.exported;
diff --git a/test/wasm2js/dynamicLibrary.2asm.js b/test/wasm2js/dynamicLibrary.2asm.js index 93faf06..0a4d37f 100644 --- a/test/wasm2js/dynamicLibrary.2asm.js +++ b/test/wasm2js/dynamicLibrary.2asm.js
@@ -34,10 +34,10 @@ return uint8Array; } function initActiveSegments(imports) { - base64DecodeToExistingUint8Array(bufferView, imports[memoryBase], "ZHluYW1pYyBkYXRh"); + base64DecodeToExistingUint8Array(bufferView, imports.env[memoryBase], "ZHluYW1pYyBkYXRh"); } function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.memory; var buffer = memory.buffer; var HEAP8 = new Int8Array(buffer); @@ -75,7 +75,7 @@ } bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); var FUNCTION_TABLE = Table(new Array(10)); FUNCTION_TABLE[import$tableBase + 0] = foo; FUNCTION_TABLE[import$tableBase + 1] = bar; @@ -91,6 +91,8 @@ var memasmFunc = new ArrayBuffer(16777216); var retasmFunc = asmFunc({ - memory: { buffer : memasmFunc } + env: { + memory: { buffer : memasmFunc }, + } }); export var baz = retasmFunc.baz;
diff --git a/test/wasm2js/dynamicLibrary.2asm.js.opt b/test/wasm2js/dynamicLibrary.2asm.js.opt index 44b3411..09fc1e7 100644 --- a/test/wasm2js/dynamicLibrary.2asm.js.opt +++ b/test/wasm2js/dynamicLibrary.2asm.js.opt
@@ -34,10 +34,10 @@ return uint8Array; } function initActiveSegments(imports) { - base64DecodeToExistingUint8Array(bufferView, imports[memoryBase], "ZHluYW1pYyBkYXRh"); + base64DecodeToExistingUint8Array(bufferView, imports.env[memoryBase], "ZHluYW1pYyBkYXRh"); } function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.memory; var buffer = memory.buffer; var HEAP8 = new Int8Array(buffer); @@ -67,7 +67,7 @@ } bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); var FUNCTION_TABLE = Table(new Array(10)); FUNCTION_TABLE[import$tableBase + 0] = foo; FUNCTION_TABLE[import$tableBase + 1] = foo; @@ -83,6 +83,8 @@ var memasmFunc = new ArrayBuffer(16777216); var retasmFunc = asmFunc({ - memory: { buffer : memasmFunc } + env: { + memory: { buffer : memasmFunc }, + } }); export var baz = retasmFunc.baz;
diff --git a/test/wasm2js/empty_export.2asm.js b/test/wasm2js/empty_export.2asm.js index eb162b8..5f9c18a 100644 --- a/test/wasm2js/empty_export.2asm.js +++ b/test/wasm2js/empty_export.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -22,6 +21,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var $ = retasmFunc.$;
diff --git a/test/wasm2js/empty_export.2asm.js.opt b/test/wasm2js/empty_export.2asm.js.opt index eb162b8..5f9c18a 100644 --- a/test/wasm2js/empty_export.2asm.js.opt +++ b/test/wasm2js/empty_export.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -22,6 +21,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var $ = retasmFunc.$;
diff --git a/test/wasm2js/empty_table.2asm.js b/test/wasm2js/empty_table.2asm.js index 35bd685..e5abf22 100644 --- a/test/wasm2js/empty_table.2asm.js +++ b/test/wasm2js/empty_table.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/emscripten-grow-no.2asm.js b/test/wasm2js/emscripten-grow-no.2asm.js index 68ffdbe..71e788f 100644 --- a/test/wasm2js/emscripten-grow-no.2asm.js +++ b/test/wasm2js/emscripten-grow-no.2asm.js
@@ -24,7 +24,7 @@ base64DecodeToExistingUint8Array(bufferView, 1600, "YWJj"); } function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.memory; var buffer = memory.buffer; var HEAP8 = new Int8Array(buffer); @@ -52,7 +52,7 @@ // EMSCRIPTEN_END_FUNCS ; bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; }
diff --git a/test/wasm2js/emscripten-grow-no.2asm.js.opt b/test/wasm2js/emscripten-grow-no.2asm.js.opt index 68ffdbe..71e788f 100644 --- a/test/wasm2js/emscripten-grow-no.2asm.js.opt +++ b/test/wasm2js/emscripten-grow-no.2asm.js.opt
@@ -24,7 +24,7 @@ base64DecodeToExistingUint8Array(bufferView, 1600, "YWJj"); } function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.memory; var buffer = memory.buffer; var HEAP8 = new Int8Array(buffer); @@ -52,7 +52,7 @@ // EMSCRIPTEN_END_FUNCS ; bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; }
diff --git a/test/wasm2js/emscripten-grow-yes.2asm.js b/test/wasm2js/emscripten-grow-yes.2asm.js index 68a8c55..e48566e 100644 --- a/test/wasm2js/emscripten-grow-yes.2asm.js +++ b/test/wasm2js/emscripten-grow-yes.2asm.js
@@ -24,7 +24,7 @@ base64DecodeToExistingUint8Array(bufferView, 1600, "YWJj"); } function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.memory; var buffer = memory.buffer; memory.grow = __wasm_memory_grow; @@ -57,7 +57,7 @@ // EMSCRIPTEN_END_FUNCS ; bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; }
diff --git a/test/wasm2js/emscripten-grow-yes.2asm.js.opt b/test/wasm2js/emscripten-grow-yes.2asm.js.opt index 68a8c55..e48566e 100644 --- a/test/wasm2js/emscripten-grow-yes.2asm.js.opt +++ b/test/wasm2js/emscripten-grow-yes.2asm.js.opt
@@ -24,7 +24,7 @@ base64DecodeToExistingUint8Array(bufferView, 1600, "YWJj"); } function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.memory; var buffer = memory.buffer; memory.grow = __wasm_memory_grow; @@ -57,7 +57,7 @@ // EMSCRIPTEN_END_FUNCS ; bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); function __wasm_memory_size() { return buffer.byteLength / 65536 | 0; }
diff --git a/test/wasm2js/emscripten.2asm.js b/test/wasm2js/emscripten.2asm.js index 5156c63..7b7e7c4 100644 --- a/test/wasm2js/emscripten.2asm.js +++ b/test/wasm2js/emscripten.2asm.js
@@ -27,8 +27,8 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(16777216); + var env = importObject.env; var FUNCTION_TABLE = env.table; var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -214,7 +214,7 @@ // EMSCRIPTEN_END_FUNCS ; bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); FUNCTION_TABLE[1] = foo; FUNCTION_TABLE[2] = bar; FUNCTION_TABLE[3] = tabled;
diff --git a/test/wasm2js/emscripten.2asm.js.opt b/test/wasm2js/emscripten.2asm.js.opt index a9217f1..8c07e0e 100644 --- a/test/wasm2js/emscripten.2asm.js.opt +++ b/test/wasm2js/emscripten.2asm.js.opt
@@ -39,8 +39,8 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(16777216); + var env = importObject.env; var FUNCTION_TABLE = env.table; var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -209,7 +209,7 @@ // EMSCRIPTEN_END_FUNCS ; bufferView = HEAPU8; - initActiveSegments(env); + initActiveSegments(importObject); FUNCTION_TABLE[1] = foo; FUNCTION_TABLE[2] = bar; FUNCTION_TABLE[3] = internal;
diff --git a/test/wasm2js/endianness.2asm.js b/test/wasm2js/endianness.2asm.js index e87d6ed..c8863e0 100644 --- a/test/wasm2js/endianness.2asm.js +++ b/test/wasm2js/endianness.2asm.js
@@ -32,7 +32,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -54,6 +53,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function i16_store_little(address, value) { @@ -701,7 +701,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_load16_s = retasmFunc.i32_load16_s; export var i32_load16_u = retasmFunc.i32_load16_u;
diff --git a/test/wasm2js/excess_fallthrough.2asm.js b/test/wasm2js/excess_fallthrough.2asm.js index 2327fba..ab257ae 100644 --- a/test/wasm2js/excess_fallthrough.2asm.js +++ b/test/wasm2js/excess_fallthrough.2asm.js
@@ -2,7 +2,6 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -44,6 +43,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/excess_fallthrough.2asm.js.opt b/test/wasm2js/excess_fallthrough.2asm.js.opt index de165dd..4325c2a 100644 --- a/test/wasm2js/excess_fallthrough.2asm.js.opt +++ b/test/wasm2js/excess_fallthrough.2asm.js.opt
@@ -2,7 +2,6 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -25,6 +24,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/export_global.2asm.js b/test/wasm2js/export_global.2asm.js index fa1b497..1006cbb 100644 --- a/test/wasm2js/export_global.2asm.js +++ b/test/wasm2js/export_global.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -31,7 +30,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var HELLO = retasmFunc.HELLO; export var helloWorld = retasmFunc.helloWorld;
diff --git a/test/wasm2js/export_global.2asm.js.opt b/test/wasm2js/export_global.2asm.js.opt index 9352d89..f221dd1 100644 --- a/test/wasm2js/export_global.2asm.js.opt +++ b/test/wasm2js/export_global.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -31,7 +30,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var HELLO = retasmFunc.HELLO; export var helloWorld = retasmFunc.helloWorld;
diff --git a/test/wasm2js/f32.2asm.js b/test/wasm2js/f32.2asm.js index 904fd15..1f70d54 100644 --- a/test/wasm2js/f32.2asm.js +++ b/test/wasm2js/f32.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -105,8 +104,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var add = retasmFunc.add; export var sub = retasmFunc.sub; export var mul = retasmFunc.mul;
diff --git a/test/wasm2js/f32_cmp.2asm.js b/test/wasm2js/f32_cmp.2asm.js index 80766d4..29431e1 100644 --- a/test/wasm2js/f32_cmp.2asm.js +++ b/test/wasm2js/f32_cmp.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -59,8 +58,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var eq = retasmFunc.eq; export var ne = retasmFunc.ne; export var lt = retasmFunc.lt;
diff --git a/test/wasm2js/f64_cmp.2asm.js b/test/wasm2js/f64_cmp.2asm.js index da26764..b4cf066 100644 --- a/test/wasm2js/f64_cmp.2asm.js +++ b/test/wasm2js/f64_cmp.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -59,8 +58,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var eq = retasmFunc.eq; export var ne = retasmFunc.ne; export var lt = retasmFunc.lt;
diff --git a/test/wasm2js/fac.2asm.js b/test/wasm2js/fac.2asm.js index 087e763..5944e8f 100644 --- a/test/wasm2js/fac.2asm.js +++ b/test/wasm2js/fac.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0($0_1, $0$hi) { @@ -575,7 +575,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var fac_rec = retasmFunc.fac_rec; export var fac_rec_named = retasmFunc.fac_rec_named;
diff --git a/test/wasm2js/float-ops.2asm.js b/test/wasm2js/float-ops.2asm.js index 22c8383..fa18cbb 100644 --- a/test/wasm2js/float-ops.2asm.js +++ b/test/wasm2js/float-ops.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -505,8 +504,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var f32_add = retasmFunc.f32_add; export var f32_sub = retasmFunc.f32_sub; export var f32_mul = retasmFunc.f32_mul;
diff --git a/test/wasm2js/float-ops.2asm.js.opt b/test/wasm2js/float-ops.2asm.js.opt index 3a04777..1aa8018 100644 --- a/test/wasm2js/float-ops.2asm.js.opt +++ b/test/wasm2js/float-ops.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -315,8 +314,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var f32_add = retasmFunc.f32_add; export var f32_sub = retasmFunc.f32_sub; export var f32_mul = retasmFunc.f32_mul;
diff --git a/test/wasm2js/float_literals-modified.2asm.js b/test/wasm2js/float_literals-modified.2asm.js index d354f68..ed84b24 100644 --- a/test/wasm2js/float_literals-modified.2asm.js +++ b/test/wasm2js/float_literals-modified.2asm.js
@@ -19,7 +19,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -32,6 +31,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0() { @@ -1149,7 +1149,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var f32_nan = retasmFunc.f32_nan; export var f32_positive_nan = retasmFunc.f32_positive_nan;
diff --git a/test/wasm2js/float_literals-modified.2asm.js.opt b/test/wasm2js/float_literals-modified.2asm.js.opt index 96f68b8..8eb2f40 100644 --- a/test/wasm2js/float_literals-modified.2asm.js.opt +++ b/test/wasm2js/float_literals-modified.2asm.js.opt
@@ -15,7 +15,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -28,6 +27,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0() { @@ -365,7 +365,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var f32_nan = retasmFunc.f32_nan; export var f32_positive_nan = retasmFunc.f32_positive_nan;
diff --git a/test/wasm2js/float_misc.2asm.js b/test/wasm2js/float_misc.2asm.js index 86f4c11..5b21a60 100644 --- a/test/wasm2js/float_misc.2asm.js +++ b/test/wasm2js/float_misc.2asm.js
@@ -30,7 +30,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -285,8 +284,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var f32_add = retasmFunc.f32_add; export var f32_sub = retasmFunc.f32_sub; export var f32_mul = retasmFunc.f32_mul;
diff --git a/test/wasm2js/forward.2asm.js b/test/wasm2js/forward.2asm.js index 15b7425..063aa5a 100644 --- a/test/wasm2js/forward.2asm.js +++ b/test/wasm2js/forward.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -41,7 +40,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var even = retasmFunc.even; export var odd = retasmFunc.odd;
diff --git a/test/wasm2js/func-ptr-offset.2asm.js b/test/wasm2js/func-ptr-offset.2asm.js index f612ea7..ae53a0c 100644 --- a/test/wasm2js/func-ptr-offset.2asm.js +++ b/test/wasm2js/func-ptr-offset.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -36,6 +35,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var call = retasmFunc.call;
diff --git a/test/wasm2js/func-ptr-offset.2asm.js.opt b/test/wasm2js/func-ptr-offset.2asm.js.opt index 4b51ebf..7e26651 100644 --- a/test/wasm2js/func-ptr-offset.2asm.js.opt +++ b/test/wasm2js/func-ptr-offset.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -36,6 +35,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var call = retasmFunc.call;
diff --git a/test/wasm2js/func_ptrs.2asm.js b/test/wasm2js/func_ptrs.2asm.js index f98102a..a3d0708 100644 --- a/test/wasm2js/func_ptrs.2asm.js +++ b/test/wasm2js/func_ptrs.2asm.js
@@ -1,7 +1,6 @@ import { print_i32 } from 'spectest'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,7 +13,8 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; - var print = env.print_i32; + var spectest = importObject.spectest; + var print = spectest.print_i32; function $3() { return 13 | 0; } @@ -43,7 +43,9 @@ } var retasmFunc = asmFunc({ + spectest: { print_i32, + } }); export var one = retasmFunc.one; export var two = retasmFunc.two; @@ -51,7 +53,6 @@ export var four = retasmFunc.four; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -101,13 +102,11 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var callt = retasmFunc.callt; export var callu = retasmFunc.callu; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -139,6 +138,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var callt = retasmFunc.callt;
diff --git a/test/wasm2js/get-set-local.2asm.js b/test/wasm2js/get-set-local.2asm.js index 0c9ab3f..20c9af1 100644 --- a/test/wasm2js/get-set-local.2asm.js +++ b/test/wasm2js/get-set-local.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -61,6 +60,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var check_extend_ui32 = retasmFunc.check_extend_ui32;
diff --git a/test/wasm2js/get-set-local.2asm.js.opt b/test/wasm2js/get-set-local.2asm.js.opt index fb0520b..dd3da1c 100644 --- a/test/wasm2js/get-set-local.2asm.js.opt +++ b/test/wasm2js/get-set-local.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -22,6 +21,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var check_extend_ui32 = retasmFunc.check_extend_ui32;
diff --git a/test/wasm2js/get_local.2asm.js b/test/wasm2js/get_local.2asm.js index d719e5f..b179733 100644 --- a/test/wasm2js/get_local.2asm.js +++ b/test/wasm2js/get_local.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0() { @@ -242,7 +242,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var type_local_i32 = retasmFunc.type_local_i32; export var type_local_i64 = retasmFunc.type_local_i64;
diff --git a/test/wasm2js/global_i64.2asm.js b/test/wasm2js/global_i64.2asm.js index 77436cc..d9446c3 100644 --- a/test/wasm2js/global_i64.2asm.js +++ b/test/wasm2js/global_i64.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -34,6 +33,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var exp = retasmFunc.exp;
diff --git a/test/wasm2js/global_i64.2asm.js.opt b/test/wasm2js/global_i64.2asm.js.opt index 619a4a1..a9004ba 100644 --- a/test/wasm2js/global_i64.2asm.js.opt +++ b/test/wasm2js/global_i64.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -22,6 +21,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var exp = retasmFunc.exp;
diff --git a/test/wasm2js/grow-memory-tricky.2asm.js b/test/wasm2js/grow-memory-tricky.2asm.js index 0cb4aa8..a01b837 100644 --- a/test/wasm2js/grow-memory-tricky.2asm.js +++ b/test/wasm2js/grow-memory-tricky.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -80,8 +79,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var memory = retasmFunc.memory; export var f1 = retasmFunc.f1; export var f2 = retasmFunc.f2;
diff --git a/test/wasm2js/grow-memory-tricky.2asm.js.opt b/test/wasm2js/grow-memory-tricky.2asm.js.opt index e134fb9..310c2d7 100644 --- a/test/wasm2js/grow-memory-tricky.2asm.js.opt +++ b/test/wasm2js/grow-memory-tricky.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -70,8 +69,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var memory = retasmFunc.memory; export var f1 = retasmFunc.f1; export var f2 = retasmFunc.f2;
diff --git a/test/wasm2js/grow_memory.2asm.js b/test/wasm2js/grow_memory.2asm.js index 413a317..c52bace 100644 --- a/test/wasm2js/grow_memory.2asm.js +++ b/test/wasm2js/grow_memory.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -73,8 +72,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var memory = retasmFunc.memory; export var grow = retasmFunc.grow; export var current = retasmFunc.current;
diff --git a/test/wasm2js/i32.2asm.js b/test/wasm2js/i32.2asm.js index c9b3e31..4bc2c14 100644 --- a/test/wasm2js/i32.2asm.js +++ b/test/wasm2js/i32.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -259,8 +258,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var add = retasmFunc.add; export var sub = retasmFunc.sub; export var mul = retasmFunc.mul;
diff --git a/test/wasm2js/i64-add-sub.2asm.js b/test/wasm2js/i64-add-sub.2asm.js index 4dfbc10..2c1d3c0 100644 --- a/test/wasm2js/i64-add-sub.2asm.js +++ b/test/wasm2js/i64-add-sub.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -230,7 +229,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var check_add_i64 = retasmFunc.check_add_i64; export var check_sub_i64 = retasmFunc.check_sub_i64;
diff --git a/test/wasm2js/i64-add-sub.2asm.js.opt b/test/wasm2js/i64-add-sub.2asm.js.opt index 2bf310f..d271567 100644 --- a/test/wasm2js/i64-add-sub.2asm.js.opt +++ b/test/wasm2js/i64-add-sub.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -30,7 +29,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var check_add_i64 = retasmFunc.check_add_i64; export var check_sub_i64 = retasmFunc.check_sub_i64;
diff --git a/test/wasm2js/i64-ctz.2asm.js b/test/wasm2js/i64-ctz.2asm.js index 2a12ea0..1dce6b4 100644 --- a/test/wasm2js/i64-ctz.2asm.js +++ b/test/wasm2js/i64-ctz.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function popcnt64($0, $0$hi) { @@ -234,7 +234,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var a = retasmFunc.a; export var b = retasmFunc.b;
diff --git a/test/wasm2js/i64-ctz.2asm.js.opt b/test/wasm2js/i64-ctz.2asm.js.opt index a20760a..870fa12 100644 --- a/test/wasm2js/i64-ctz.2asm.js.opt +++ b/test/wasm2js/i64-ctz.2asm.js.opt
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function legalstub$popcnt64($0, $1) { @@ -66,7 +66,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var a = retasmFunc.a; export var b = retasmFunc.b;
diff --git a/test/wasm2js/i64-lowering.2asm.js b/test/wasm2js/i64-lowering.2asm.js index 06ac51a..6ef58fb 100644 --- a/test/wasm2js/i64-lowering.2asm.js +++ b/test/wasm2js/i64-lowering.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -789,8 +788,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var eq_i64 = retasmFunc.eq_i64; export var ne_i64 = retasmFunc.ne_i64; export var ge_s_i64 = retasmFunc.ge_s_i64;
diff --git a/test/wasm2js/i64-lowering.2asm.js.opt b/test/wasm2js/i64-lowering.2asm.js.opt index 829e260..6d16689 100644 --- a/test/wasm2js/i64-lowering.2asm.js.opt +++ b/test/wasm2js/i64-lowering.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -67,8 +66,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var eq_i64 = retasmFunc.eq_i64; export var ne_i64 = retasmFunc.ne_i64; export var ge_s_i64 = retasmFunc.ge_s_i64;
diff --git a/test/wasm2js/i64-rotate.2asm.js b/test/wasm2js/i64-rotate.2asm.js index 6b23a46..3463ee0 100644 --- a/test/wasm2js/i64-rotate.2asm.js +++ b/test/wasm2js/i64-rotate.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -442,7 +441,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var rotl = retasmFunc.rotl; export var rotr = retasmFunc.rotr;
diff --git a/test/wasm2js/i64-rotate.2asm.js.opt b/test/wasm2js/i64-rotate.2asm.js.opt index 5a5725f..b01e804 100644 --- a/test/wasm2js/i64-rotate.2asm.js.opt +++ b/test/wasm2js/i64-rotate.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -116,7 +115,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var rotl = retasmFunc.rotl; export var rotr = retasmFunc.rotr;
diff --git a/test/wasm2js/i64-select.2asm.js b/test/wasm2js/i64-select.2asm.js index 35bd685..e5abf22 100644 --- a/test/wasm2js/i64-select.2asm.js +++ b/test/wasm2js/i64-select.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/i64-select.2asm.js.opt b/test/wasm2js/i64-select.2asm.js.opt index 35bd685..e5abf22 100644 --- a/test/wasm2js/i64-select.2asm.js.opt +++ b/test/wasm2js/i64-select.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/i64-shifts.2asm.js b/test/wasm2js/i64-shifts.2asm.js index 0e8c005..194367f 100644 --- a/test/wasm2js/i64-shifts.2asm.js +++ b/test/wasm2js/i64-shifts.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -247,7 +246,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var shl_i64 = retasmFunc.shl_i64; export var shr_i64 = retasmFunc.shr_i64;
diff --git a/test/wasm2js/i64-shifts.2asm.js.opt b/test/wasm2js/i64-shifts.2asm.js.opt index 336aef6..97da605 100644 --- a/test/wasm2js/i64-shifts.2asm.js.opt +++ b/test/wasm2js/i64-shifts.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -45,7 +44,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var shl_i64 = retasmFunc.shl_i64; export var shr_i64 = retasmFunc.shr_i64;
diff --git a/test/wasm2js/if_unreachable.2asm.js b/test/wasm2js/if_unreachable.2asm.js index 35bd685..e5abf22 100644 --- a/test/wasm2js/if_unreachable.2asm.js +++ b/test/wasm2js/if_unreachable.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/if_unreachable.2asm.js.opt b/test/wasm2js/if_unreachable.2asm.js.opt index 35bd685..e5abf22 100644 --- a/test/wasm2js/if_unreachable.2asm.js.opt +++ b/test/wasm2js/if_unreachable.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/indirect-select.2asm.js b/test/wasm2js/indirect-select.2asm.js index c79b0ae..227861f 100644 --- a/test/wasm2js/indirect-select.2asm.js +++ b/test/wasm2js/indirect-select.2asm.js
@@ -1,7 +1,7 @@ import { table } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var FUNCTION_TABLE = env.table; var Math_imul = Math.imul; var Math_fround = Math.fround; @@ -32,7 +32,9 @@ } var retasmFunc = asmFunc({ + env: { table, + } }); export var foo_true = retasmFunc.foo_true; export var foo_false = retasmFunc.foo_false;
diff --git a/test/wasm2js/indirect-select.2asm.js.opt b/test/wasm2js/indirect-select.2asm.js.opt index 71cf642..0a24c99 100644 --- a/test/wasm2js/indirect-select.2asm.js.opt +++ b/test/wasm2js/indirect-select.2asm.js.opt
@@ -1,7 +1,7 @@ import { table } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var FUNCTION_TABLE = env.table; var Math_imul = Math.imul; var Math_fround = Math.fround; @@ -32,7 +32,9 @@ } var retasmFunc = asmFunc({ + env: { table, + } }); export var foo_true = retasmFunc.foo_true; export var foo_false = retasmFunc.foo_false;
diff --git a/test/wasm2js/int_exprs.2asm.js b/test/wasm2js/int_exprs.2asm.js index 3d5c276..985c7dc 100644 --- a/test/wasm2js/int_exprs.2asm.js +++ b/test/wasm2js/int_exprs.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -230,8 +229,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var i32_no_fold_cmp_s_offset = retasmFunc.i32_no_fold_cmp_s_offset; export var i32_no_fold_cmp_u_offset = retasmFunc.i32_no_fold_cmp_u_offset; export var i64_no_fold_cmp_s_offset = retasmFunc.i64_no_fold_cmp_s_offset; @@ -239,7 +237,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -252,6 +249,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0(x, x$hi) { @@ -316,13 +314,14 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i64_no_fold_wrap_extend_s = retasmFunc.i64_no_fold_wrap_extend_s; import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -335,6 +334,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0(x, x$hi) { @@ -398,13 +398,14 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i64_no_fold_wrap_extend_u = retasmFunc.i64_no_fold_wrap_extend_u; import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -417,6 +418,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0(x) { @@ -592,7 +594,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_shl_shr_s = retasmFunc.i32_no_fold_shl_shr_s; export var i32_no_fold_shl_shr_u = retasmFunc.i32_no_fold_shl_shr_u; @@ -601,7 +605,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -614,6 +617,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0(x) { @@ -789,7 +793,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_shr_s_shl = retasmFunc.i32_no_fold_shr_s_shl; export var i32_no_fold_shr_u_shl = retasmFunc.i32_no_fold_shr_u_shl; @@ -798,7 +804,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -811,6 +816,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -1601,7 +1607,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_div_s_mul = retasmFunc.i32_no_fold_div_s_mul; export var i32_no_fold_div_u_mul = retasmFunc.i32_no_fold_div_u_mul; @@ -1610,7 +1618,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -1623,6 +1630,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -2319,7 +2327,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_div_s_self = retasmFunc.i32_no_fold_div_s_self; export var i32_no_fold_div_u_self = retasmFunc.i32_no_fold_div_u_self; @@ -2328,7 +2338,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -2341,6 +2350,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -3019,7 +3029,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_rem_s_self = retasmFunc.i32_no_fold_rem_s_self; export var i32_no_fold_rem_u_self = retasmFunc.i32_no_fold_rem_u_self; @@ -3028,7 +3040,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -3041,6 +3052,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -3831,7 +3843,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_mul_div_s = retasmFunc.i32_no_fold_mul_div_s; export var i32_no_fold_mul_div_u = retasmFunc.i32_no_fold_mul_div_u; @@ -3840,7 +3854,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -3853,6 +3866,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -4485,14 +4499,15 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_div_s_2 = retasmFunc.i32_no_fold_div_s_2; export var i64_no_fold_div_s_2 = retasmFunc.i64_no_fold_div_s_2; import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -4505,6 +4520,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -5119,14 +5135,15 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_rem_s_2 = retasmFunc.i32_no_fold_rem_s_2; export var i64_no_fold_rem_s_2 = retasmFunc.i64_no_fold_rem_s_2; import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -5139,6 +5156,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -5835,7 +5853,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_div_s_0 = retasmFunc.i32_div_s_0; export var i32_div_u_0 = retasmFunc.i32_div_u_0; @@ -5844,7 +5864,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -5857,6 +5876,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -6553,7 +6573,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_div_s_3 = retasmFunc.i32_div_s_3; export var i32_div_u_3 = retasmFunc.i32_div_u_3; @@ -6562,7 +6584,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -6575,6 +6596,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -7271,7 +7293,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_div_s_5 = retasmFunc.i32_div_s_5; export var i32_div_u_5 = retasmFunc.i32_div_u_5; @@ -7280,7 +7304,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -7293,6 +7316,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -7989,7 +8013,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_div_s_7 = retasmFunc.i32_div_s_7; export var i32_div_u_7 = retasmFunc.i32_div_u_7; @@ -7998,7 +8024,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -8011,6 +8036,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -8689,7 +8715,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_rem_s_3 = retasmFunc.i32_rem_s_3; export var i32_rem_u_3 = retasmFunc.i32_rem_u_3; @@ -8698,7 +8726,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -8711,6 +8738,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -9389,7 +9417,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_rem_s_5 = retasmFunc.i32_rem_s_5; export var i32_rem_u_5 = retasmFunc.i32_rem_u_5; @@ -9398,7 +9428,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -9411,6 +9440,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -10089,7 +10119,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_rem_s_7 = retasmFunc.i32_rem_s_7; export var i32_rem_u_7 = retasmFunc.i32_rem_u_7; @@ -10098,7 +10130,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -10111,6 +10142,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var __wasm_intrinsics_temp_i64 = 0; var __wasm_intrinsics_temp_i64$hi = 0; @@ -10743,7 +10775,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_no_fold_div_neg1 = retasmFunc.i32_no_fold_div_neg1; export var i64_no_fold_div_neg1 = retasmFunc.i64_no_fold_div_neg1;
diff --git a/test/wasm2js/labels.2asm.js b/test/wasm2js/labels.2asm.js index 5a76995..a8ee5dc 100644 --- a/test/wasm2js/labels.2asm.js +++ b/test/wasm2js/labels.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -338,8 +337,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var block = retasmFunc.block; export var loop1 = retasmFunc.loop1; export var loop2 = retasmFunc.loop2;
diff --git a/test/wasm2js/left-to-right.2asm.js b/test/wasm2js/left-to-right.2asm.js index 68524fb..d36dd68 100644 --- a/test/wasm2js/left-to-right.2asm.js +++ b/test/wasm2js/left-to-right.2asm.js
@@ -27,7 +27,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -2163,8 +2162,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var i32_add = retasmFunc.i32_add; export var i32_sub = retasmFunc.i32_sub; export var i32_mul = retasmFunc.i32_mul;
diff --git a/test/wasm2js/minified-memory.2asm.js b/test/wasm2js/minified-memory.2asm.js index defabfc..0e48eb8 100644 --- a/test/wasm2js/minified-memory.2asm.js +++ b/test/wasm2js/minified-memory.2asm.js
@@ -1,6 +1,6 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.a; var buffer = memory.buffer; memory.grow = __wasm_memory_grow; @@ -61,6 +61,8 @@ var memasmFunc = new ArrayBuffer(65536); var retasmFunc = asmFunc({ - a: { buffer : memasmFunc } + env: { + a: { buffer : memasmFunc }, + } }); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/minified-memory.2asm.js.opt b/test/wasm2js/minified-memory.2asm.js.opt index 701f1d4..daaa93b 100644 --- a/test/wasm2js/minified-memory.2asm.js.opt +++ b/test/wasm2js/minified-memory.2asm.js.opt
@@ -1,6 +1,6 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var memory = env.a; var buffer = memory.buffer; memory.grow = __wasm_memory_grow; @@ -61,6 +61,8 @@ var memasmFunc = new ArrayBuffer(65536); var retasmFunc = asmFunc({ - a: { buffer : memasmFunc } + env: { + a: { buffer : memasmFunc }, + } }); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/minus_minus.2asm.js b/test/wasm2js/minus_minus.2asm.js index 46f0ee7..48ef801 100644 --- a/test/wasm2js/minus_minus.2asm.js +++ b/test/wasm2js/minus_minus.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -26,6 +25,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var func_44_invoker = retasmFunc.func_44_invoker;
diff --git a/test/wasm2js/minus_minus.2asm.js.opt b/test/wasm2js/minus_minus.2asm.js.opt index 0956156..fa4eaa1 100644 --- a/test/wasm2js/minus_minus.2asm.js.opt +++ b/test/wasm2js/minus_minus.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -22,6 +21,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var func_44_invoker = retasmFunc.func_44_invoker;
diff --git a/test/wasm2js/nested-selects.2asm.js b/test/wasm2js/nested-selects.2asm.js index 64bfa1e..bf37167 100644 --- a/test/wasm2js/nested-selects.2asm.js +++ b/test/wasm2js/nested-selects.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -23,6 +22,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var sign = retasmFunc.sign;
diff --git a/test/wasm2js/nested-selects.2asm.js.opt b/test/wasm2js/nested-selects.2asm.js.opt index 4c453ec..465d77b 100644 --- a/test/wasm2js/nested-selects.2asm.js.opt +++ b/test/wasm2js/nested-selects.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -23,6 +22,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var sign = retasmFunc.sign;
diff --git a/test/wasm2js/ordering.2asm.js b/test/wasm2js/ordering.2asm.js index 99794e5..01f6485 100644 --- a/test/wasm2js/ordering.2asm.js +++ b/test/wasm2js/ordering.2asm.js
@@ -1,7 +1,7 @@ import { table } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var FUNCTION_TABLE = env.table; var Math_imul = Math.imul; var Math_fround = Math.fround; @@ -55,6 +55,8 @@ } var retasmFunc = asmFunc({ + env: { table, + } }); export var main = retasmFunc.main;
diff --git a/test/wasm2js/ordering.2asm.js.opt b/test/wasm2js/ordering.2asm.js.opt index ff459dd..af240dd 100644 --- a/test/wasm2js/ordering.2asm.js.opt +++ b/test/wasm2js/ordering.2asm.js.opt
@@ -1,7 +1,7 @@ import { table } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; + var env = importObject.env; var FUNCTION_TABLE = env.table; var Math_imul = Math.imul; var Math_fround = Math.fround; @@ -46,6 +46,8 @@ } var retasmFunc = asmFunc({ + env: { table, + } }); export var main = retasmFunc.main;
diff --git a/test/wasm2js/reinterpret.2asm.js b/test/wasm2js/reinterpret.2asm.js index 5082c38..13e9737 100644 --- a/test/wasm2js/reinterpret.2asm.js +++ b/test/wasm2js/reinterpret.2asm.js
@@ -30,7 +30,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -97,7 +96,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var i32_roundtrip = retasmFunc.i32_roundtrip; export var i64_roundtrip = retasmFunc.i64_roundtrip;
diff --git a/test/wasm2js/reinterpret.2asm.js.opt b/test/wasm2js/reinterpret.2asm.js.opt index 7b9b87c..fbefd51 100644 --- a/test/wasm2js/reinterpret.2asm.js.opt +++ b/test/wasm2js/reinterpret.2asm.js.opt
@@ -22,7 +22,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -55,7 +54,6 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var i32_roundtrip = retasmFunc.i32_roundtrip; export var i64_roundtrip = retasmFunc.i64_roundtrip;
diff --git a/test/wasm2js/reinterpret_scratch.2asm.js b/test/wasm2js/reinterpret_scratch.2asm.js index c36595d..1508b21 100644 --- a/test/wasm2js/reinterpret_scratch.2asm.js +++ b/test/wasm2js/reinterpret_scratch.2asm.js
@@ -19,7 +19,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -61,6 +60,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/reinterpret_scratch.2asm.js.opt b/test/wasm2js/reinterpret_scratch.2asm.js.opt index caf2891..b767740 100644 --- a/test/wasm2js/reinterpret_scratch.2asm.js.opt +++ b/test/wasm2js/reinterpret_scratch.2asm.js.opt
@@ -15,7 +15,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -56,6 +55,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var foo = retasmFunc.foo;
diff --git a/test/wasm2js/set_local.2asm.js b/test/wasm2js/set_local.2asm.js index df82269..a93b6d7 100644 --- a/test/wasm2js/set_local.2asm.js +++ b/test/wasm2js/set_local.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0() { @@ -221,7 +221,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var type_local_i32 = retasmFunc.type_local_i32; export var type_local_i64 = retasmFunc.type_local_i64;
diff --git a/test/wasm2js/sign_ext.2asm.js b/test/wasm2js/sign_ext.2asm.js index 1900cfe..9f14467 100644 --- a/test/wasm2js/sign_ext.2asm.js +++ b/test/wasm2js/sign_ext.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0(x) { @@ -201,7 +201,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var test8 = retasmFunc.test8; export var test16 = retasmFunc.test16;
diff --git a/test/wasm2js/sign_ext.2asm.js.opt b/test/wasm2js/sign_ext.2asm.js.opt index 1ba32e2..011b7d1 100644 --- a/test/wasm2js/sign_ext.2asm.js.opt +++ b/test/wasm2js/sign_ext.2asm.js.opt
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0($0_1) { @@ -56,7 +56,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var test8 = retasmFunc.test8; export var test16 = retasmFunc.test16;
diff --git a/test/wasm2js/stack-modified.2asm.js b/test/wasm2js/stack-modified.2asm.js index 6642363..636c676 100644 --- a/test/wasm2js/stack-modified.2asm.js +++ b/test/wasm2js/stack-modified.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0(var$0, var$0$hi) { @@ -564,7 +564,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var fac_expr = retasmFunc.fac_expr; export var fac_stack = retasmFunc.fac_stack;
diff --git a/test/wasm2js/stack-modified.2asm.js.opt b/test/wasm2js/stack-modified.2asm.js.opt index 239dc6d..24f4912 100644 --- a/test/wasm2js/stack-modified.2asm.js.opt +++ b/test/wasm2js/stack-modified.2asm.js.opt
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function legalstub$0($0, $1) { @@ -61,7 +61,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var fac_expr = retasmFunc.fac_expr; export var fac_stack = retasmFunc.fac_stack;
diff --git a/test/wasm2js/start_func.2asm.js b/test/wasm2js/start_func.2asm.js index a6b87a0..2dbd721 100644 --- a/test/wasm2js/start_func.2asm.js +++ b/test/wasm2js/start_func.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -57,5 +56,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/start_func.2asm.js.opt b/test/wasm2js/start_func.2asm.js.opt index 957931a..c87e436 100644 --- a/test/wasm2js/start_func.2asm.js.opt +++ b/test/wasm2js/start_func.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -57,5 +56,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/switch.2asm.js b/test/wasm2js/switch.2asm.js index 984d0e9..e81c544 100644 --- a/test/wasm2js/switch.2asm.js +++ b/test/wasm2js/switch.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0(i) { @@ -184,7 +184,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var stmt = retasmFunc.stmt; export var expr = retasmFunc.expr;
diff --git a/test/wasm2js/tee_local.2asm.js b/test/wasm2js/tee_local.2asm.js index 8bced15..9582d6a 100644 --- a/test/wasm2js/tee_local.2asm.js +++ b/test/wasm2js/tee_local.2asm.js
@@ -1,7 +1,6 @@ import { setTempRet0 } from 'env'; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -14,6 +13,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0() { @@ -328,7 +328,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var type_local_i32 = retasmFunc.type_local_i32; export var type_local_i64 = retasmFunc.type_local_i64;
diff --git a/test/wasm2js/traps.2asm.js b/test/wasm2js/traps.2asm.js index 8ad162c..078b688 100644 --- a/test/wasm2js/traps.2asm.js +++ b/test/wasm2js/traps.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -725,15 +724,13 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var no_dce_i32_div_s = retasmFunc.no_dce_i32_div_s; export var no_dce_i32_div_u = retasmFunc.no_dce_i32_div_u; export var no_dce_i64_div_s = retasmFunc.no_dce_i64_div_s; export var no_dce_i64_div_u = retasmFunc.no_dce_i64_div_u; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -1440,15 +1437,13 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var no_dce_i32_rem_s = retasmFunc.no_dce_i32_rem_s; export var no_dce_i32_rem_u = retasmFunc.no_dce_i32_rem_u; export var no_dce_i64_rem_s = retasmFunc.no_dce_i64_rem_s; export var no_dce_i64_rem_u = retasmFunc.no_dce_i64_rem_u; function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -1561,8 +1556,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var no_dce_i32_trunc_f32_s = retasmFunc.no_dce_i32_trunc_f32_s; export var no_dce_i32_trunc_f32_u = retasmFunc.no_dce_i32_trunc_f32_u; export var no_dce_i32_trunc_f64_s = retasmFunc.no_dce_i32_trunc_f64_s; @@ -1573,7 +1567,6 @@ export var no_dce_i64_trunc_f64_u = retasmFunc.no_dce_i64_trunc_f64_u; function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -1714,8 +1707,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var no_dce_i32_load = retasmFunc.no_dce_i32_load; export var no_dce_i32_load16_s = retasmFunc.no_dce_i32_load16_s; export var no_dce_i32_load16_u = retasmFunc.no_dce_i32_load16_u;
diff --git a/test/wasm2js/unaligned.2asm.js b/test/wasm2js/unaligned.2asm.js index 4f3ffe8..ab37358 100644 --- a/test/wasm2js/unaligned.2asm.js +++ b/test/wasm2js/unaligned.2asm.js
@@ -32,7 +32,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -54,6 +53,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0() { @@ -178,7 +178,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_load = retasmFunc.i32_load; export var i64_load = retasmFunc.i64_load;
diff --git a/test/wasm2js/unaligned.2asm.js.opt b/test/wasm2js/unaligned.2asm.js.opt index 3178bb3..87f41b5 100644 --- a/test/wasm2js/unaligned.2asm.js.opt +++ b/test/wasm2js/unaligned.2asm.js.opt
@@ -28,7 +28,6 @@ } function asmFunc(importObject) { - var env = importObject.env || importObject; var buffer = new ArrayBuffer(65536); var HEAP8 = new Int8Array(buffer); var HEAP16 = new Int16Array(buffer); @@ -50,6 +49,7 @@ var Math_sqrt = Math.sqrt; var nan = NaN; var infinity = Infinity; + var env = importObject.env; var setTempRet0 = env.setTempRet0; var i64toi32_i32$HIGH_BITS = 0; function $0() { @@ -127,7 +127,9 @@ } var retasmFunc = asmFunc({ + env: { setTempRet0, + } }); export var i32_load = retasmFunc.i32_load; export var i64_load = retasmFunc.i64_load;
diff --git a/test/wasm2js/unary-ops.2asm.js b/test/wasm2js/unary-ops.2asm.js index f5b97ad..18997b6 100644 --- a/test/wasm2js/unary-ops.2asm.js +++ b/test/wasm2js/unary-ops.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -517,8 +516,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var i32_popcnt = retasmFunc.i32_popcnt; export var check_popcnt_i64 = retasmFunc.check_popcnt_i64; export var check_extend_ui32 = retasmFunc.check_extend_ui32;
diff --git a/test/wasm2js/unary-ops.2asm.js.opt b/test/wasm2js/unary-ops.2asm.js.opt index 44c4c59..89fe061 100644 --- a/test/wasm2js/unary-ops.2asm.js.opt +++ b/test/wasm2js/unary-ops.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -114,8 +113,7 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var i32_popcnt = retasmFunc.i32_popcnt; export var check_popcnt_i64 = retasmFunc.check_popcnt_i64; export var check_extend_ui32 = retasmFunc.check_extend_ui32;
diff --git a/test/wasm2js/unreachable-get-cycle.2asm.js b/test/wasm2js/unreachable-get-cycle.2asm.js index 35bd685..e5abf22 100644 --- a/test/wasm2js/unreachable-get-cycle.2asm.js +++ b/test/wasm2js/unreachable-get-cycle.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/unreachable-get-cycle.2asm.js.opt b/test/wasm2js/unreachable-get-cycle.2asm.js.opt index 35bd685..e5abf22 100644 --- a/test/wasm2js/unreachable-get-cycle.2asm.js.opt +++ b/test/wasm2js/unreachable-get-cycle.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/unreachable-insts.2asm.js b/test/wasm2js/unreachable-insts.2asm.js index 35bd685..e5abf22 100644 --- a/test/wasm2js/unreachable-insts.2asm.js +++ b/test/wasm2js/unreachable-insts.2asm.js
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/unreachable-insts.2asm.js.opt b/test/wasm2js/unreachable-insts.2asm.js.opt index 35bd685..e5abf22 100644 --- a/test/wasm2js/unreachable-insts.2asm.js.opt +++ b/test/wasm2js/unreachable-insts.2asm.js.opt
@@ -1,6 +1,5 @@ function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -18,5 +17,4 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc();
diff --git a/test/wasm2js/unreachable-later.2asm.js b/test/wasm2js/unreachable-later.2asm.js index a8b0565..699233a 100644 --- a/test/wasm2js/unreachable-later.2asm.js +++ b/test/wasm2js/unreachable-later.2asm.js
@@ -2,7 +2,6 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -66,6 +65,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var func_50 = retasmFunc.func_50;
diff --git a/test/wasm2js/unreachable-later.2asm.js.opt b/test/wasm2js/unreachable-later.2asm.js.opt index 8adbd1e..9fa406a 100644 --- a/test/wasm2js/unreachable-later.2asm.js.opt +++ b/test/wasm2js/unreachable-later.2asm.js.opt
@@ -2,7 +2,6 @@ function wasm2js_trap() { throw new Error('abort'); } function asmFunc(importObject) { - var env = importObject.env || importObject; var Math_imul = Math.imul; var Math_fround = Math.fround; var Math_abs = Math.abs; @@ -39,6 +38,5 @@ }; } -var retasmFunc = asmFunc({ -}); +var retasmFunc = asmFunc(); export var func_50 = retasmFunc.func_50;