diff options
59 files changed, 2060 insertions, 2033 deletions
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp index 43ddc954c..e0fab9901 100644 --- a/src/passes/Print.cpp +++ b/src/passes/Print.cpp @@ -224,7 +224,7 @@ struct PrintSExpression : public Visitor<PrintSExpression> { printCallBody(curr); } void visitCallImport(CallImport *curr) { - printOpening(o, "call_import "); + printOpening(o, "call "); printCallBody(curr); } void visitCallIndirect(CallIndirect *curr) { diff --git a/src/wasm-binary.h b/src/wasm-binary.h index 561a310b0..9b8451b98 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -411,7 +411,6 @@ enum ASTNodes { SetLocal = 0x15, CallFunction = 0x16, CallIndirect = 0x17, - CallImport = 0x18, TeeLocal = 0x19, GetGlobal = 0x1a, SetGlobal = 0x1b, @@ -727,27 +726,21 @@ public: } finishSection(start); } - - std::map<Name, uint32_t> mappedImports; // name of the Import => index - uint32_t getImportIndex(Name name) { - if (!mappedImports.size()) { - // Create name => index mapping. - for (size_t i = 0; i < wasm->imports.size(); i++) { - assert(mappedImports.count(wasm->imports[i]->name) == 0); - mappedImports[wasm->imports[i]->name] = i; - } - } - assert(mappedImports.count(name)); - return mappedImports[name]; - } - std::map<Name, uint32_t> mappedFunctions; // name of the Function => index + std::map<Name, Index> mappedFunctions; // name of the Function => index. first imports, then internals uint32_t getFunctionIndex(Name name) { if (!mappedFunctions.size()) { // Create name => index mapping. + for (auto& import : wasm->imports) { + if (import->kind != Import::Function) continue; + assert(mappedFunctions.count(import->name) == 0); + auto index = mappedFunctions.size(); + mappedFunctions[import->name] = index; + } for (size_t i = 0; i < wasm->functions.size(); i++) { assert(mappedFunctions.count(wasm->functions[i]->name) == 0); - mappedFunctions[wasm->functions[i]->name] = i; + auto index = mappedFunctions.size(); + mappedFunctions[wasm->functions[i]->name] = index; } } assert(mappedFunctions.count(name)); @@ -957,7 +950,7 @@ public: for (auto* operand : curr->operands) { recurse(operand); } - o << int8_t(BinaryConsts::CallImport) << U32LEB(curr->operands.size()) << U32LEB(getImportIndex(curr->target)); + o << int8_t(BinaryConsts::CallFunction) << U32LEB(curr->operands.size()) << U32LEB(getFunctionIndex(curr->target)); } void visitCallIndirect(CallIndirect *curr) { if (debug) std::cerr << "zz node: CallIndirect" << std::endl; @@ -1501,6 +1494,20 @@ public: } } + std::vector<Name> functionImportIndexes; // index in function index space => name of function import + + // gets a name in the combined function import+defined function space + Name getFunctionIndexName(Index i) { + if (i < functionImportIndexes.size()) { + auto* import = wasm.getImport(functionImportIndexes[i]); + assert(import->kind == Import::Function); + return import->name; + } else { + i -= functionImportIndexes.size(); + return wasm.functions.at(i)->name; + } + } + void readImports() { if (debug) std::cerr << "== readImports" << std::endl; size_t num = getU32LEB(); @@ -1511,16 +1518,17 @@ public: curr->name = Name(std::string("import$") + std::to_string(i)); curr->kind = (Import::Kind)getU32LEB(); switch (curr->kind) { - case Export::Function: { + case Import::Function: { auto index = getU32LEB(); assert(index < wasm.functionTypes.size()); curr->functionType = wasm.getFunctionType(index); assert(curr->functionType->name.is()); + functionImportIndexes.push_back(curr->name); break; } - case Export::Table: break; - case Export::Memory: break; - case Export::Global: curr->globalType = getWasmType(); break; + case Import::Table: break; + case Import::Memory: break; + case Import::Global: curr->globalType = getWasmType(); break; default: WASM_UNREACHABLE(); } curr->module = getInlineString(); @@ -1529,7 +1537,7 @@ public: } } - std::vector<FunctionType*> functionTypes; + std::vector<FunctionType*> functionTypes; // types of defined functions void readFunctionSignatures() { if (debug) std::cerr << "== readFunctionSignatures" << std::endl; @@ -1551,7 +1559,7 @@ public: // We read functions before we know their names, so we need to backpatch the names later std::vector<Function*> functions; // we store functions here before wasm.addFunction after we know their names - std::map<size_t, std::vector<Call*>> functionCalls; // at index i we have all calls to i + std::map<Index, std::vector<Call*>> functionCalls; // at index i we have all calls to the defined function i Function* currFunction = nullptr; size_t endOfFunction; @@ -1611,7 +1619,7 @@ public: } } - std::map<Export*, size_t> exportIndexes; + std::map<Export*, Index> exportIndexes; void readExports() { if (debug) std::cerr << "== readExports" << std::endl; @@ -1705,7 +1713,10 @@ public: for (auto& iter : exportIndexes) { Export* curr = iter.first; switch (curr->kind) { - case Export::Function: curr->value = wasm.functions[iter.second]->name; break; + case Export::Function: { + curr->value = getFunctionIndexName(iter.second); + break; + } case Export::Table: curr->value = Name::fromInt(0); break; case Export::Memory: curr->value = Name::fromInt(0); break; case Export::Global: curr->value = getGlobalName(iter.second); break; @@ -1726,7 +1737,7 @@ public: auto i = pair.first; auto& indexes = pair.second; for (auto j : indexes) { - wasm.table.segments[i].data.push_back(wasm.functions[j]->name); + wasm.table.segments[i].data.push_back(getFunctionIndexName(j)); } } } @@ -1795,8 +1806,7 @@ public: case BinaryConsts::Br: case BinaryConsts::BrIf: visitBreak((curr = allocator.alloc<Break>())->cast<Break>(), code); break; // code distinguishes br from br_if case BinaryConsts::TableSwitch: visitSwitch((curr = allocator.alloc<Switch>())->cast<Switch>()); break; - case BinaryConsts::CallFunction: visitCall((curr = allocator.alloc<Call>())->cast<Call>()); break; - case BinaryConsts::CallImport: visitCallImport((curr = allocator.alloc<CallImport>())->cast<CallImport>()); break; + case BinaryConsts::CallFunction: curr = visitCall(); break; // we don't know if it's a call or call_import yet case BinaryConsts::CallIndirect: visitCallIndirect((curr = allocator.alloc<CallIndirect>())->cast<CallIndirect>()); break; case BinaryConsts::GetLocal: visitGetLocal((curr = allocator.alloc<GetLocal>())->cast<GetLocal>()); break; case BinaryConsts::TeeLocal: @@ -1938,38 +1948,45 @@ public: } curr->default_ = getBreakName(getInt32()); } - void visitCall(Call *curr) { - if (debug) std::cerr << "zz node: Call" << std::endl; - auto arity = getU32LEB(); - WASM_UNUSED(arity); - auto index = getU32LEB(); - assert(index < functionTypes.size()); - auto type = functionTypes[index]; + + template<typename T> + void fillCall(T* call, FunctionType* type, Index arity) { + assert(type); auto num = type->params.size(); assert(num == arity); - curr->operands.resize(num); + call->operands.resize(num); for (size_t i = 0; i < num; i++) { - curr->operands[num - i - 1] = popExpression(); + call->operands[num - i - 1] = popExpression(); } - curr->type = type->result; - functionCalls[index].push_back(curr); + call->type = type->result; } - void visitCallImport(CallImport *curr) { - if (debug) std::cerr << "zz node: CallImport" << std::endl; + + Expression* visitCall() { + if (debug) std::cerr << "zz node: Call" << std::endl; auto arity = getU32LEB(); WASM_UNUSED(arity); - auto import = wasm.getImport(getU32LEB()); - curr->target = import->name; - auto type = import->functionType; - assert(type); - auto num = type->params.size(); - assert(num == arity); - if (debug) std::cerr << "zz node: CallImport " << curr->target << " with type " << type->name << " and " << num << " params\n"; - curr->operands.resize(num); - for (size_t i = 0; i < num; i++) { - curr->operands[num - i - 1] = popExpression(); + auto index = getU32LEB(); + FunctionType* type; + Expression* ret; + if (index < functionImportIndexes.size()) { + // this is a call of an imported function + auto* call = allocator.alloc<CallImport>(); + auto* import = wasm.getImport(functionImportIndexes[index]); + call->target = import->name; + type = import->functionType; + fillCall(call, type, arity); + ret = call; + } else { + // this is a call of a defined function + auto* call = allocator.alloc<Call>(); + auto adjustedIndex = index - functionImportIndexes.size(); + assert(adjustedIndex < functionTypes.size()); + type = functionTypes[adjustedIndex]; + fillCall(call, type, arity); + functionCalls[adjustedIndex].push_back(call); // we don't know function names yet + ret = call; } - curr->type = type->result; + return ret; } void visitCallIndirect(CallIndirect *curr) { if (debug) std::cerr << "zz node: CallIndirect" << std::endl; diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index 9abdea744..1a9e71bd4 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -1207,8 +1207,18 @@ private: } Expression* makeCall(Element& s) { + auto target = s[1]->str(); + auto* import = wasm.checkImport(target); + if (import && import->kind == Import::Function) { + auto ret = allocator.alloc<CallImport>(); + ret->target = target; + Import* import = wasm.getImport(ret->target); + ret->type = import->functionType->result; + parseCallOperands(s, 2, s.size(), ret); + return ret; + } auto ret = allocator.alloc<Call>(); - ret->target = s[1]->str(); + ret->target = target; ret->type = functionTypes[ret->target]; parseCallOperands(s, 2, s.size(), ret); return ret; diff --git a/test/dot_s/asm_const.wast b/test/dot_s/asm_const.wast index 2561d174f..5e84d771e 100644 --- a/test/dot_s/asm_const.wast +++ b/test/dot_s/asm_const.wast @@ -7,7 +7,7 @@ (export "main" (func $main)) (func $main (result i32) (drop - (call_import $emscripten_asm_const_vi + (call $emscripten_asm_const_vi (i32.const 0) ) ) diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast index e3801612f..77c1e1ab3 100644 --- a/test/dot_s/basics.wast +++ b/test/dot_s/basics.wast @@ -14,7 +14,7 @@ (elem (i32.const 0) $__wasm_nullptr $main) (func $main (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (drop - (call_import $puts + (call $puts (i32.const 16) ) ) diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast index 3833bc742..89fc2807f 100644 --- a/test/dot_s/bcp-1.wast +++ b/test/dot_s/bcp-1.wast @@ -288,34 +288,34 @@ ) ) (drop - (call_import $exit + (call $exit (get_local $0) ) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) diff --git a/test/dot_s/exit.wast b/test/dot_s/exit.wast index 8850a5bb4..a6abcbdf0 100644 --- a/test/dot_s/exit.wast +++ b/test/dot_s/exit.wast @@ -7,7 +7,7 @@ (func $main (result i32) (local $0 i32) (drop - (call_import $exit + (call $exit (i32.const 0) ) ) diff --git a/test/dot_s/fix_em_ehsjlj_names.wast b/test/dot_s/fix_em_ehsjlj_names.wast index 6f4a5471b..912716524 100644 --- a/test/dot_s/fix_em_ehsjlj_names.wast +++ b/test/dot_s/fix_em_ehsjlj_names.wast @@ -38,12 +38,12 @@ (local $2 i32) (local $3 i32) (drop - (call_import $invoke_v + (call $invoke_v (i32.const 1) ) ) (drop - (call_import $invoke_iiii + (call $invoke_iiii (i32.const 2) (i32.const 1) (i32.const 2) @@ -51,14 +51,14 @@ ) ) (drop - (call_import $invoke_ffd + (call $invoke_ffd (i32.const 3) (f32.const 1.5) (f64.const 3.4) ) ) (drop - (call_import $invoke_iii + (call $invoke_iii (i32.const 4) (i32.add (get_local $1) @@ -71,7 +71,7 @@ ) ) (drop - (call_import $emscripten_longjmp + (call $emscripten_longjmp (i32.const 5) (i32.const 6) ) diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast index 6be1df73f..b691c1c1b 100644 --- a/test/dot_s/indidx.wast +++ b/test/dot_s/indidx.wast @@ -30,7 +30,7 @@ (i32.load (i32.add (i32.shl - (call_import $getchar) + (call $getchar) (i32.const 2) ) (i32.const -176) diff --git a/test/dot_s/indirect-import.wast b/test/dot_s/indirect-import.wast index 0d8434ebe..ff1550a12 100644 --- a/test/dot_s/indirect-import.wast +++ b/test/dot_s/indirect-import.wast @@ -48,7 +48,7 @@ ) ) (drop - (call_import $extern_vj + (call $extern_vj (i64.const 1) ) ) @@ -59,7 +59,7 @@ ) ) (drop - (call_import $extern_v) + (call $extern_v) ) (drop (i32.store offset=16 @@ -68,7 +68,7 @@ ) ) (drop - (call_import $extern_ijidf + (call $extern_ijidf (i64.const 1) (i32.const 2) (f64.const 3) @@ -110,20 +110,20 @@ (unreachable) ) (func $__importThunk_extern_fd (type $FUNCSIG$fd) (param $0 f64) (result f32) - (call_import $extern_fd + (call $extern_fd (get_local $0) ) ) (func $__importThunk_extern_vj (type $FUNCSIG$vj) (param $0 i64) - (call_import $extern_vj + (call $extern_vj (get_local $0) ) ) (func $__importThunk_extern_v (type $FUNCSIG$v) - (call_import $extern_v) + (call $extern_v) ) (func $__importThunk_extern_ijidf (type $FUNCSIG$ijidf) (param $0 i64) (param $1 i32) (param $2 f64) (param $3 f32) (result i32) - (call_import $extern_ijidf + (call $extern_ijidf (get_local $0) (get_local $1) (get_local $2) @@ -131,12 +131,12 @@ ) ) (func $__importThunk_extern_struct (type $FUNCSIG$vi) (param $0 i32) - (call_import $extern_struct + (call $extern_struct (get_local $0) ) ) (func $__importThunk_extern_sret (type $FUNCSIG$vi) (param $0 i32) - (call_import $extern_sret + (call $extern_sret (get_local $0) ) ) diff --git a/test/dot_s/macClangMetaData.wast b/test/dot_s/macClangMetaData.wast index 9f8fcc61a..3fbcf2d38 100644 --- a/test/dot_s/macClangMetaData.wast +++ b/test/dot_s/macClangMetaData.wast @@ -7,7 +7,7 @@ (export "main" (func $main)) (func $main (param $0 i32) (param $1 i32) (result i32) (drop - (call_import $puts + (call $puts (i32.const 16) ) ) diff --git a/test/dot_s/memops.wast b/test/dot_s/memops.wast index 221ccbae2..fc6d21fa8 100644 --- a/test/dot_s/memops.wast +++ b/test/dot_s/memops.wast @@ -13,7 +13,7 @@ ) ) (drop - (call_import $emscripten_asm_const_vi + (call $emscripten_asm_const_vi (i32.const 0) ) ) diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm index 4966ce28a..3d968f754 100644 --- a/test/emcc_O2_hello_world.fromasm +++ b/test/emcc_O2_hello_world.fromasm @@ -227,7 +227,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -251,7 +251,7 @@ (get_local $5) ) ) - (call_import $_abort) + (call $_abort) ) ) (i32.store @@ -469,7 +469,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -498,7 +498,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) ) (block @@ -609,7 +609,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $38 (get_local $19) @@ -866,7 +866,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -878,7 +878,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $2 (i32.load offset=24 @@ -986,7 +986,7 @@ (get_local $9) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -1008,7 +1008,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -1022,7 +1022,7 @@ ) (get_local $1) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -1049,7 +1049,7 @@ (get_local $6) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -1114,7 +1114,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -1153,7 +1153,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $19) @@ -1170,7 +1170,7 @@ (get_local $0) (get_local $6) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $19) @@ -1196,7 +1196,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $19) @@ -1329,7 +1329,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $39 (get_local $6) @@ -1984,7 +1984,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -1996,7 +1996,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $5 (i32.load offset=24 @@ -2104,7 +2104,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -2126,7 +2126,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -2140,7 +2140,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -2167,7 +2167,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -2232,7 +2232,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -2271,7 +2271,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $9) @@ -2288,7 +2288,7 @@ (get_local $10) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $9) @@ -2314,7 +2314,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $9) @@ -2412,7 +2412,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $14 (get_local $5) @@ -2729,7 +2729,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $23) @@ -2800,7 +2800,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3029,7 +3029,7 @@ (i32.and (i32.add (tee_local $15 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -3037,7 +3037,7 @@ ) (get_local $15) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.const 656) @@ -3067,7 +3067,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -3253,7 +3253,7 @@ (if (i32.eq (tee_local $9 - (call_import $_sbrk + (call $_sbrk (get_local $14) ) ) @@ -3311,7 +3311,7 @@ ) (i32.ne (tee_local $3 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -3404,7 +3404,7 @@ (if (i32.eq (tee_local $9 - (call_import $_sbrk + (call $_sbrk (get_local $0) ) ) @@ -3495,14 +3495,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $2) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $9) ) ) @@ -3559,12 +3559,12 @@ (i32.and (i32.lt_u (tee_local $1 - (call_import $_sbrk + (call $_sbrk (get_local $4) ) ) (tee_local $4 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4161,7 +4161,7 @@ (get_local $9) (get_local $17) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -4183,7 +4183,7 @@ ) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -4197,7 +4197,7 @@ ) (get_local $4) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4224,7 +4224,7 @@ (get_local $21) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4262,7 +4262,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4327,7 +4327,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $24) @@ -4349,7 +4349,7 @@ (get_local $9) (get_local $21) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $24) @@ -4378,7 +4378,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $24) @@ -4424,7 +4424,7 @@ (get_local $9) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (br_if $do-once$61 (i32.eq @@ -4434,7 +4434,7 @@ (get_local $4) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4480,7 +4480,7 @@ (get_local $21) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4501,7 +4501,7 @@ (br $do-once$63) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4619,7 +4619,7 @@ (br $do-once$65) ) ) - (call_import $_abort) + (call $_abort) ) (block (i32.store @@ -4933,7 +4933,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $43) @@ -5004,7 +5004,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5351,7 +5351,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $44 (get_local $4) @@ -5663,7 +5663,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $45) @@ -5734,7 +5734,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5984,7 +5984,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6003,7 +6003,7 @@ ) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $8 (i32.add @@ -6061,7 +6061,7 @@ ) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6169,7 +6169,7 @@ (get_local $11) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6178,7 +6178,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6223,7 +6223,7 @@ (get_local $1) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6240,7 +6240,7 @@ (set_local $10 (get_local $3) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $10 @@ -6380,7 +6380,7 @@ (get_local $9) (get_local $14) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -6402,7 +6402,7 @@ ) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6416,7 +6416,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6443,7 +6443,7 @@ (get_local $1) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6513,7 +6513,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6561,7 +6561,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $5) @@ -6583,7 +6583,7 @@ (get_local $3) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $5) @@ -6609,7 +6609,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $5) @@ -6654,7 +6654,7 @@ (get_local $2) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -6672,7 +6672,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.and @@ -6925,7 +6925,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $3) @@ -6949,7 +6949,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6963,7 +6963,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6990,7 +6990,7 @@ (get_local $9) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7054,7 +7054,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7093,7 +7093,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $12) @@ -7115,7 +7115,7 @@ (get_local $0) (get_local $9) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $12) @@ -7141,7 +7141,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $12) @@ -7191,7 +7191,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -7200,7 +7200,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7241,7 +7241,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7258,7 +7258,7 @@ (set_local $16 (get_local $6) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $16 @@ -7367,7 +7367,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $15 (get_local $7) @@ -7651,7 +7651,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $18) @@ -7722,7 +7722,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7905,7 +7905,7 @@ (i32.const 8) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 4) (get_local $0) ) @@ -7925,13 +7925,13 @@ ) (set_local $9 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $12) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (get_local $9) @@ -7952,7 +7952,7 @@ (get_local $4) ) (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $11) ) @@ -8456,7 +8456,7 @@ (i32.const 0) ) ) - (call_import $___lock + (call $___lock (i32.const 36) ) (if @@ -8525,7 +8525,7 @@ (get_local $0) ) ) - (call_import $___unlock + (call $___unlock (i32.const 36) ) (get_local $2) @@ -8968,7 +8968,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $0) (get_local $1) (get_local $2) @@ -9397,7 +9397,7 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $3) ) @@ -9552,7 +9552,7 @@ (get_local $4) ) (get_local $2) - (call_import $i32u-div + (call $i32u-div (get_local $0) (get_local $1) ) @@ -9605,7 +9605,7 @@ ) ) (i32.ne - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $3) ) @@ -9702,7 +9702,7 @@ ) (set_local $0 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $2) ) @@ -9800,7 +9800,7 @@ (i32.const 8) ) (i32.load offset=60 - (call_import $_pthread_self) + (call $_pthread_self) ) (i32.const 60) ) @@ -9878,7 +9878,7 @@ ) ) (func $b1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $abort + (call $abort (i32.const 1) ) (i32.const 0) @@ -9894,7 +9894,7 @@ ) ) (func $b0 (param $0 i32) (result i32) - (call_import $abort + (call $abort (i32.const 0) ) (i32.const 0) @@ -9920,7 +9920,7 @@ (get_global $STACKTOP) ) (func $b2 (param $0 i32) - (call_import $abort + (call $abort (i32.const 2) ) ) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise index e0f340478..50ba812c3 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise +++ b/test/emcc_O2_hello_world.fromasm.imprecise @@ -225,7 +225,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -249,7 +249,7 @@ (get_local $5) ) ) - (call_import $_abort) + (call $_abort) ) ) (i32.store @@ -467,7 +467,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -496,7 +496,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) ) (block @@ -607,7 +607,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $38 (get_local $19) @@ -864,7 +864,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -876,7 +876,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $2 (i32.load offset=24 @@ -984,7 +984,7 @@ (get_local $9) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -1006,7 +1006,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -1020,7 +1020,7 @@ ) (get_local $1) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -1047,7 +1047,7 @@ (get_local $6) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -1112,7 +1112,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -1151,7 +1151,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $19) @@ -1168,7 +1168,7 @@ (get_local $0) (get_local $6) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $19) @@ -1194,7 +1194,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $19) @@ -1327,7 +1327,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $39 (get_local $6) @@ -1982,7 +1982,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -1994,7 +1994,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $5 (i32.load offset=24 @@ -2102,7 +2102,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -2124,7 +2124,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -2138,7 +2138,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -2165,7 +2165,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -2230,7 +2230,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -2269,7 +2269,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $9) @@ -2286,7 +2286,7 @@ (get_local $10) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $9) @@ -2312,7 +2312,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $9) @@ -2410,7 +2410,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $14 (get_local $5) @@ -2727,7 +2727,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $23) @@ -2798,7 +2798,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3027,7 +3027,7 @@ (i32.and (i32.add (tee_local $15 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -3035,7 +3035,7 @@ ) (get_local $15) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.const 656) @@ -3065,7 +3065,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -3251,7 +3251,7 @@ (if (i32.eq (tee_local $9 - (call_import $_sbrk + (call $_sbrk (get_local $14) ) ) @@ -3309,7 +3309,7 @@ ) (i32.ne (tee_local $3 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -3402,7 +3402,7 @@ (if (i32.eq (tee_local $9 - (call_import $_sbrk + (call $_sbrk (get_local $0) ) ) @@ -3493,14 +3493,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $2) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $9) ) ) @@ -3557,12 +3557,12 @@ (i32.and (i32.lt_u (tee_local $1 - (call_import $_sbrk + (call $_sbrk (get_local $4) ) ) (tee_local $4 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4159,7 +4159,7 @@ (get_local $9) (get_local $17) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -4181,7 +4181,7 @@ ) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -4195,7 +4195,7 @@ ) (get_local $4) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4222,7 +4222,7 @@ (get_local $21) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4260,7 +4260,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4325,7 +4325,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $24) @@ -4347,7 +4347,7 @@ (get_local $9) (get_local $21) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $24) @@ -4376,7 +4376,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $24) @@ -4422,7 +4422,7 @@ (get_local $9) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (br_if $do-once$61 (i32.eq @@ -4432,7 +4432,7 @@ (get_local $4) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4478,7 +4478,7 @@ (get_local $21) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4499,7 +4499,7 @@ (br $do-once$63) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4617,7 +4617,7 @@ (br $do-once$65) ) ) - (call_import $_abort) + (call $_abort) ) (block (i32.store @@ -4931,7 +4931,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $43) @@ -5002,7 +5002,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5349,7 +5349,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $44 (get_local $4) @@ -5661,7 +5661,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $45) @@ -5732,7 +5732,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5982,7 +5982,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6001,7 +6001,7 @@ ) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $8 (i32.add @@ -6059,7 +6059,7 @@ ) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6167,7 +6167,7 @@ (get_local $11) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6176,7 +6176,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6221,7 +6221,7 @@ (get_local $1) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6238,7 +6238,7 @@ (set_local $10 (get_local $3) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $10 @@ -6378,7 +6378,7 @@ (get_local $9) (get_local $14) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -6400,7 +6400,7 @@ ) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6414,7 +6414,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6441,7 +6441,7 @@ (get_local $1) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6511,7 +6511,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6559,7 +6559,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $5) @@ -6581,7 +6581,7 @@ (get_local $3) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $5) @@ -6607,7 +6607,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $5) @@ -6652,7 +6652,7 @@ (get_local $2) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -6670,7 +6670,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.and @@ -6923,7 +6923,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $3) @@ -6947,7 +6947,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6961,7 +6961,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6988,7 +6988,7 @@ (get_local $9) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7052,7 +7052,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7091,7 +7091,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $12) @@ -7113,7 +7113,7 @@ (get_local $0) (get_local $9) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $12) @@ -7139,7 +7139,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $12) @@ -7189,7 +7189,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -7198,7 +7198,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7239,7 +7239,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7256,7 +7256,7 @@ (set_local $16 (get_local $6) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $16 @@ -7365,7 +7365,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $15 (get_local $7) @@ -7649,7 +7649,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $18) @@ -7720,7 +7720,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7903,7 +7903,7 @@ (i32.const 8) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 4) (get_local $0) ) @@ -7923,13 +7923,13 @@ ) (set_local $9 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $12) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (get_local $9) @@ -7950,7 +7950,7 @@ (get_local $4) ) (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $11) ) @@ -8454,7 +8454,7 @@ (i32.const 0) ) ) - (call_import $___lock + (call $___lock (i32.const 36) ) (if @@ -8523,7 +8523,7 @@ (get_local $0) ) ) - (call_import $___unlock + (call $___unlock (i32.const 36) ) (get_local $2) @@ -8966,7 +8966,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $0) (get_local $1) (get_local $2) @@ -9395,7 +9395,7 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $3) ) @@ -9603,7 +9603,7 @@ ) ) (i32.ne - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $3) ) @@ -9700,7 +9700,7 @@ ) (set_local $0 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $2) ) @@ -9798,7 +9798,7 @@ (i32.const 8) ) (i32.load offset=60 - (call_import $_pthread_self) + (call $_pthread_self) ) (i32.const 60) ) @@ -9876,7 +9876,7 @@ ) ) (func $b1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $abort + (call $abort (i32.const 1) ) (i32.const 0) @@ -9892,7 +9892,7 @@ ) ) (func $b0 (param $0 i32) (result i32) - (call_import $abort + (call $abort (i32.const 0) ) (i32.const 0) @@ -9918,7 +9918,7 @@ (get_global $STACKTOP) ) (func $b2 (param $0 i32) - (call_import $abort + (call $abort (i32.const 2) ) ) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts index d158d27bf..3b8fb4922 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts @@ -274,7 +274,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i12 (i32.add @@ -300,7 +300,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) (i32.store @@ -545,7 +545,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i11 (i32.add @@ -576,7 +576,7 @@ ) (br $do-once$4) ) - (call_import $_abort) + (call $_abort) ) ) (block @@ -702,7 +702,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i19 (get_local $i16) @@ -1008,7 +1008,7 @@ (get_local $i22) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (set_local $i3 (i32.add @@ -1021,7 +1021,7 @@ (get_local $i22) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.load @@ -1168,7 +1168,7 @@ (get_local $i28) (get_local $i7) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i28) @@ -1195,7 +1195,7 @@ (get_local $i14) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (set_local $i17 (i32.add @@ -1210,7 +1210,7 @@ ) (get_local $i22) ) - (call_import $_abort) + (call $_abort) ) (set_local $i15 (i32.add @@ -1239,7 +1239,7 @@ ) (br $do-once$8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -1309,7 +1309,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i12 (i32.add @@ -1354,7 +1354,7 @@ (get_local $i24) (get_local $i12) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -1379,7 +1379,7 @@ (get_local $i7) (get_local $i12) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -1417,7 +1417,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -1575,7 +1575,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i29 (get_local $i12) @@ -2348,7 +2348,7 @@ (get_local $i44) (get_local $i15) ) - (call_import $_abort) + (call $_abort) ) (set_local $i8 (i32.add @@ -2361,7 +2361,7 @@ (get_local $i44) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) (set_local $i3 (i32.load @@ -2508,7 +2508,7 @@ (get_local $i49) (get_local $i15) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i49) @@ -2535,7 +2535,7 @@ (get_local $i2) (get_local $i15) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -2550,7 +2550,7 @@ ) (get_local $i44) ) - (call_import $_abort) + (call $_abort) ) (set_local $i4 (i32.add @@ -2579,7 +2579,7 @@ ) (br $do-once$21) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -2649,7 +2649,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i7 (i32.add @@ -2694,7 +2694,7 @@ (get_local $i45) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -2719,7 +2719,7 @@ (get_local $i15) (get_local $i7) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -2757,7 +2757,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -2873,7 +2873,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i50 (get_local $i3) @@ -3240,7 +3240,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i54) @@ -3338,7 +3338,7 @@ ) (br $do-once$29) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3604,7 +3604,7 @@ ) (block (set_local $i53 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -3647,7 +3647,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -3657,7 +3657,7 @@ ) (br $do-once$33) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3863,7 +3863,7 @@ ) (block (set_local $i45 - (call_import $_sbrk + (call $_sbrk (get_local $i50) ) ) @@ -3926,7 +3926,7 @@ ) (block (set_local $i52 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4030,7 +4030,7 @@ (br $do-once$39) ) (set_local $i45 - (call_import $_sbrk + (call $_sbrk (get_local $i62) ) ) @@ -4132,14 +4132,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $i5) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $i45) ) ) @@ -4215,13 +4215,13 @@ ) (block (set_local $i63 - (call_import $_sbrk + (call $_sbrk (get_local $i43) ) ) (block (set_local $i43 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4923,7 +4923,7 @@ (get_local $i76) (get_local $i68) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i76) @@ -4950,7 +4950,7 @@ (get_local $i5) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (set_local $i52 (i32.add @@ -4965,7 +4965,7 @@ ) (get_local $i43) ) - (call_import $_abort) + (call $_abort) ) (set_local $i45 (i32.add @@ -4994,7 +4994,7 @@ ) (br $do-once$53) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5038,7 +5038,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i45 (i32.add @@ -5110,7 +5110,7 @@ (get_local $i72) (get_local $i55) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -5138,7 +5138,7 @@ (get_local $i45) (get_local $i55) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -5180,7 +5180,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -5241,7 +5241,7 @@ (get_local $i45) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -5255,7 +5255,7 @@ ) (br $do-once$61) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5301,7 +5301,7 @@ (get_local $i55) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.add @@ -5323,7 +5323,7 @@ (br $do-once$63) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5485,7 +5485,7 @@ (br $do-once$65) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5833,7 +5833,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i84) @@ -5931,7 +5931,7 @@ ) (br $do-once$50) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6344,7 +6344,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i87 (get_local $i43) @@ -6705,7 +6705,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i91) @@ -6803,7 +6803,7 @@ ) (br $do-once$44) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7116,7 +7116,7 @@ (get_local $i2) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i4 (i32.load @@ -7137,7 +7137,7 @@ (get_local $i1) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.and @@ -7191,7 +7191,7 @@ (get_local $i8) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7312,7 +7312,7 @@ (get_local $i7) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -7324,7 +7324,7 @@ ) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7369,7 +7369,7 @@ (get_local $i10) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -7387,7 +7387,7 @@ (set_local $i15 (get_local $i14) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $i15 @@ -7562,7 +7562,7 @@ (get_local $i22) (get_local $i3) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i22) @@ -7589,7 +7589,7 @@ (get_local $i11) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i16 (i32.add @@ -7604,7 +7604,7 @@ ) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -7633,7 +7633,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7708,7 +7708,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i10 (i32.add @@ -7761,7 +7761,7 @@ (get_local $i18) (get_local $i10) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -7789,7 +7789,7 @@ (get_local $i14) (get_local $i10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -7827,7 +7827,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -7887,7 +7887,7 @@ (get_local $i12) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.add @@ -7907,7 +7907,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -8184,7 +8184,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i27) @@ -8213,7 +8213,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i15 (i32.add @@ -8228,7 +8228,7 @@ ) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) (set_local $i20 (i32.add @@ -8257,7 +8257,7 @@ ) (br $do-once$10) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8326,7 +8326,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i22 (i32.add @@ -8371,7 +8371,7 @@ (get_local $i23) (get_local $i22) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -8399,7 +8399,7 @@ (get_local $i8) (get_local $i22) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -8437,7 +8437,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -8502,7 +8502,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -8514,7 +8514,7 @@ ) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8555,7 +8555,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i21 (i32.add @@ -8573,7 +8573,7 @@ (set_local $i28 (get_local $i21) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $i28 @@ -8722,7 +8722,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i30 (get_local $i13) @@ -9050,7 +9050,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i35) @@ -9148,7 +9148,7 @@ ) (br $do-once$16) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -9390,7 +9390,7 @@ ) (set_local $i14 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $i5) ) @@ -9398,7 +9398,7 @@ ) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 4) (get_local $i1) ) @@ -9424,13 +9424,13 @@ ) (set_local $i11 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $i6) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (set_local $i14 @@ -10050,7 +10050,7 @@ ) ) ) - (call_import $___lock + (call $___lock (i32.const 36) ) (set_local $i4 @@ -10153,7 +10153,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 36) ) (set_local $i2 @@ -10695,7 +10695,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $i1) (get_local $i2) (get_local $i3) @@ -11203,7 +11203,7 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $i5) ) @@ -11485,7 +11485,7 @@ ) ) (i32.ne - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $i5) ) @@ -11636,7 +11636,7 @@ ) (set_local $i1 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $i3) ) @@ -11774,7 +11774,7 @@ (set_local $i1 (i32.load (i32.add - (call_import $_pthread_self) + (call $_pthread_self) (i32.const 60) ) ) @@ -11865,7 +11865,7 @@ ) ) (func $b1 (param $i1 i32) (param $i2 i32) (param $i3 i32) (result i32) - (call_import $abort + (call $abort (i32.const 1) ) (return @@ -11883,7 +11883,7 @@ ) ) (func $b0 (param $i1 i32) (result i32) - (call_import $abort + (call $abort (i32.const 0) ) (return @@ -11919,7 +11919,7 @@ ) ) (func $b2 (param $i1 i32) - (call_import $abort + (call $abort (i32.const 2) ) ) diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts index 618b0f593..80dbde975 100644 --- a/test/emcc_O2_hello_world.fromasm.no-opts +++ b/test/emcc_O2_hello_world.fromasm.no-opts @@ -275,7 +275,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i12 (i32.add @@ -301,7 +301,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) (i32.store @@ -546,7 +546,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i11 (i32.add @@ -577,7 +577,7 @@ ) (br $do-once$4) ) - (call_import $_abort) + (call $_abort) ) ) (block @@ -703,7 +703,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i19 (get_local $i16) @@ -1009,7 +1009,7 @@ (get_local $i22) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (set_local $i3 (i32.add @@ -1022,7 +1022,7 @@ (get_local $i22) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.load @@ -1169,7 +1169,7 @@ (get_local $i28) (get_local $i7) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i28) @@ -1196,7 +1196,7 @@ (get_local $i14) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (set_local $i17 (i32.add @@ -1211,7 +1211,7 @@ ) (get_local $i22) ) - (call_import $_abort) + (call $_abort) ) (set_local $i15 (i32.add @@ -1240,7 +1240,7 @@ ) (br $do-once$8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -1310,7 +1310,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i12 (i32.add @@ -1355,7 +1355,7 @@ (get_local $i24) (get_local $i12) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -1380,7 +1380,7 @@ (get_local $i7) (get_local $i12) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -1418,7 +1418,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -1576,7 +1576,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i29 (get_local $i12) @@ -2349,7 +2349,7 @@ (get_local $i44) (get_local $i15) ) - (call_import $_abort) + (call $_abort) ) (set_local $i8 (i32.add @@ -2362,7 +2362,7 @@ (get_local $i44) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) (set_local $i3 (i32.load @@ -2509,7 +2509,7 @@ (get_local $i49) (get_local $i15) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i49) @@ -2536,7 +2536,7 @@ (get_local $i2) (get_local $i15) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -2551,7 +2551,7 @@ ) (get_local $i44) ) - (call_import $_abort) + (call $_abort) ) (set_local $i4 (i32.add @@ -2580,7 +2580,7 @@ ) (br $do-once$21) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -2650,7 +2650,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i7 (i32.add @@ -2695,7 +2695,7 @@ (get_local $i45) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -2720,7 +2720,7 @@ (get_local $i15) (get_local $i7) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -2758,7 +2758,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -2874,7 +2874,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i50 (get_local $i3) @@ -3241,7 +3241,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i54) @@ -3339,7 +3339,7 @@ ) (br $do-once$29) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3605,7 +3605,7 @@ ) (block (set_local $i53 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -3648,7 +3648,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -3658,7 +3658,7 @@ ) (br $do-once$33) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3864,7 +3864,7 @@ ) (block (set_local $i45 - (call_import $_sbrk + (call $_sbrk (get_local $i50) ) ) @@ -3927,7 +3927,7 @@ ) (block (set_local $i52 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4031,7 +4031,7 @@ (br $do-once$39) ) (set_local $i45 - (call_import $_sbrk + (call $_sbrk (get_local $i62) ) ) @@ -4133,14 +4133,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $i5) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $i45) ) ) @@ -4216,13 +4216,13 @@ ) (block (set_local $i63 - (call_import $_sbrk + (call $_sbrk (get_local $i43) ) ) (block (set_local $i43 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4924,7 +4924,7 @@ (get_local $i76) (get_local $i68) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i76) @@ -4951,7 +4951,7 @@ (get_local $i5) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (set_local $i52 (i32.add @@ -4966,7 +4966,7 @@ ) (get_local $i43) ) - (call_import $_abort) + (call $_abort) ) (set_local $i45 (i32.add @@ -4995,7 +4995,7 @@ ) (br $do-once$53) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5039,7 +5039,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i45 (i32.add @@ -5111,7 +5111,7 @@ (get_local $i72) (get_local $i55) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -5139,7 +5139,7 @@ (get_local $i45) (get_local $i55) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -5181,7 +5181,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -5242,7 +5242,7 @@ (get_local $i45) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -5256,7 +5256,7 @@ ) (br $do-once$61) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5302,7 +5302,7 @@ (get_local $i55) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.add @@ -5324,7 +5324,7 @@ (br $do-once$63) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5486,7 +5486,7 @@ (br $do-once$65) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5834,7 +5834,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i84) @@ -5932,7 +5932,7 @@ ) (br $do-once$50) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6345,7 +6345,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i87 (get_local $i43) @@ -6706,7 +6706,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i91) @@ -6804,7 +6804,7 @@ ) (br $do-once$44) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7117,7 +7117,7 @@ (get_local $i2) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i4 (i32.load @@ -7138,7 +7138,7 @@ (get_local $i1) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.and @@ -7192,7 +7192,7 @@ (get_local $i8) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7313,7 +7313,7 @@ (get_local $i7) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -7325,7 +7325,7 @@ ) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7370,7 +7370,7 @@ (get_local $i10) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -7388,7 +7388,7 @@ (set_local $i15 (get_local $i14) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $i15 @@ -7563,7 +7563,7 @@ (get_local $i22) (get_local $i3) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i22) @@ -7590,7 +7590,7 @@ (get_local $i11) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i16 (i32.add @@ -7605,7 +7605,7 @@ ) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -7634,7 +7634,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7709,7 +7709,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i10 (i32.add @@ -7762,7 +7762,7 @@ (get_local $i18) (get_local $i10) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -7790,7 +7790,7 @@ (get_local $i14) (get_local $i10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -7828,7 +7828,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -7888,7 +7888,7 @@ (get_local $i12) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.add @@ -7908,7 +7908,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -8185,7 +8185,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i27) @@ -8214,7 +8214,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i15 (i32.add @@ -8229,7 +8229,7 @@ ) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) (set_local $i20 (i32.add @@ -8258,7 +8258,7 @@ ) (br $do-once$10) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8327,7 +8327,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i22 (i32.add @@ -8372,7 +8372,7 @@ (get_local $i23) (get_local $i22) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -8400,7 +8400,7 @@ (get_local $i8) (get_local $i22) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -8438,7 +8438,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -8503,7 +8503,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -8515,7 +8515,7 @@ ) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8556,7 +8556,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i21 (i32.add @@ -8574,7 +8574,7 @@ (set_local $i28 (get_local $i21) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $i28 @@ -8723,7 +8723,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i30 (get_local $i13) @@ -9051,7 +9051,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i35) @@ -9149,7 +9149,7 @@ ) (br $do-once$16) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -9391,7 +9391,7 @@ ) (set_local $i14 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $i5) ) @@ -9399,7 +9399,7 @@ ) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 4) (get_local $i1) ) @@ -9425,13 +9425,13 @@ ) (set_local $i11 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $i6) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (set_local $i14 @@ -10051,7 +10051,7 @@ ) ) ) - (call_import $___lock + (call $___lock (i32.const 36) ) (set_local $i4 @@ -10154,7 +10154,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 36) ) (set_local $i2 @@ -10696,7 +10696,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $i1) (get_local $i2) (get_local $i3) @@ -11204,7 +11204,7 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $i5) ) @@ -11413,7 +11413,7 @@ (get_local $i3) ) (set_local $i9 - (call_import $i32u-div + (call $i32u-div (get_local $i8) (get_local $i2) ) @@ -11486,7 +11486,7 @@ ) ) (i32.ne - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $i5) ) @@ -11637,7 +11637,7 @@ ) (set_local $i1 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $i3) ) @@ -11775,7 +11775,7 @@ (set_local $i1 (i32.load (i32.add - (call_import $_pthread_self) + (call $_pthread_self) (i32.const 60) ) ) @@ -11866,7 +11866,7 @@ ) ) (func $b1 (param $i1 i32) (param $i2 i32) (param $i3 i32) (result i32) - (call_import $abort + (call $abort (i32.const 1) ) (return @@ -11884,7 +11884,7 @@ ) ) (func $b0 (param $i1 i32) (result i32) - (call_import $abort + (call $abort (i32.const 0) ) (return @@ -11920,7 +11920,7 @@ ) ) (func $b2 (param $i1 i32) - (call_import $abort + (call $abort (i32.const 2) ) ) diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm index a4bf51c56..516fe6b30 100644 --- a/test/emcc_hello_world.fromasm +++ b/test/emcc_hello_world.fromasm @@ -117,7 +117,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (get_local $1) ) @@ -252,7 +252,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (drop (call $_printf @@ -489,7 +489,7 @@ (i32.const 16) ) (i32.load offset=60 - (call_import $_pthread_self) + (call $_pthread_self) ) (i32.const 60) ) @@ -511,7 +511,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $2 @@ -523,7 +523,7 @@ ) (set_local $0 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $2) ) @@ -552,7 +552,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $3 (get_local $4) @@ -592,7 +592,7 @@ (get_local $5) ) (if - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $3) ) @@ -632,7 +632,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $3 @@ -667,7 +667,7 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $3) ) @@ -748,7 +748,7 @@ (i32.const 0) ) ) - (call_import $___lock + (call $___lock (i32.const 44) ) (if @@ -806,7 +806,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 44) ) (get_local $0) @@ -831,7 +831,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $3 @@ -886,7 +886,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $8 (i32.add @@ -977,7 +977,7 @@ (i32.const 16) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 5) (get_local $0) ) @@ -997,13 +997,13 @@ ) (set_local $3 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $9) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (get_local $3) @@ -1024,7 +1024,7 @@ (get_local $4) ) (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $8) ) @@ -1242,7 +1242,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $5 (i32.add @@ -2465,7 +2465,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $20 (i32.add @@ -4566,7 +4566,7 @@ (i32.load8_s (i32.add (tee_local $6 - (call_import $f64-to-int + (call $f64-to-int (get_local $14) ) ) @@ -4848,7 +4848,7 @@ (i32.store (get_local $6) (tee_local $5 - (call_import $f64-to-int + (call $f64-to-int (get_local $14) ) ) @@ -5058,7 +5058,7 @@ (set_local $12 (i32.add (i32.and - (call_import $i32s-div + (call $i32s-div (i32.add (get_local $19) (i32.const 25) @@ -5372,7 +5372,7 @@ (i32.shl (i32.add (i32.and - (call_import $i32s-div + (call $i32s-div (tee_local $11 (i32.add (get_local $7) @@ -5394,7 +5394,7 @@ (tee_local $11 (i32.add (i32.and - (call_import $i32s-rem + (call $i32s-rem (get_local $11) (i32.const 9) ) @@ -5449,7 +5449,7 @@ (i32.eqz (tee_local $31 (i32.and - (call_import $i32u-rem + (call $i32u-rem (tee_local $11 (i32.load (get_local $7) @@ -5470,7 +5470,7 @@ (f64.const 9007199254740992) (i32.and (i32.and - (call_import $i32u-div + (call $i32u-div (get_local $11) (get_local $12) ) @@ -5486,7 +5486,7 @@ (get_local $31) (tee_local $25 (i32.and - (call_import $i32s-div + (call $i32s-div (get_local $12) (i32.const 2) ) @@ -5841,7 +5841,7 @@ ) (if (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $19) (i32.const 10) ) @@ -5872,7 +5872,7 @@ (br_if $while-in$103 (i32.eqz (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $19) (tee_local $7 (i32.mul @@ -8023,7 +8023,7 @@ (i32.and (i32.or (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $0) (i32.const 10) ) @@ -8036,7 +8036,7 @@ ) (set_local $2 (i32.and - (call_import $i32u-div + (call $i32u-div (get_local $0) (i32.const 10) ) @@ -8084,7 +8084,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $5 (get_local $6) @@ -8359,7 +8359,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -8383,7 +8383,7 @@ (get_local $4) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8606,7 +8606,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -8635,7 +8635,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8728,7 +8728,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $12 (get_local $3) @@ -8977,7 +8977,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -8989,7 +8989,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $11 (i32.load offset=24 @@ -9090,7 +9090,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -9112,7 +9112,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -9126,7 +9126,7 @@ ) (get_local $2) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -9153,7 +9153,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -9218,7 +9218,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -9257,7 +9257,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $5) @@ -9274,7 +9274,7 @@ (get_local $0) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $5) @@ -9300,7 +9300,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $5) @@ -9433,7 +9433,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $13 (get_local $3) @@ -10064,7 +10064,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -10076,7 +10076,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $5 (i32.load offset=24 @@ -10177,7 +10177,7 @@ (get_local $0) (get_local $8) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -10199,7 +10199,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -10213,7 +10213,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -10240,7 +10240,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -10305,7 +10305,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -10344,7 +10344,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $10) @@ -10361,7 +10361,7 @@ (get_local $0) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $10) @@ -10387,7 +10387,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $10) @@ -10516,7 +10516,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $20 (get_local $2) @@ -10822,7 +10822,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -10891,7 +10891,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -11089,7 +11089,7 @@ (i32.and (i32.add (tee_local $1 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -11097,7 +11097,7 @@ ) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.const 656) @@ -11127,7 +11127,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -11297,7 +11297,7 @@ (if (i32.eq (tee_local $2 - (call_import $_sbrk + (call $_sbrk (get_local $1) ) ) @@ -11324,7 +11324,7 @@ (if (i32.ne (tee_local $2 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -11410,7 +11410,7 @@ (br_if $jumpthreading$inner$12 (i32.eq (tee_local $3 - (call_import $_sbrk + (call $_sbrk (get_local $1) ) ) @@ -11477,14 +11477,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $4) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $3) ) ) @@ -11526,12 +11526,12 @@ (i32.and (i32.lt_u (tee_local $2 - (call_import $_sbrk + (call $_sbrk (get_local $9) ) ) (tee_local $1 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -12026,7 +12026,7 @@ (get_local $4) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (br_if $do-once$55 (i32.eq @@ -12036,7 +12036,7 @@ (get_local $8) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12082,7 +12082,7 @@ (get_local $3) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12103,7 +12103,7 @@ (br $do-once$57) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12217,7 +12217,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -12239,7 +12239,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -12253,7 +12253,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12280,7 +12280,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12343,7 +12343,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12383,7 +12383,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $11) @@ -12405,7 +12405,7 @@ (get_local $1) (get_local $3) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $11) @@ -12434,7 +12434,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $11) @@ -12552,7 +12552,7 @@ (br $do-once$67) ) ) - (call_import $_abort) + (call $_abort) ) (block (i32.store @@ -12855,7 +12855,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -12924,7 +12924,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -13242,7 +13242,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $23 (get_local $3) @@ -13543,7 +13543,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $1) @@ -13612,7 +13612,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -13856,7 +13856,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -13875,7 +13875,7 @@ ) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $6 (i32.add @@ -13933,7 +13933,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14041,7 +14041,7 @@ (get_local $4) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14050,7 +14050,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14101,7 +14101,7 @@ (get_local $2) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14118,7 +14118,7 @@ (set_local $5 (get_local $1) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14239,7 +14239,7 @@ (get_local $5) (get_local $11) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $5) @@ -14261,7 +14261,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14275,7 +14275,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14302,7 +14302,7 @@ (get_local $2) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14372,7 +14372,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14420,7 +14420,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $7) @@ -14442,7 +14442,7 @@ (get_local $5) (get_local $2) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $7) @@ -14468,7 +14468,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $7) @@ -14513,7 +14513,7 @@ (get_local $4) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -14531,7 +14531,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.and @@ -14707,7 +14707,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14716,7 +14716,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14763,7 +14763,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14780,7 +14780,7 @@ (set_local $14 (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14896,7 +14896,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $1) @@ -14920,7 +14920,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14934,7 +14934,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14961,7 +14961,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -15025,7 +15025,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -15064,7 +15064,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $9) @@ -15086,7 +15086,7 @@ (get_local $1) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $9) @@ -15112,7 +15112,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $9) @@ -15218,7 +15218,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $15 (get_local $0) @@ -15485,7 +15485,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $2) @@ -15554,7 +15554,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -15916,7 +15916,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $0) (get_local $1) (get_local $2) @@ -16681,19 +16681,19 @@ ) ) (func $b0 (param $0 i32) (result i32) - (call_import $nullFunc_ii + (call $nullFunc_ii (i32.const 0) ) (i32.const 0) ) (func $b1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $nullFunc_iiii + (call $nullFunc_iiii (i32.const 1) ) (i32.const 0) ) (func $b2 (param $0 i32) - (call_import $nullFunc_vi + (call $nullFunc_vi (i32.const 2) ) ) diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise index bc1e15b0d..525553e72 100644 --- a/test/emcc_hello_world.fromasm.imprecise +++ b/test/emcc_hello_world.fromasm.imprecise @@ -110,7 +110,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (get_local $1) ) @@ -245,7 +245,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (drop (call $_printf @@ -482,7 +482,7 @@ (i32.const 16) ) (i32.load offset=60 - (call_import $_pthread_self) + (call $_pthread_self) ) (i32.const 60) ) @@ -504,7 +504,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $2 @@ -516,7 +516,7 @@ ) (set_local $0 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $2) ) @@ -545,7 +545,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $3 (get_local $4) @@ -585,7 +585,7 @@ (get_local $5) ) (if - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $3) ) @@ -625,7 +625,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $3 @@ -660,7 +660,7 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $3) ) @@ -741,7 +741,7 @@ (i32.const 0) ) ) - (call_import $___lock + (call $___lock (i32.const 44) ) (if @@ -799,7 +799,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 44) ) (get_local $0) @@ -824,7 +824,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $3 @@ -879,7 +879,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $8 (i32.add @@ -970,7 +970,7 @@ (i32.const 16) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 5) (get_local $0) ) @@ -990,13 +990,13 @@ ) (set_local $3 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $9) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (get_local $3) @@ -1017,7 +1017,7 @@ (get_local $4) ) (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $8) ) @@ -1235,7 +1235,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $5 (i32.add @@ -2458,7 +2458,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $20 (i32.add @@ -8077,7 +8077,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $5 (get_local $6) @@ -8352,7 +8352,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -8376,7 +8376,7 @@ (get_local $4) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8599,7 +8599,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -8628,7 +8628,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8721,7 +8721,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $12 (get_local $3) @@ -8970,7 +8970,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -8982,7 +8982,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $11 (i32.load offset=24 @@ -9083,7 +9083,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -9105,7 +9105,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -9119,7 +9119,7 @@ ) (get_local $2) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -9146,7 +9146,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -9211,7 +9211,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -9250,7 +9250,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $5) @@ -9267,7 +9267,7 @@ (get_local $0) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $5) @@ -9293,7 +9293,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $5) @@ -9426,7 +9426,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $13 (get_local $3) @@ -10057,7 +10057,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -10069,7 +10069,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $5 (i32.load offset=24 @@ -10170,7 +10170,7 @@ (get_local $0) (get_local $8) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -10192,7 +10192,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -10206,7 +10206,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -10233,7 +10233,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -10298,7 +10298,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -10337,7 +10337,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $10) @@ -10354,7 +10354,7 @@ (get_local $0) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $10) @@ -10380,7 +10380,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $10) @@ -10509,7 +10509,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $20 (get_local $2) @@ -10815,7 +10815,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -10884,7 +10884,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -11082,7 +11082,7 @@ (i32.and (i32.add (tee_local $1 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -11090,7 +11090,7 @@ ) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.const 656) @@ -11120,7 +11120,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -11290,7 +11290,7 @@ (if (i32.eq (tee_local $2 - (call_import $_sbrk + (call $_sbrk (get_local $1) ) ) @@ -11317,7 +11317,7 @@ (if (i32.ne (tee_local $2 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -11403,7 +11403,7 @@ (br_if $jumpthreading$inner$12 (i32.eq (tee_local $3 - (call_import $_sbrk + (call $_sbrk (get_local $1) ) ) @@ -11470,14 +11470,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $4) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $3) ) ) @@ -11519,12 +11519,12 @@ (i32.and (i32.lt_u (tee_local $2 - (call_import $_sbrk + (call $_sbrk (get_local $9) ) ) (tee_local $1 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -12019,7 +12019,7 @@ (get_local $4) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (br_if $do-once$55 (i32.eq @@ -12029,7 +12029,7 @@ (get_local $8) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12075,7 +12075,7 @@ (get_local $3) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12096,7 +12096,7 @@ (br $do-once$57) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12210,7 +12210,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -12232,7 +12232,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -12246,7 +12246,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12273,7 +12273,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12336,7 +12336,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12376,7 +12376,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $11) @@ -12398,7 +12398,7 @@ (get_local $1) (get_local $3) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $11) @@ -12427,7 +12427,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $11) @@ -12545,7 +12545,7 @@ (br $do-once$67) ) ) - (call_import $_abort) + (call $_abort) ) (block (i32.store @@ -12848,7 +12848,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -12917,7 +12917,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -13235,7 +13235,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $23 (get_local $3) @@ -13536,7 +13536,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $1) @@ -13605,7 +13605,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -13849,7 +13849,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -13868,7 +13868,7 @@ ) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $6 (i32.add @@ -13926,7 +13926,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14034,7 +14034,7 @@ (get_local $4) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14043,7 +14043,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14094,7 +14094,7 @@ (get_local $2) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14111,7 +14111,7 @@ (set_local $5 (get_local $1) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14232,7 +14232,7 @@ (get_local $5) (get_local $11) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $5) @@ -14254,7 +14254,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14268,7 +14268,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14295,7 +14295,7 @@ (get_local $2) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14365,7 +14365,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14413,7 +14413,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $7) @@ -14435,7 +14435,7 @@ (get_local $5) (get_local $2) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $7) @@ -14461,7 +14461,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $7) @@ -14506,7 +14506,7 @@ (get_local $4) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -14524,7 +14524,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.and @@ -14700,7 +14700,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14709,7 +14709,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14756,7 +14756,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14773,7 +14773,7 @@ (set_local $14 (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14889,7 +14889,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $1) @@ -14913,7 +14913,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14927,7 +14927,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14954,7 +14954,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -15018,7 +15018,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -15057,7 +15057,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $9) @@ -15079,7 +15079,7 @@ (get_local $1) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $9) @@ -15105,7 +15105,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $9) @@ -15211,7 +15211,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $15 (get_local $0) @@ -15478,7 +15478,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $2) @@ -15547,7 +15547,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -15909,7 +15909,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $0) (get_local $1) (get_local $2) @@ -16674,19 +16674,19 @@ ) ) (func $b0 (param $0 i32) (result i32) - (call_import $nullFunc_ii + (call $nullFunc_ii (i32.const 0) ) (i32.const 0) ) (func $b1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $nullFunc_iiii + (call $nullFunc_iiii (i32.const 1) ) (i32.const 0) ) (func $b2 (param $0 i32) - (call_import $nullFunc_vi + (call $nullFunc_vi (i32.const 2) ) ) diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts index d7bbe58e8..7c9e27d25 100644 --- a/test/emcc_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_hello_world.fromasm.imprecise.no-opts @@ -110,7 +110,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (return (get_local $ret) @@ -315,7 +315,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -788,7 +788,7 @@ ) (block (set_local $$call$i - (call_import $_pthread_self) + (call $_pthread_self) ) (set_local $$errno_ptr (i32.add @@ -832,7 +832,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -853,7 +853,7 @@ (get_local $$0) ) (set_local $$call - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $$vararg_buffer) ) @@ -901,7 +901,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -978,7 +978,7 @@ (get_local $$tio) ) (set_local $$call - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $$vararg_buffer) ) @@ -1052,7 +1052,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -1119,7 +1119,7 @@ (get_local $$whence) ) (set_local $$call - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $$vararg_buffer) ) @@ -1248,7 +1248,7 @@ ) ) ) - (call_import $___lock + (call $___lock (i32.const 44) ) (set_local $$f$addr$0$19 @@ -1412,7 +1412,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 44) ) (set_local $$retval$0 @@ -1510,7 +1510,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$ap (get_local $sp) @@ -1642,7 +1642,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer3 (i32.add @@ -1794,7 +1794,7 @@ (get_local $$iovcnt$0) ) (set_local $$call9 - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $$vararg_buffer3) ) @@ -1809,7 +1809,7 @@ ) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 5) (get_local $$f) ) @@ -1843,7 +1843,7 @@ (get_local $$iovcnt$0) ) (set_local $$call - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $$vararg_buffer) ) @@ -1853,7 +1853,7 @@ (get_local $$call) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (set_local $$cnt$0 @@ -2274,7 +2274,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$ap2 (i32.add @@ -5708,7 +5708,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$big$i (i32.add @@ -16105,7 +16105,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$pad (get_local $sp) @@ -17673,7 +17673,7 @@ ) (if (get_local $$cmp15) - (call_import $_abort) + (call $_abort) ) (set_local $$bk (i32.add @@ -17705,7 +17705,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -18047,7 +18047,7 @@ ) (if (get_local $$cmp76) - (call_import $_abort) + (call $_abort) ) (set_local $$bk78 (i32.add @@ -18087,7 +18087,7 @@ ) (br $do-once$4) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -18263,7 +18263,7 @@ ) (if (get_local $$cmp113) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phiZ2D (get_local $$16) @@ -18655,7 +18655,7 @@ ) (if (get_local $$cmp33$i) - (call_import $_abort) + (call $_abort) ) (set_local $$add$ptr$i (i32.add @@ -18673,7 +18673,7 @@ (i32.eqz (get_local $$cmp35$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$parent$i (i32.add @@ -18852,7 +18852,7 @@ ) (if (get_local $$cmp81$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$lcssa) @@ -18885,7 +18885,7 @@ ) (if (get_local $$cmp45$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk47$i (i32.add @@ -18908,7 +18908,7 @@ (i32.eqz (get_local $$cmp48$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd50$i (i32.add @@ -18943,7 +18943,7 @@ ) (br $do-once$8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -19052,7 +19052,7 @@ ) (if (get_local $$cmp107$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx113$i (i32.add @@ -19115,7 +19115,7 @@ ) (if (get_local $$cmp130$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent135$i (i32.add @@ -19158,7 +19158,7 @@ ) (if (get_local $$cmp142$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx148$i (i32.add @@ -19221,7 +19221,7 @@ ) (if (get_local $$cmp159$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx165$i (i32.add @@ -19469,7 +19469,7 @@ ) (if (get_local $$cmp208$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$iZ2D (get_local $$48) @@ -20489,7 +20489,7 @@ ) (if (get_local $$cmp121$i) - (call_import $_abort) + (call $_abort) ) (set_local $$add$ptr$i$161 (i32.add @@ -20507,7 +20507,7 @@ (i32.eqz (get_local $$cmp123$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$parent$i$162 (i32.add @@ -20686,7 +20686,7 @@ ) (if (get_local $$cmp171$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$167$lcssa) @@ -20719,7 +20719,7 @@ ) (if (get_local $$cmp133$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk136$i (i32.add @@ -20742,7 +20742,7 @@ (i32.eqz (get_local $$cmp137$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd139$i (i32.add @@ -20777,7 +20777,7 @@ ) (br $do-once$21) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -20886,7 +20886,7 @@ ) (if (get_local $$cmp198$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx204$i (i32.add @@ -20949,7 +20949,7 @@ ) (if (get_local $$cmp221$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent226$i (i32.add @@ -20992,7 +20992,7 @@ ) (if (get_local $$cmp233$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx239$i (i32.add @@ -21055,7 +21055,7 @@ ) (if (get_local $$cmp250$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx256$i (i32.add @@ -21292,7 +21292,7 @@ ) (if (get_local $$cmp301$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$i$178Z2D (get_local $$83) @@ -21781,7 +21781,7 @@ ) (if (get_local $$cmp401$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx394$i$lcssa) @@ -21910,7 +21910,7 @@ ) (br $do-once$29) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -22206,7 +22206,7 @@ (get_local $$cmp$i$179) (block (set_local $$call$i$i - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -22256,7 +22256,7 @@ (i32.const 0) ) (set_local $$call6$i$i - (call_import $_time + (call $_time (i32.const 0) ) ) @@ -22278,7 +22278,7 @@ ) (br $do-once$33) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -22551,7 +22551,7 @@ (get_local $$cmp81$i$191) (block (set_local $$call83$i - (call_import $_sbrk + (call $_sbrk (get_local $$and80$i) ) ) @@ -22629,7 +22629,7 @@ ) (block (set_local $$call37$i - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -22784,7 +22784,7 @@ ) ) (set_local $$call68$i - (call_import $_sbrk + (call $_sbrk (get_local $$ssize$0$i) ) ) @@ -22913,7 +22913,7 @@ (get_local $$cmp105$i) (block (set_local $$call107$i - (call_import $_sbrk + (call $_sbrk (get_local $$and104$i) ) ) @@ -22927,7 +22927,7 @@ (get_local $$cmp108$i) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $$sub112$i) ) ) @@ -23023,12 +23023,12 @@ (get_local $$cmp127$i) (block (set_local $$call131$i - (call_import $_sbrk + (call $_sbrk (get_local $$and11$i) ) ) (set_local $$call132$i - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -24150,7 +24150,7 @@ ) (if (get_local $$cmp42$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk43$i$i (i32.add @@ -24173,7 +24173,7 @@ (get_local $$cmp44$i$i) (br $do-once$55) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24245,7 +24245,7 @@ ) (if (get_local $$cmp57$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$fd59$i$i (i32.add @@ -24273,7 +24273,7 @@ (br $do-once$57) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24470,7 +24470,7 @@ ) (if (get_local $$cmp112$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$i$lcssa) @@ -24503,7 +24503,7 @@ ) (if (get_local $$cmp81$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk82$i$i (i32.add @@ -24526,7 +24526,7 @@ (i32.eqz (get_local $$cmp83$i$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd85$i$i (i32.add @@ -24561,7 +24561,7 @@ ) (br $do-once$59) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24670,7 +24670,7 @@ ) (if (get_local $$cmp137$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx143$i$i (i32.add @@ -24734,7 +24734,7 @@ ) (if (get_local $$cmp160$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent165$i$i (i32.add @@ -24777,7 +24777,7 @@ ) (if (get_local $$cmp172$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx178$i$i (i32.add @@ -24839,7 +24839,7 @@ ) (if (get_local $$cmp189$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx195$i$i (i32.add @@ -25059,7 +25059,7 @@ (br $do-once$67) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -25543,7 +25543,7 @@ ) (if (get_local $$cmp332$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx325$i$i$lcssa) @@ -25672,7 +25672,7 @@ ) (br $do-once$52) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -26225,7 +26225,7 @@ ) (if (get_local $$cmp46$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$i$iZ2D (get_local $$196) @@ -26708,7 +26708,7 @@ ) (if (get_local $$cmp133$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx126$i$i$lcssa) @@ -26837,7 +26837,7 @@ ) (br $do-once$44) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27334,7 +27334,7 @@ ) (if (get_local $$cmp1) - (call_import $_abort) + (call $_abort) ) (set_local $$head (i32.add @@ -27361,7 +27361,7 @@ ) (if (get_local $$cmp2) - (call_import $_abort) + (call $_abort) ) (set_local $$and5 (i32.and @@ -27432,7 +27432,7 @@ ) (if (get_local $$cmp18) - (call_import $_abort) + (call $_abort) ) (set_local $$3 (i32.load @@ -27599,7 +27599,7 @@ ) (if (get_local $$cmp31) - (call_import $_abort) + (call $_abort) ) (set_local $$bk34 (i32.add @@ -27622,7 +27622,7 @@ (i32.eqz (get_local $$cmp35) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27699,7 +27699,7 @@ ) (if (get_local $$cmp53) - (call_import $_abort) + (call $_abort) ) (set_local $$fd56 (i32.add @@ -27723,7 +27723,7 @@ (set_local $$fd67$pre$phiZ2D (get_local $$fd56) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27927,7 +27927,7 @@ ) (if (get_local $$cmp118) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$lcssa) @@ -27960,7 +27960,7 @@ ) (if (get_local $$cmp80) - (call_import $_abort) + (call $_abort) ) (set_local $$bk82 (i32.add @@ -27983,7 +27983,7 @@ (i32.eqz (get_local $$cmp83) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd86 (i32.add @@ -28018,7 +28018,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28138,7 +28138,7 @@ ) (if (get_local $$cmp143) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx149 (i32.add @@ -28209,7 +28209,7 @@ ) (if (get_local $$cmp165) - (call_import $_abort) + (call $_abort) ) (set_local $$parent170 (i32.add @@ -28252,7 +28252,7 @@ ) (if (get_local $$cmp176) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx182 (i32.add @@ -28321,7 +28321,7 @@ ) (if (get_local $$cmp192) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx198 (i32.add @@ -28377,7 +28377,7 @@ (i32.eqz (get_local $$cmp228) ) - (call_import $_abort) + (call $_abort) ) (set_local $$head231 (i32.add @@ -28404,7 +28404,7 @@ ) (if (get_local $$tobool233) - (call_import $_abort) + (call $_abort) ) (set_local $$and240 (i32.and @@ -28649,7 +28649,7 @@ ) (if (get_local $$cmp283) - (call_import $_abort) + (call $_abort) ) (set_local $$bk286 (i32.add @@ -28672,7 +28672,7 @@ (i32.eqz (get_local $$cmp287) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28748,7 +28748,7 @@ ) (if (get_local $$cmp308) - (call_import $_abort) + (call $_abort) ) (set_local $$fd311 (i32.add @@ -28772,7 +28772,7 @@ (set_local $$fd322$pre$phiZ2D (get_local $$fd311) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28974,7 +28974,7 @@ ) (if (get_local $$cmp386) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP360$1$lcssa) @@ -29012,7 +29012,7 @@ ) (if (get_local $$cmp340) - (call_import $_abort) + (call $_abort) ) (set_local $$bk343 (i32.add @@ -29035,7 +29035,7 @@ (i32.eqz (get_local $$cmp344) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd347 (i32.add @@ -29070,7 +29070,7 @@ ) (br $do-once$10) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -29178,7 +29178,7 @@ ) (if (get_local $$cmp413) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx419 (i32.add @@ -29241,7 +29241,7 @@ ) (if (get_local $$cmp435) - (call_import $_abort) + (call $_abort) ) (set_local $$parent442 (i32.add @@ -29284,7 +29284,7 @@ ) (if (get_local $$cmp448) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx454 (i32.add @@ -29347,7 +29347,7 @@ ) (if (get_local $$cmp464) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx470 (i32.add @@ -29576,7 +29576,7 @@ ) (if (get_local $$cmp519) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phiZ2D (get_local $$63) @@ -30065,7 +30065,7 @@ ) (if (get_local $$cmp605) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx599$lcssa) @@ -30194,7 +30194,7 @@ ) (br $do-once$16) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -30630,7 +30630,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $dest) (get_local $src) (get_local $num) @@ -31548,7 +31548,7 @@ ) ) (func $b0 (param $p0 i32) (result i32) - (call_import $nullFunc_ii + (call $nullFunc_ii (i32.const 0) ) (return @@ -31556,7 +31556,7 @@ ) ) (func $b1 (param $p0 i32) (param $p1 i32) (param $p2 i32) (result i32) - (call_import $nullFunc_iiii + (call $nullFunc_iiii (i32.const 1) ) (return @@ -31564,7 +31564,7 @@ ) ) (func $b2 (param $p0 i32) - (call_import $nullFunc_vi + (call $nullFunc_vi (i32.const 2) ) ) diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts index 0231444cc..6799d2c5e 100644 --- a/test/emcc_hello_world.fromasm.no-opts +++ b/test/emcc_hello_world.fromasm.no-opts @@ -116,7 +116,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (return (get_local $ret) @@ -321,7 +321,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -794,7 +794,7 @@ ) (block (set_local $$call$i - (call_import $_pthread_self) + (call $_pthread_self) ) (set_local $$errno_ptr (i32.add @@ -838,7 +838,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -859,7 +859,7 @@ (get_local $$0) ) (set_local $$call - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $$vararg_buffer) ) @@ -907,7 +907,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -984,7 +984,7 @@ (get_local $$tio) ) (set_local $$call - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $$vararg_buffer) ) @@ -1058,7 +1058,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -1125,7 +1125,7 @@ (get_local $$whence) ) (set_local $$call - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $$vararg_buffer) ) @@ -1254,7 +1254,7 @@ ) ) ) - (call_import $___lock + (call $___lock (i32.const 44) ) (set_local $$f$addr$0$19 @@ -1418,7 +1418,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 44) ) (set_local $$retval$0 @@ -1516,7 +1516,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$ap (get_local $sp) @@ -1648,7 +1648,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer3 (i32.add @@ -1800,7 +1800,7 @@ (get_local $$iovcnt$0) ) (set_local $$call9 - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $$vararg_buffer3) ) @@ -1815,7 +1815,7 @@ ) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 5) (get_local $$f) ) @@ -1849,7 +1849,7 @@ (get_local $$iovcnt$0) ) (set_local $$call - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $$vararg_buffer) ) @@ -1859,7 +1859,7 @@ (get_local $$call) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (set_local $$cnt$0 @@ -2280,7 +2280,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$ap2 (i32.add @@ -5714,7 +5714,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$big$i (i32.add @@ -9384,7 +9384,7 @@ (loop $while-in$63 (block $while-out$62 (set_local $$conv116$i - (call_import $f64-to-int + (call $f64-to-int (get_local $$y$addr$2$i) ) ) @@ -9855,7 +9855,7 @@ (loop $while-in$67 (block $while-out$66 (set_local $$conv216$i - (call_import $f64-to-int + (call $f64-to-int (get_local $$y$addr$4$i) ) ) @@ -10226,7 +10226,7 @@ ) (set_local $$div274$i (i32.and - (call_import $i32s-div + (call $i32s-div (get_local $$add273$i) (i32.const 9) ) @@ -10780,7 +10780,7 @@ ) (set_local $$div356$i (i32.and - (call_import $i32s-div + (call $i32s-div (get_local $$add355$i) (i32.const 9) ) @@ -10804,7 +10804,7 @@ ) (set_local $$rem360$i (i32.and - (call_import $i32s-rem + (call $i32s-rem (get_local $$add355$i) (i32.const 9) ) @@ -10884,7 +10884,7 @@ ) (set_local $$rem370$i (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $$231) (get_local $$i$1$lcssa$i) ) @@ -10932,7 +10932,7 @@ (block (set_local $$div378$i (i32.and - (call_import $i32u-div + (call $i32u-div (get_local $$231) (get_local $$i$1$lcssa$i) ) @@ -10960,7 +10960,7 @@ ) (set_local $$div384$i (i32.and - (call_import $i32s-div + (call $i32s-div (get_local $$i$1$lcssa$i) (i32.const 2) ) @@ -11589,7 +11589,7 @@ ) (set_local $$rem494$510$i (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $$237) (i32.const 10) ) @@ -11635,7 +11635,7 @@ ) (set_local $$rem494$i (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $$237) (get_local $$mul499$i) ) @@ -16000,7 +16000,7 @@ (block $while-out$2 (set_local $$rem4 (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $$y$010) (i32.const 10) ) @@ -16031,7 +16031,7 @@ ) (set_local $$div9 (i32.and - (call_import $i32u-div + (call $i32u-div (get_local $$y$010) (i32.const 10) ) @@ -16111,7 +16111,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$pad (get_local $sp) @@ -17679,7 +17679,7 @@ ) (if (get_local $$cmp15) - (call_import $_abort) + (call $_abort) ) (set_local $$bk (i32.add @@ -17711,7 +17711,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -18053,7 +18053,7 @@ ) (if (get_local $$cmp76) - (call_import $_abort) + (call $_abort) ) (set_local $$bk78 (i32.add @@ -18093,7 +18093,7 @@ ) (br $do-once$4) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -18269,7 +18269,7 @@ ) (if (get_local $$cmp113) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phiZ2D (get_local $$16) @@ -18661,7 +18661,7 @@ ) (if (get_local $$cmp33$i) - (call_import $_abort) + (call $_abort) ) (set_local $$add$ptr$i (i32.add @@ -18679,7 +18679,7 @@ (i32.eqz (get_local $$cmp35$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$parent$i (i32.add @@ -18858,7 +18858,7 @@ ) (if (get_local $$cmp81$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$lcssa) @@ -18891,7 +18891,7 @@ ) (if (get_local $$cmp45$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk47$i (i32.add @@ -18914,7 +18914,7 @@ (i32.eqz (get_local $$cmp48$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd50$i (i32.add @@ -18949,7 +18949,7 @@ ) (br $do-once$8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -19058,7 +19058,7 @@ ) (if (get_local $$cmp107$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx113$i (i32.add @@ -19121,7 +19121,7 @@ ) (if (get_local $$cmp130$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent135$i (i32.add @@ -19164,7 +19164,7 @@ ) (if (get_local $$cmp142$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx148$i (i32.add @@ -19227,7 +19227,7 @@ ) (if (get_local $$cmp159$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx165$i (i32.add @@ -19475,7 +19475,7 @@ ) (if (get_local $$cmp208$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$iZ2D (get_local $$48) @@ -20495,7 +20495,7 @@ ) (if (get_local $$cmp121$i) - (call_import $_abort) + (call $_abort) ) (set_local $$add$ptr$i$161 (i32.add @@ -20513,7 +20513,7 @@ (i32.eqz (get_local $$cmp123$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$parent$i$162 (i32.add @@ -20692,7 +20692,7 @@ ) (if (get_local $$cmp171$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$167$lcssa) @@ -20725,7 +20725,7 @@ ) (if (get_local $$cmp133$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk136$i (i32.add @@ -20748,7 +20748,7 @@ (i32.eqz (get_local $$cmp137$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd139$i (i32.add @@ -20783,7 +20783,7 @@ ) (br $do-once$21) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -20892,7 +20892,7 @@ ) (if (get_local $$cmp198$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx204$i (i32.add @@ -20955,7 +20955,7 @@ ) (if (get_local $$cmp221$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent226$i (i32.add @@ -20998,7 +20998,7 @@ ) (if (get_local $$cmp233$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx239$i (i32.add @@ -21061,7 +21061,7 @@ ) (if (get_local $$cmp250$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx256$i (i32.add @@ -21298,7 +21298,7 @@ ) (if (get_local $$cmp301$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$i$178Z2D (get_local $$83) @@ -21787,7 +21787,7 @@ ) (if (get_local $$cmp401$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx394$i$lcssa) @@ -21916,7 +21916,7 @@ ) (br $do-once$29) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -22212,7 +22212,7 @@ (get_local $$cmp$i$179) (block (set_local $$call$i$i - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -22262,7 +22262,7 @@ (i32.const 0) ) (set_local $$call6$i$i - (call_import $_time + (call $_time (i32.const 0) ) ) @@ -22284,7 +22284,7 @@ ) (br $do-once$33) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -22557,7 +22557,7 @@ (get_local $$cmp81$i$191) (block (set_local $$call83$i - (call_import $_sbrk + (call $_sbrk (get_local $$and80$i) ) ) @@ -22635,7 +22635,7 @@ ) (block (set_local $$call37$i - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -22790,7 +22790,7 @@ ) ) (set_local $$call68$i - (call_import $_sbrk + (call $_sbrk (get_local $$ssize$0$i) ) ) @@ -22919,7 +22919,7 @@ (get_local $$cmp105$i) (block (set_local $$call107$i - (call_import $_sbrk + (call $_sbrk (get_local $$and104$i) ) ) @@ -22933,7 +22933,7 @@ (get_local $$cmp108$i) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $$sub112$i) ) ) @@ -23029,12 +23029,12 @@ (get_local $$cmp127$i) (block (set_local $$call131$i - (call_import $_sbrk + (call $_sbrk (get_local $$and11$i) ) ) (set_local $$call132$i - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -24156,7 +24156,7 @@ ) (if (get_local $$cmp42$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk43$i$i (i32.add @@ -24179,7 +24179,7 @@ (get_local $$cmp44$i$i) (br $do-once$55) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24251,7 +24251,7 @@ ) (if (get_local $$cmp57$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$fd59$i$i (i32.add @@ -24279,7 +24279,7 @@ (br $do-once$57) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24476,7 +24476,7 @@ ) (if (get_local $$cmp112$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$i$lcssa) @@ -24509,7 +24509,7 @@ ) (if (get_local $$cmp81$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk82$i$i (i32.add @@ -24532,7 +24532,7 @@ (i32.eqz (get_local $$cmp83$i$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd85$i$i (i32.add @@ -24567,7 +24567,7 @@ ) (br $do-once$59) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24676,7 +24676,7 @@ ) (if (get_local $$cmp137$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx143$i$i (i32.add @@ -24740,7 +24740,7 @@ ) (if (get_local $$cmp160$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent165$i$i (i32.add @@ -24783,7 +24783,7 @@ ) (if (get_local $$cmp172$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx178$i$i (i32.add @@ -24845,7 +24845,7 @@ ) (if (get_local $$cmp189$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx195$i$i (i32.add @@ -25065,7 +25065,7 @@ (br $do-once$67) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -25549,7 +25549,7 @@ ) (if (get_local $$cmp332$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx325$i$i$lcssa) @@ -25678,7 +25678,7 @@ ) (br $do-once$52) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -26231,7 +26231,7 @@ ) (if (get_local $$cmp46$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$i$iZ2D (get_local $$196) @@ -26714,7 +26714,7 @@ ) (if (get_local $$cmp133$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx126$i$i$lcssa) @@ -26843,7 +26843,7 @@ ) (br $do-once$44) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27340,7 +27340,7 @@ ) (if (get_local $$cmp1) - (call_import $_abort) + (call $_abort) ) (set_local $$head (i32.add @@ -27367,7 +27367,7 @@ ) (if (get_local $$cmp2) - (call_import $_abort) + (call $_abort) ) (set_local $$and5 (i32.and @@ -27438,7 +27438,7 @@ ) (if (get_local $$cmp18) - (call_import $_abort) + (call $_abort) ) (set_local $$3 (i32.load @@ -27605,7 +27605,7 @@ ) (if (get_local $$cmp31) - (call_import $_abort) + (call $_abort) ) (set_local $$bk34 (i32.add @@ -27628,7 +27628,7 @@ (i32.eqz (get_local $$cmp35) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27705,7 +27705,7 @@ ) (if (get_local $$cmp53) - (call_import $_abort) + (call $_abort) ) (set_local $$fd56 (i32.add @@ -27729,7 +27729,7 @@ (set_local $$fd67$pre$phiZ2D (get_local $$fd56) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27933,7 +27933,7 @@ ) (if (get_local $$cmp118) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$lcssa) @@ -27966,7 +27966,7 @@ ) (if (get_local $$cmp80) - (call_import $_abort) + (call $_abort) ) (set_local $$bk82 (i32.add @@ -27989,7 +27989,7 @@ (i32.eqz (get_local $$cmp83) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd86 (i32.add @@ -28024,7 +28024,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28144,7 +28144,7 @@ ) (if (get_local $$cmp143) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx149 (i32.add @@ -28215,7 +28215,7 @@ ) (if (get_local $$cmp165) - (call_import $_abort) + (call $_abort) ) (set_local $$parent170 (i32.add @@ -28258,7 +28258,7 @@ ) (if (get_local $$cmp176) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx182 (i32.add @@ -28327,7 +28327,7 @@ ) (if (get_local $$cmp192) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx198 (i32.add @@ -28383,7 +28383,7 @@ (i32.eqz (get_local $$cmp228) ) - (call_import $_abort) + (call $_abort) ) (set_local $$head231 (i32.add @@ -28410,7 +28410,7 @@ ) (if (get_local $$tobool233) - (call_import $_abort) + (call $_abort) ) (set_local $$and240 (i32.and @@ -28655,7 +28655,7 @@ ) (if (get_local $$cmp283) - (call_import $_abort) + (call $_abort) ) (set_local $$bk286 (i32.add @@ -28678,7 +28678,7 @@ (i32.eqz (get_local $$cmp287) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28754,7 +28754,7 @@ ) (if (get_local $$cmp308) - (call_import $_abort) + (call $_abort) ) (set_local $$fd311 (i32.add @@ -28778,7 +28778,7 @@ (set_local $$fd322$pre$phiZ2D (get_local $$fd311) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28980,7 +28980,7 @@ ) (if (get_local $$cmp386) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP360$1$lcssa) @@ -29018,7 +29018,7 @@ ) (if (get_local $$cmp340) - (call_import $_abort) + (call $_abort) ) (set_local $$bk343 (i32.add @@ -29041,7 +29041,7 @@ (i32.eqz (get_local $$cmp344) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd347 (i32.add @@ -29076,7 +29076,7 @@ ) (br $do-once$10) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -29184,7 +29184,7 @@ ) (if (get_local $$cmp413) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx419 (i32.add @@ -29247,7 +29247,7 @@ ) (if (get_local $$cmp435) - (call_import $_abort) + (call $_abort) ) (set_local $$parent442 (i32.add @@ -29290,7 +29290,7 @@ ) (if (get_local $$cmp448) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx454 (i32.add @@ -29353,7 +29353,7 @@ ) (if (get_local $$cmp464) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx470 (i32.add @@ -29582,7 +29582,7 @@ ) (if (get_local $$cmp519) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phiZ2D (get_local $$63) @@ -30071,7 +30071,7 @@ ) (if (get_local $$cmp605) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx599$lcssa) @@ -30200,7 +30200,7 @@ ) (br $do-once$16) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -30636,7 +30636,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $dest) (get_local $src) (get_local $num) @@ -31554,7 +31554,7 @@ ) ) (func $b0 (param $p0 i32) (result i32) - (call_import $nullFunc_ii + (call $nullFunc_ii (i32.const 0) ) (return @@ -31562,7 +31562,7 @@ ) ) (func $b1 (param $p0 i32) (param $p1 i32) (param $p2 i32) (result i32) - (call_import $nullFunc_iiii + (call $nullFunc_iiii (i32.const 1) ) (return @@ -31570,7 +31570,7 @@ ) ) (func $b2 (param $p0 i32) - (call_import $nullFunc_vi + (call $nullFunc_vi (i32.const 2) ) ) diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt index 9f1021b30..8f8837c4c 100644 --- a/test/example/c-api-kitchen-sink.txt +++ b/test/example/c-api-kitchen-sink.txt @@ -453,7 +453,7 @@ BinaryenFloat64: 4 (drop (i32.eqz (i32.trunc_s/f32 - (call_import $an-imported + (call $an-imported (i32.const 13) (f64.const 3.7) ) @@ -541,14 +541,14 @@ raw: (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -556,7 +556,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -564,7 +564,7 @@ raw: (func $two-blocks-plus-code (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -575,7 +575,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -584,7 +584,7 @@ raw: (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -592,7 +592,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -605,7 +605,7 @@ raw: (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -616,7 +616,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -630,18 +630,18 @@ raw: ) (func $split (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -649,7 +649,7 @@ raw: ) (func $split-plus-code (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if @@ -659,7 +659,7 @@ raw: (i32.const 10) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -669,7 +669,7 @@ raw: (i32.const 20) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -679,13 +679,13 @@ raw: (func $if (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -696,7 +696,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -704,7 +704,7 @@ raw: (func $if-plus-code (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -714,7 +714,7 @@ raw: (i32.const -1) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -734,7 +734,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -742,13 +742,13 @@ raw: (func $if-else (type $v) (local $0 i32) (block $block$4$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -756,7 +756,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) (block @@ -766,7 +766,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -776,7 +776,7 @@ raw: (block $block$3$break (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -784,7 +784,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (if @@ -796,7 +796,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -804,7 +804,7 @@ raw: (func $nontrivial-loop-plus-phi-to-head (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -819,7 +819,7 @@ raw: (block $block$4$break (loop $shape$1$continue (block $block$3$break - (call_import $check + (call $check (i32.const 1) ) (if @@ -834,7 +834,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) (if @@ -852,13 +852,13 @@ raw: ) (block (block $block$6$break - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) (block - (call_import $check + (call $check (i32.const 4) ) (block @@ -869,7 +869,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 5) ) (block @@ -882,7 +882,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 6) ) ) @@ -890,7 +890,7 @@ raw: ) (func $switch (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -903,7 +903,7 @@ raw: ) (block (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -915,7 +915,7 @@ raw: (i32.const 55) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -924,7 +924,7 @@ raw: ) (block (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -943,7 +943,7 @@ raw: (block (block $block$3$break (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -974,7 +974,7 @@ raw: (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (block @@ -993,7 +993,7 @@ raw: (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (block @@ -1010,7 +1010,7 @@ raw: (func $return (type $i) (result i32) (local $0 i32) (block $the-list - (call_import $check + (call $check (i32.const 42) ) (return @@ -1027,81 +1027,81 @@ optimized: (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) ) (func $loop (type $v) (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br $shape$0$continue) ) ) (func $split (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) ) (func $if (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $if-else (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) - (call_import $check + (call $check (i32.const 3) ) ) (func $loop-tail (type $v) (block $block$3$break (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br_if $shape$0$continue @@ -1110,24 +1110,24 @@ optimized: (br $block$3$break) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $nontrivial-loop-plus-phi-to-head (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $block$7$break (block $block$4$break (loop $shape$1$continue - (call_import $check + (call $check (i32.const 1) ) (br_if $block$7$break (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (br_if $block$4$break @@ -1136,25 +1136,25 @@ optimized: (br $shape$1$continue) ) ) - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) - (call_import $check + (call $check (i32.const 4) ) ) - (call_import $check + (call $check (i32.const 5) ) ) - (call_import $check + (call $check (i32.const 6) ) ) (func $switch (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -1165,24 +1165,24 @@ optimized: (i32.const -99) ) ) - (call_import $check + (call $check (i32.const 1) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 2) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 3) ) ) ) (func $duffs-device (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (set_local $0 @@ -1195,7 +1195,7 @@ optimized: (i32.const 2) ) (block - (call_import $check + (call $check (i32.const 1) ) (set_local $0 @@ -1209,7 +1209,7 @@ optimized: (i32.const 3) ) (block - (call_import $check + (call $check (i32.const 2) ) (set_local $0 @@ -1222,7 +1222,7 @@ optimized: ) ) (func $return (type $i) (result i32) - (call_import $check + (call $check (i32.const 42) ) (i32.const 1337) @@ -1246,7 +1246,7 @@ module loaded from binary form: (type $v (func)) (import "spectest" "print" (func $print-i32 (param i32))) (func $starter (type $v) - (call_import $print-i32 + (call $print-i32 (i32.const 1234) ) ) @@ -2044,7 +2044,7 @@ int main() { (drop (i32.eqz (i32.trunc_s/f32 - (call_import $an-imported + (call $an-imported (i32.const 13) (f64.const 3.7) ) @@ -2592,14 +2592,14 @@ raw: (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2607,7 +2607,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -2615,7 +2615,7 @@ raw: (func $two-blocks-plus-code (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2626,7 +2626,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -2635,7 +2635,7 @@ raw: (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2643,7 +2643,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2656,7 +2656,7 @@ raw: (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2667,7 +2667,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2681,18 +2681,18 @@ raw: ) (func $split (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2700,7 +2700,7 @@ raw: ) (func $split-plus-code (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if @@ -2710,7 +2710,7 @@ raw: (i32.const 10) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -2720,7 +2720,7 @@ raw: (i32.const 20) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2730,13 +2730,13 @@ raw: (func $if (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2747,7 +2747,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2755,7 +2755,7 @@ raw: (func $if-plus-code (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -2765,7 +2765,7 @@ raw: (i32.const -1) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2785,7 +2785,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2793,13 +2793,13 @@ raw: (func $if-else (type $v) (local $0 i32) (block $block$4$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2807,7 +2807,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) (block @@ -2817,7 +2817,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -2827,7 +2827,7 @@ raw: (block $block$3$break (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2835,7 +2835,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (if @@ -2847,7 +2847,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2855,7 +2855,7 @@ raw: (func $nontrivial-loop-plus-phi-to-head (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2870,7 +2870,7 @@ raw: (block $block$4$break (loop $shape$1$continue (block $block$3$break - (call_import $check + (call $check (i32.const 1) ) (if @@ -2885,7 +2885,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) (if @@ -2903,13 +2903,13 @@ raw: ) (block (block $block$6$break - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) (block - (call_import $check + (call $check (i32.const 4) ) (block @@ -2920,7 +2920,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 5) ) (block @@ -2933,7 +2933,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 6) ) ) @@ -2941,7 +2941,7 @@ raw: ) (func $switch (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -2954,7 +2954,7 @@ raw: ) (block (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -2966,7 +2966,7 @@ raw: (i32.const 55) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2975,7 +2975,7 @@ raw: ) (block (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -2994,7 +2994,7 @@ raw: (block (block $block$3$break (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -3025,7 +3025,7 @@ raw: (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (block @@ -3044,7 +3044,7 @@ raw: (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (block @@ -3061,7 +3061,7 @@ raw: (func $return (type $i) (result i32) (local $0 i32) (block $the-list - (call_import $check + (call $check (i32.const 42) ) (return @@ -3082,81 +3082,81 @@ optimized: (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) ) (func $loop (type $v) (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br $shape$0$continue) ) ) (func $split (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) ) (func $if (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $if-else (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) - (call_import $check + (call $check (i32.const 3) ) ) (func $loop-tail (type $v) (block $block$3$break (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br_if $shape$0$continue @@ -3165,24 +3165,24 @@ optimized: (br $block$3$break) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $nontrivial-loop-plus-phi-to-head (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $block$7$break (block $block$4$break (loop $shape$1$continue - (call_import $check + (call $check (i32.const 1) ) (br_if $block$7$break (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (br_if $block$4$break @@ -3191,25 +3191,25 @@ optimized: (br $shape$1$continue) ) ) - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) - (call_import $check + (call $check (i32.const 4) ) ) - (call_import $check + (call $check (i32.const 5) ) ) - (call_import $check + (call $check (i32.const 6) ) ) (func $switch (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -3220,24 +3220,24 @@ optimized: (i32.const -99) ) ) - (call_import $check + (call $check (i32.const 1) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 2) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 3) ) ) ) (func $duffs-device (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (set_local $0 @@ -3250,7 +3250,7 @@ optimized: (i32.const 2) ) (block - (call_import $check + (call $check (i32.const 1) ) (set_local $0 @@ -3264,7 +3264,7 @@ optimized: (i32.const 3) ) (block - (call_import $check + (call $check (i32.const 2) ) (set_local $0 @@ -3277,7 +3277,7 @@ optimized: ) ) (func $return (type $i) (result i32) - (call_import $check + (call $check (i32.const 42) ) (i32.const 1337) diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt index 022bcc2e3..abe64601c 100644 --- a/test/example/c-api-kitchen-sink.txt.txt +++ b/test/example/c-api-kitchen-sink.txt.txt @@ -448,7 +448,7 @@ (drop (i32.eqz (i32.trunc_s/f32 - (call_import $an-imported + (call $an-imported (i32.const 13) (f64.const 3.7) ) @@ -535,14 +535,14 @@ (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -550,7 +550,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -558,7 +558,7 @@ (func $two-blocks-plus-code (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -569,7 +569,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -578,7 +578,7 @@ (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -586,7 +586,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -599,7 +599,7 @@ (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -610,7 +610,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -624,18 +624,18 @@ ) (func $split (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -643,7 +643,7 @@ ) (func $split-plus-code (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if @@ -653,7 +653,7 @@ (i32.const 10) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -663,7 +663,7 @@ (i32.const 20) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -673,13 +673,13 @@ (func $if (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -690,7 +690,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -698,7 +698,7 @@ (func $if-plus-code (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -708,7 +708,7 @@ (i32.const -1) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -728,7 +728,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -736,13 +736,13 @@ (func $if-else (type $v) (local $0 i32) (block $block$4$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -750,7 +750,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) (block @@ -760,7 +760,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -770,7 +770,7 @@ (block $block$3$break (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -778,7 +778,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) (if @@ -790,7 +790,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -798,7 +798,7 @@ (func $nontrivial-loop-plus-phi-to-head (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -813,7 +813,7 @@ (block $block$4$break (loop $shape$1$continue (block $block$3$break - (call_import $check + (call $check (i32.const 1) ) (if @@ -828,7 +828,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) (if @@ -846,13 +846,13 @@ ) (block (block $block$6$break - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) (block - (call_import $check + (call $check (i32.const 4) ) (block @@ -863,7 +863,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 5) ) (block @@ -876,7 +876,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 6) ) ) @@ -884,7 +884,7 @@ ) (func $switch (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -897,7 +897,7 @@ ) (block (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -909,7 +909,7 @@ (i32.const 55) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -918,7 +918,7 @@ ) (block (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -937,7 +937,7 @@ (block (block $block$3$break (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -968,7 +968,7 @@ (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (block @@ -987,7 +987,7 @@ (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (block @@ -1004,7 +1004,7 @@ (func $return (type $i) (result i32) (local $0 i32) (block $the-list - (call_import $check + (call $check (i32.const 42) ) (return @@ -1020,81 +1020,81 @@ (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) ) (func $loop (type $v) (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br $shape$0$continue) ) ) (func $split (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) ) (func $if (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $if-else (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) - (call_import $check + (call $check (i32.const 3) ) ) (func $loop-tail (type $v) (block $block$3$break (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br_if $shape$0$continue @@ -1103,24 +1103,24 @@ (br $block$3$break) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $nontrivial-loop-plus-phi-to-head (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $block$7$break (block $block$4$break (loop $shape$1$continue - (call_import $check + (call $check (i32.const 1) ) (br_if $block$7$break (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (br_if $block$4$break @@ -1129,25 +1129,25 @@ (br $shape$1$continue) ) ) - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) - (call_import $check + (call $check (i32.const 4) ) ) - (call_import $check + (call $check (i32.const 5) ) ) - (call_import $check + (call $check (i32.const 6) ) ) (func $switch (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -1158,24 +1158,24 @@ (i32.const -99) ) ) - (call_import $check + (call $check (i32.const 1) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 2) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 3) ) ) ) (func $duffs-device (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (set_local $0 @@ -1188,7 +1188,7 @@ (i32.const 2) ) (block - (call_import $check + (call $check (i32.const 1) ) (set_local $0 @@ -1202,7 +1202,7 @@ (i32.const 3) ) (block - (call_import $check + (call $check (i32.const 2) ) (set_local $0 @@ -1215,7 +1215,7 @@ ) ) (func $return (type $i) (result i32) - (call_import $check + (call $check (i32.const 42) ) (i32.const 1337) diff --git a/test/example/relooper-fuzz.txt b/test/example/relooper-fuzz.txt index 5db33f21e..a5a098b32 100644 --- a/test/example/relooper-fuzz.txt +++ b/test/example/relooper-fuzz.txt @@ -25,7 +25,7 @@ (i32.const 4) ) ) - (call_import $print + (call $print (i32.sub (i32.const 0) (i32.load offset=4 @@ -157,7 +157,7 @@ (block $block$6$break (block $block$5$break (block - (call_import $print + (call $print (i32.const 0) ) (set_local $0 @@ -180,7 +180,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 8) ) (set_local $0 @@ -207,7 +207,7 @@ (i32.const 0) ) (block - (call_import $print + (call $print (i32.const 5) ) (set_local $0 @@ -236,7 +236,7 @@ (block (block $block$3$break (block - (call_import $print + (call $print (i32.const 4) ) (set_local $0 @@ -272,7 +272,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 2) ) (set_local $0 @@ -318,7 +318,7 @@ (i32.const 4) ) ) - (call_import $print + (call $print (i32.sub (i32.const 0) (i32.load offset=4 @@ -445,7 +445,7 @@ (i32.const 112) (i32.const 34) ) - (call_import $print + (call $print (i32.const 0) ) (if @@ -454,7 +454,7 @@ (i32.const 2) ) (block - (call_import $print + (call $print (i32.const 8) ) (drop @@ -475,7 +475,7 @@ (set_local $0 (i32.const 0) ) - (call_import $print + (call $print (i32.const 5) ) (br_if $shape$3$continue @@ -492,7 +492,7 @@ (br $shape$3$continue) ) ) - (call_import $print + (call $print (i32.const 4) ) (br_if $shape$3$continue @@ -520,7 +520,7 @@ (br $shape$3$continue) ) ) - (call_import $print + (call $print (i32.const 2) ) (drop diff --git a/test/example/relooper-fuzz1.txt b/test/example/relooper-fuzz1.txt index b4ad8b5a1..9424160e3 100644 --- a/test/example/relooper-fuzz1.txt +++ b/test/example/relooper-fuzz1.txt @@ -25,7 +25,7 @@ (i32.const 4) ) ) - (call_import $print + (call $print (i32.sub (i32.const 0) (i32.load offset=4 @@ -169,7 +169,7 @@ (block $block$4$break (block $block$3$break (block - (call_import $print + (call $print (i32.const 0) ) (set_local $0 @@ -195,7 +195,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 7) ) (set_local $0 @@ -220,7 +220,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 2) ) (set_local $0 @@ -242,7 +242,7 @@ ) (loop $shape$6$continue (block - (call_import $print + (call $print (i32.const 3) ) (set_local $0 @@ -256,7 +256,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 9) ) (set_local $0 @@ -294,7 +294,7 @@ (i32.const 4) ) ) - (call_import $print + (call $print (i32.sub (i32.const 0) (i32.load offset=4 @@ -434,7 +434,7 @@ ) (block $block$10$break (block $block$4$break - (call_import $print + (call $print (i32.const 0) ) (if @@ -453,7 +453,7 @@ (i32.const 2) ) (block - (call_import $print + (call $print (i32.const 7) ) (br_if $block$10$break @@ -466,7 +466,7 @@ (br $block$4$break) ) ) - (call_import $print + (call $print (i32.const 2) ) (br_if $block$10$break @@ -477,7 +477,7 @@ ) ) (loop $shape$6$continue - (call_import $print + (call $print (i32.const 3) ) (drop @@ -486,7 +486,7 @@ (br $shape$6$continue) ) ) - (call_import $print + (call $print (i32.const 9) ) (drop diff --git a/test/llvm_autogenerated/byval.wast b/test/llvm_autogenerated/byval.wast index 122446985..9549ef683 100644 --- a/test/llvm_autogenerated/byval.wast +++ b/test/llvm_autogenerated/byval.wast @@ -43,7 +43,7 @@ ) ) (drop - (call_import $ext_byval_func + (call $ext_byval_func (i32.add (get_local $1) (i32.const 12) @@ -85,7 +85,7 @@ ) ) (drop - (call_import $ext_byval_func_align8 + (call $ext_byval_func_align8 (i32.add (get_local $1) (i32.const 8) @@ -141,7 +141,7 @@ ) ) (drop - (call_import $ext_byval_func_alignedstruct + (call $ext_byval_func_alignedstruct (get_local $1) ) ) @@ -158,7 +158,7 @@ ) (func $byval_param (param $0 i32) (drop - (call_import $ext_func + (call $ext_func (get_local $0) ) ) @@ -166,7 +166,7 @@ ) (func $byval_empty_caller (param $0 i32) (drop - (call_import $ext_byval_func_empty + (call $ext_byval_func_empty (get_local $0) ) ) @@ -174,7 +174,7 @@ ) (func $byval_empty_callee (param $0 i32) (drop - (call_import $ext_func_empty + (call $ext_func_empty (get_local $0) ) ) @@ -196,9 +196,9 @@ ) ) (drop - (call_import $big_byval_callee + (call $big_byval_callee (tee_local $0 - (call_import $memcpy + (call $memcpy (get_local $1) (get_local $0) (i32.const 131072) diff --git a/test/llvm_autogenerated/call.wast b/test/llvm_autogenerated/call.wast index 5e91ea75f..9b547f132 100644 --- a/test/llvm_autogenerated/call.wast +++ b/test/llvm_autogenerated/call.wast @@ -34,40 +34,40 @@ (elem (i32.const 0) $__wasm_nullptr $__importThunk_void_nullary) (func $call_i32_nullary (result i32) (return - (call_import $i32_nullary) + (call $i32_nullary) ) ) (func $call_i64_nullary (result i64) (return - (call_import $i64_nullary) + (call $i64_nullary) ) ) (func $call_float_nullary (result f32) (return - (call_import $float_nullary) + (call $float_nullary) ) ) (func $call_double_nullary (result f64) (return - (call_import $double_nullary) + (call $double_nullary) ) ) (func $call_void_nullary (drop - (call_import $void_nullary) + (call $void_nullary) ) (return) ) (func $call_i32_unary (param $0 i32) (result i32) (return - (call_import $i32_unary + (call $i32_unary (get_local $0) ) ) ) (func $call_i32_binary (param $0 i32) (param $1 i32) (result i32) (return - (call_import $i32_binary + (call $i32_binary (get_local $0) (get_local $1) ) @@ -90,19 +90,19 @@ ) (func $tail_call_void_nullary (drop - (call_import $void_nullary) + (call $void_nullary) ) (return) ) (func $fastcc_tail_call_void_nullary (drop - (call_import $void_nullary) + (call $void_nullary) ) (return) ) (func $coldcc_tail_call_void_nullary (drop - (call_import $void_nullary) + (call $void_nullary) ) (return) ) @@ -110,7 +110,7 @@ (unreachable) ) (func $__importThunk_void_nullary (type $FUNCSIG$v) - (call_import $void_nullary) + (call $void_nullary) ) (func $dynCall_v (param $fptr i32) (call_indirect $FUNCSIG$v diff --git a/test/llvm_autogenerated/cfg-stackify.wast b/test/llvm_autogenerated/cfg-stackify.wast index bfea4a853..87d8c430d 100644 --- a/test/llvm_autogenerated/cfg-stackify.wast +++ b/test/llvm_autogenerated/cfg-stackify.wast @@ -54,7 +54,7 @@ ) ) (drop - (call_import $something) + (call $something) ) (br $label$0) ) @@ -81,7 +81,7 @@ ) ) (drop - (call_import $something) + (call $something) ) (br $label$0) ) @@ -512,7 +512,7 @@ (unreachable) ) (drop - (call_import $bar) + (call $bar) ) (br $label$1) ) @@ -787,7 +787,7 @@ (br_if $label$1 (i32.eqz (i32.and - (call_import $a) + (call $a) (i32.const 1) ) ) @@ -804,7 +804,7 @@ (br_if $label$4 (i32.eqz (i32.and - (call_import $a) + (call $a) (i32.const 1) ) ) @@ -817,7 +817,7 @@ ) (br_if $label$2 (i32.and - (call_import $a) + (call $a) (i32.const 1) ) ) @@ -831,7 +831,7 @@ ) (br_if $label$2 (i32.and - (call_import $a) + (call $a) (i32.const 1) ) ) @@ -1120,7 +1120,7 @@ ) ) (drop - (call_import $test15_callee1) + (call $test15_callee1) ) (br $label$0) ) @@ -1157,7 +1157,7 @@ ) ) (drop - (call_import $test15_callee0) + (call $test15_callee0) ) (return) ) diff --git a/test/llvm_autogenerated/f32.wast b/test/llvm_autogenerated/f32.wast index f660676e5..f4b5243b0 100644 --- a/test/llvm_autogenerated/f32.wast +++ b/test/llvm_autogenerated/f32.wast @@ -134,7 +134,7 @@ ) (func $fma32 (param $0 f32) (param $1 f32) (param $2 f32) (result f32) (return - (call_import $fmaf + (call $fmaf (get_local $0) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/f64.wast b/test/llvm_autogenerated/f64.wast index 07a49840b..19ba5ae04 100644 --- a/test/llvm_autogenerated/f64.wast +++ b/test/llvm_autogenerated/f64.wast @@ -134,7 +134,7 @@ ) (func $fma64 (param $0 f64) (param $1 f64) (param $2 f64) (result f64) (return - (call_import $fma + (call $fma (get_local $0) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/frem.wast b/test/llvm_autogenerated/frem.wast index bc69d93f1..ec213e457 100644 --- a/test/llvm_autogenerated/frem.wast +++ b/test/llvm_autogenerated/frem.wast @@ -10,7 +10,7 @@ (export "frem64" (func $frem64)) (func $frem32 (param $0 f32) (param $1 f32) (result f32) (return - (call_import $fmodf + (call $fmodf (get_local $0) (get_local $1) ) @@ -18,7 +18,7 @@ ) (func $frem64 (param $0 f64) (param $1 f64) (result f64) (return - (call_import $fmod + (call $fmod (get_local $0) (get_local $1) ) diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast index 57aca9ffc..3c34312e3 100644 --- a/test/llvm_autogenerated/global.wast +++ b/test/llvm_autogenerated/global.wast @@ -27,7 +27,7 @@ ) (func $call_memcpy (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (return - (call_import $memcpy + (call $memcpy (get_local $0) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/i128.wast b/test/llvm_autogenerated/i128.wast index 9b4fd8970..570947567 100644 --- a/test/llvm_autogenerated/i128.wast +++ b/test/llvm_autogenerated/i128.wast @@ -125,7 +125,7 @@ ) ) (drop - (call_import $__multi3 + (call $__multi3 (get_local $5) (get_local $1) (get_local $2) @@ -182,7 +182,7 @@ ) ) (drop - (call_import $__divti3 + (call $__divti3 (get_local $5) (get_local $1) (get_local $2) @@ -239,7 +239,7 @@ ) ) (drop - (call_import $__udivti3 + (call $__udivti3 (get_local $5) (get_local $1) (get_local $2) @@ -296,7 +296,7 @@ ) ) (drop - (call_import $__modti3 + (call $__modti3 (get_local $5) (get_local $1) (get_local $2) @@ -353,7 +353,7 @@ ) ) (drop - (call_import $__umodti3 + (call $__umodti3 (get_local $5) (get_local $1) (get_local $2) @@ -482,7 +482,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (get_local $5) (get_local $1) (get_local $2) @@ -540,7 +540,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (get_local $5) (get_local $1) (get_local $2) @@ -598,7 +598,7 @@ ) ) (drop - (call_import $__ashrti3 + (call $__ashrti3 (get_local $5) (get_local $1) (get_local $2) @@ -819,7 +819,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $5) (i32.const 16) @@ -832,7 +832,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (get_local $5) (get_local $1) (get_local $2) @@ -909,7 +909,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $5) (i32.const 16) @@ -927,7 +927,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (get_local $5) (get_local $1) (get_local $2) @@ -1004,7 +1004,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $5) (i32.const 16) @@ -1017,7 +1017,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (get_local $5) (get_local $1) (get_local $2) @@ -1094,7 +1094,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $5) (i32.const 16) @@ -1112,7 +1112,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (get_local $5) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/legalize.wast b/test/llvm_autogenerated/legalize.wast index 5ef162889..4c32851ed 100644 --- a/test/llvm_autogenerated/legalize.wast +++ b/test/llvm_autogenerated/legalize.wast @@ -97,7 +97,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 512) @@ -112,7 +112,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 528) @@ -123,7 +123,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 544) @@ -139,7 +139,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 560) @@ -155,7 +155,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 736) @@ -171,7 +171,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 720) @@ -187,7 +187,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 752) @@ -203,7 +203,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 592) @@ -214,7 +214,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 608) @@ -225,7 +225,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 624) @@ -236,7 +236,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 688) @@ -252,7 +252,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 640) @@ -263,7 +263,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 656) @@ -279,7 +279,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 672) @@ -290,7 +290,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 576) @@ -301,7 +301,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 704) @@ -312,7 +312,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 480) @@ -326,7 +326,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 464) @@ -342,7 +342,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 496) @@ -356,7 +356,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 352) @@ -372,7 +372,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 336) @@ -388,7 +388,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 368) @@ -404,7 +404,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 432) @@ -420,7 +420,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 864) @@ -431,7 +431,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 848) @@ -442,7 +442,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 880) @@ -453,7 +453,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 1008) @@ -464,7 +464,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 960) @@ -475,7 +475,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 976) @@ -486,7 +486,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 816) @@ -497,7 +497,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 240) @@ -513,7 +513,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 192) @@ -524,7 +524,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 208) @@ -540,7 +540,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 224) @@ -551,7 +551,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 768) @@ -562,7 +562,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 784) @@ -573,7 +573,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 800) @@ -584,7 +584,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 992) @@ -595,7 +595,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 832) @@ -606,7 +606,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 384) @@ -617,7 +617,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 400) @@ -631,7 +631,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 416) @@ -642,7 +642,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 320) @@ -653,7 +653,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 448) @@ -664,7 +664,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 128) @@ -675,7 +675,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 144) @@ -689,7 +689,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 160) @@ -700,7 +700,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (get_local $52) (get_local $1) (get_local $2) @@ -708,7 +708,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 16) @@ -719,7 +719,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 32) @@ -730,7 +730,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 64) @@ -746,7 +746,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 896) @@ -757,7 +757,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 256) @@ -768,7 +768,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 912) @@ -779,7 +779,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 928) @@ -790,7 +790,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 944) @@ -801,7 +801,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 80) @@ -812,7 +812,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 96) @@ -826,7 +826,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 112) @@ -837,7 +837,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 48) @@ -848,7 +848,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 176) @@ -859,7 +859,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 288) @@ -870,7 +870,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 272) @@ -881,7 +881,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 304) diff --git a/test/llvm_autogenerated/mem-intrinsics.wast b/test/llvm_autogenerated/mem-intrinsics.wast index 90ec611af..21085a2b2 100644 --- a/test/llvm_autogenerated/mem-intrinsics.wast +++ b/test/llvm_autogenerated/mem-intrinsics.wast @@ -21,7 +21,7 @@ (export "tail_dup_to_reuse_result" (func $tail_dup_to_reuse_result)) (func $copy_yes (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (return - (call_import $memcpy + (call $memcpy (get_local $0) (get_local $1) (get_local $2) @@ -30,7 +30,7 @@ ) (func $copy_no (param $0 i32) (param $1 i32) (param $2 i32) (drop - (call_import $memcpy + (call $memcpy (get_local $0) (get_local $1) (get_local $2) @@ -40,7 +40,7 @@ ) (func $move_yes (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (return - (call_import $memmove + (call $memmove (get_local $0) (get_local $1) (get_local $2) @@ -49,7 +49,7 @@ ) (func $move_no (param $0 i32) (param $1 i32) (param $2 i32) (drop - (call_import $memmove + (call $memmove (get_local $0) (get_local $1) (get_local $2) @@ -59,7 +59,7 @@ ) (func $set_yes (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (return - (call_import $memset + (call $memset (get_local $0) (get_local $1) (get_local $2) @@ -68,7 +68,7 @@ ) (func $set_no (param $0 i32) (param $1 i32) (param $2 i32) (drop - (call_import $memset + (call $memset (get_local $0) (get_local $1) (get_local $2) @@ -92,7 +92,7 @@ ) ) (drop - (call_import $memset + (call $memset (i32.add (get_local $0) (i32.const 2048) @@ -105,7 +105,7 @@ (i32.store offset=4 (i32.const 0) (i32.add - (call_import $memset + (call $memset (get_local $0) (i32.const 0) (i32.const 1024) @@ -126,7 +126,7 @@ ) ) (set_local $0 - (call_import $def) + (call $def) ) (br $label$1) ) @@ -137,21 +137,21 @@ ) ) (drop - (call_import $block_tail_dup) + (call $block_tail_dup) ) (return (get_local $0) ) ) (drop - (call_import $memset + (call $memset (get_local $0) (get_local $1) (get_local $2) ) ) (drop - (call_import $block_tail_dup) + (call $block_tail_dup) ) (return (get_local $0) @@ -167,7 +167,7 @@ ) ) (set_local $0 - (call_import $def) + (call $def) ) (br $label$1) ) @@ -182,7 +182,7 @@ ) ) (return - (call_import $memset + (call $memset (get_local $0) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/reg-stackify.wast b/test/llvm_autogenerated/reg-stackify.wast index 299d85515..878397f19 100644 --- a/test/llvm_autogenerated/reg-stackify.wast +++ b/test/llvm_autogenerated/reg-stackify.wast @@ -119,13 +119,13 @@ ) ) (return - (call_import $readnone_callee) + (call $readnone_callee) ) ) (func $no_sink_readonly_call (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (local $3 i32) (set_local $3 - (call_import $readonly_callee) + (call $readonly_callee) ) (drop (i32.store @@ -210,7 +210,7 @@ ) ) (drop - (call_import $evoke_side_effects) + (call $evoke_side_effects) ) (drop (i64.store @@ -219,7 +219,7 @@ ) ) (drop - (call_import $evoke_side_effects) + (call $evoke_side_effects) ) (return) ) @@ -275,7 +275,7 @@ ) (func $simple_multiple_use (param $0 i32) (param $1 i32) (drop - (call_import $use_a + (call $use_a (tee_local $1 (i32.mul (get_local $1) @@ -285,7 +285,7 @@ ) ) (drop - (call_import $use_b + (call $use_b (get_local $1) ) ) @@ -293,7 +293,7 @@ ) (func $multiple_uses_in_same_insn (param $0 i32) (param $1 i32) (drop - (call_import $use_2 + (call $use_2 (tee_local $1 (i32.mul (get_local $1) @@ -309,24 +309,24 @@ (return (i32.add (i32.add - (call_import $red) - (call_import $green) + (call $red) + (call $green) ) - (call_import $blue) + (call $blue) ) ) ) (func $no_stackify_past_use (param $0 i32) (result i32) (local $1 i32) (set_local $1 - (call_import $callee + (call $callee (get_local $0) ) ) (return (i32.div_s (i32.sub - (call_import $callee + (call $callee (i32.add (get_local $0) (i32.const 1) @@ -343,13 +343,13 @@ (return (i32.mul (tee_local $1 - (call_import $callee + (call $callee (get_local $0) ) ) (i32.add (get_local $1) - (call_import $callee + (call $callee (i32.add (get_local $0) (i32.const 1) @@ -470,7 +470,7 @@ (local $0 i32) (local $1 i32) (set_local $0 - (call_import $red) + (call $red) ) (set_local $1 (i32.load offset=12 @@ -478,7 +478,7 @@ ) ) (drop - (call_import $callee + (call $callee (get_local $0) ) ) @@ -499,7 +499,7 @@ ) ) (drop - (call_import $callee + (call $callee (get_local $0) ) ) @@ -515,7 +515,7 @@ ) ) (drop - (call_import $callee + (call $callee (get_local $0) ) ) @@ -545,7 +545,7 @@ ) ) (set_local $0 - (call_import $use_memory + (call $use_memory (i32.add (get_local $1) (i32.const 12) @@ -601,7 +601,7 @@ (func $stackpointer_dependency (param $0 i32) (result i32) (local $1 i32) (set_local $0 - (call_import $stackpointer_callee + (call $stackpointer_callee (get_local $0) (tee_local $1 (i32.load offset=4 diff --git a/test/llvm_autogenerated/switch.wast b/test/llvm_autogenerated/switch.wast index 7191df4de..988fc967a 100644 --- a/test/llvm_autogenerated/switch.wast +++ b/test/llvm_autogenerated/switch.wast @@ -30,32 +30,32 @@ ) ) (drop - (call_import $foo0) + (call $foo0) ) (return) ) (drop - (call_import $foo1) + (call $foo1) ) (return) ) (drop - (call_import $foo2) + (call $foo2) ) (return) ) (drop - (call_import $foo3) + (call $foo3) ) (return) ) (drop - (call_import $foo4) + (call $foo4) ) (return) ) (drop - (call_import $foo5) + (call $foo5) ) ) (return) @@ -81,32 +81,32 @@ ) ) (drop - (call_import $foo0) + (call $foo0) ) (return) ) (drop - (call_import $foo1) + (call $foo1) ) (return) ) (drop - (call_import $foo2) + (call $foo2) ) (return) ) (drop - (call_import $foo3) + (call $foo3) ) (return) ) (drop - (call_import $foo4) + (call $foo4) ) (return) ) (drop - (call_import $foo5) + (call $foo5) ) ) (return) diff --git a/test/llvm_autogenerated/unreachable.wast b/test/llvm_autogenerated/unreachable.wast index 5029f5083..837518400 100644 --- a/test/llvm_autogenerated/unreachable.wast +++ b/test/llvm_autogenerated/unreachable.wast @@ -9,7 +9,7 @@ (export "f3" (func $f3)) (func $f1 (result i32) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) diff --git a/test/llvm_autogenerated/unused-argument.wast b/test/llvm_autogenerated/unused-argument.wast index 1248f2e50..878d92c57 100644 --- a/test/llvm_autogenerated/unused-argument.wast +++ b/test/llvm_autogenerated/unused-argument.wast @@ -19,7 +19,7 @@ ) (func $call_something (drop - (call_import $return_something) + (call $return_something) ) (return) ) diff --git a/test/llvm_autogenerated/userstack.wast b/test/llvm_autogenerated/userstack.wast index b3e576121..d9b226378 100644 --- a/test/llvm_autogenerated/userstack.wast +++ b/test/llvm_autogenerated/userstack.wast @@ -130,7 +130,7 @@ ) ) (drop - (call_import $ext_func + (call $ext_func (i32.add (get_local $1) (i32.const 8) @@ -138,7 +138,7 @@ ) ) (drop - (call_import $ext_func + (call $ext_func (get_local $1) ) ) @@ -190,7 +190,7 @@ ) ) (drop - (call_import $ext_func + (call $ext_func (i32.const 0) ) ) @@ -232,7 +232,7 @@ ) ) (drop - (call_import $ext_func_i32 + (call $ext_func_i32 (get_local $0) ) ) @@ -370,7 +370,7 @@ (func $frameaddress_0 (local $0 i32) (drop - (call_import $use_i8_star + (call $use_i8_star (tee_local $0 (i32.load offset=4 (i32.const 0) @@ -388,7 +388,7 @@ ) (func $frameaddress_1 (drop - (call_import $use_i8_star + (call $use_i8_star (i32.const 0) ) ) diff --git a/test/llvm_autogenerated/varargs.wast b/test/llvm_autogenerated/varargs.wast index e2ec13ebc..2bd953d8e 100644 --- a/test/llvm_autogenerated/varargs.wast +++ b/test/llvm_autogenerated/varargs.wast @@ -145,7 +145,7 @@ ) (func $caller_none (drop - (call_import $callee + (call $callee (i32.const 0) ) ) @@ -179,7 +179,7 @@ ) ) (drop - (call_import $callee + (call $callee (get_local $0) ) ) diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm index 70ef836b0..9cf9336a4 100644 --- a/test/memorygrowth.fromasm +++ b/test/memorygrowth.fromasm @@ -253,7 +253,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -277,7 +277,7 @@ (get_local $7) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -503,7 +503,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -532,7 +532,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -625,7 +625,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $41 (get_local $5) @@ -888,7 +888,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ge_u @@ -900,7 +900,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (set_local $0 (i32.load offset=24 @@ -1007,7 +1007,7 @@ (get_local $6) (get_local $3) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $6) @@ -1029,7 +1029,7 @@ ) (get_local $3) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -1043,7 +1043,7 @@ ) (get_local $1) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -1070,7 +1070,7 @@ (get_local $17) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -1135,7 +1135,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -1174,7 +1174,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $23) @@ -1191,7 +1191,7 @@ (get_local $3) (get_local $17) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $23) @@ -1217,7 +1217,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $23) @@ -1350,7 +1350,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $42 (get_local $6) @@ -2018,7 +2018,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ge_u @@ -2030,7 +2030,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (set_local $5 (i32.load offset=24 @@ -2138,7 +2138,7 @@ (get_local $3) (get_local $10) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $3) @@ -2160,7 +2160,7 @@ ) (get_local $10) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -2174,7 +2174,7 @@ ) (get_local $11) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -2201,7 +2201,7 @@ (get_local $3) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -2266,7 +2266,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -2305,7 +2305,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $22) @@ -2322,7 +2322,7 @@ (get_local $10) (get_local $3) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $22) @@ -2348,7 +2348,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $22) @@ -2477,7 +2477,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $19 (get_local $2) @@ -2794,7 +2794,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $21) @@ -2865,7 +2865,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -3284,7 +3284,7 @@ (if (i32.eq (tee_local $19 - (call_import $ta + (call $ta (get_local $7) ) ) @@ -3342,7 +3342,7 @@ (if (i32.ne (tee_local $16 - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -3429,7 +3429,7 @@ (if (i32.eq (tee_local $19 - (call_import $ta + (call $ta (get_local $2) ) ) @@ -3519,14 +3519,14 @@ ) (if (i32.eq - (call_import $ta + (call $ta (get_local $0) ) (i32.const -1) ) (block (drop - (call_import $ta + (call $ta (get_local $19) ) ) @@ -3592,12 +3592,12 @@ (i32.and (i32.lt_u (tee_local $4 - (call_import $ta + (call $ta (get_local $13) ) ) (tee_local $13 - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -4143,7 +4143,7 @@ (get_local $21) (get_local $8) ) - (call_import $qa) + (call $qa) ) (br_if $do-once$53 (i32.eq @@ -4153,7 +4153,7 @@ (get_local $4) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4199,7 +4199,7 @@ (get_local $11) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4220,7 +4220,7 @@ (br $do-once$55) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4340,7 +4340,7 @@ (get_local $16) (get_local $8) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $16) @@ -4362,7 +4362,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -4376,7 +4376,7 @@ ) (get_local $4) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4403,7 +4403,7 @@ (get_local $0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4466,7 +4466,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4506,7 +4506,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $24) @@ -4528,7 +4528,7 @@ (get_local $11) (get_local $0) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $24) @@ -4557,7 +4557,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $24) @@ -4675,7 +4675,7 @@ (br $do-once$65) ) ) - (call_import $qa) + (call $qa) ) (block (i32.store @@ -4989,7 +4989,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $46) @@ -5060,7 +5060,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5388,7 +5388,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $47 (get_local $5) @@ -5700,7 +5700,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $48) @@ -5771,7 +5771,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6027,7 +6027,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6046,7 +6046,7 @@ ) (i32.const 1) ) - (call_import $qa) + (call $qa) ) (set_local $8 (i32.add @@ -6104,7 +6104,7 @@ ) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6212,7 +6212,7 @@ (get_local $11) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6221,7 +6221,7 @@ ) (get_local $0) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6272,7 +6272,7 @@ (get_local $1) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6289,7 +6289,7 @@ (set_local $10 (get_local $3) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6423,7 +6423,7 @@ (get_local $9) (get_local $14) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $9) @@ -6445,7 +6445,7 @@ ) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6459,7 +6459,7 @@ ) (get_local $0) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6486,7 +6486,7 @@ (get_local $1) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6556,7 +6556,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6604,7 +6604,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $4) @@ -6626,7 +6626,7 @@ (get_local $3) (get_local $1) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $4) @@ -6652,7 +6652,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $4) @@ -6697,7 +6697,7 @@ (get_local $2) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eqz @@ -6715,7 +6715,7 @@ (i32.const 1) ) ) - (call_import $qa) + (call $qa) ) (if (i32.and @@ -6894,7 +6894,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6903,7 +6903,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6950,7 +6950,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6967,7 +6967,7 @@ (set_local $17 (get_local $3) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7088,7 +7088,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $3) @@ -7112,7 +7112,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -7126,7 +7126,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7153,7 +7153,7 @@ (get_local $9) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7217,7 +7217,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7256,7 +7256,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $12) @@ -7278,7 +7278,7 @@ (get_local $0) (get_local $9) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $12) @@ -7304,7 +7304,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $12) @@ -7410,7 +7410,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $15 (get_local $4) @@ -7694,7 +7694,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $18) @@ -7765,7 +7765,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7948,7 +7948,7 @@ (i32.const 1160) ) (block - (call_import $ra + (call $ra (i32.const 1) (get_local $0) ) @@ -7968,13 +7968,13 @@ ) (set_local $9 (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $12) ) ) ) - (call_import $oa + (call $oa (i32.const 0) ) (get_local $9) @@ -7995,7 +7995,7 @@ (get_local $4) ) (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $11) ) @@ -8651,7 +8651,7 @@ (i32.const 0) ) ) - (call_import $pa + (call $pa (i32.const 1188) ) (if @@ -8720,7 +8720,7 @@ (get_local $0) ) ) - (call_import $xa + (call $xa (i32.const 1188) ) (get_local $2) @@ -9020,7 +9020,7 @@ (i32.const 4096) ) (return - (call_import $va + (call $va (get_local $0) (get_local $1) (get_local $2) @@ -9533,7 +9533,7 @@ (get_local $4) ) (get_local $2) - (call_import $i32u-div + (call $i32u-div (get_local $0) (get_local $1) ) @@ -9584,7 +9584,7 @@ (if (i32.lt_s (call $Pa - (call_import $ua + (call $ua (i32.const 140) (get_local $3) ) @@ -9655,7 +9655,7 @@ ) ) (if - (call_import $wa + (call $wa (i32.const 54) (get_local $3) ) @@ -9750,7 +9750,7 @@ ) (set_local $0 (call $Pa - (call_import $sa + (call $sa (i32.const 6) (get_local $2) ) @@ -9867,7 +9867,7 @@ ) ) (func $ob (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $ja + (call $ja (i32.const 1) ) (i32.const 0) @@ -9932,7 +9932,7 @@ ) ) (func $nb (param $0 i32) (result i32) - (call_import $ja + (call $ja (i32.const 0) ) (i32.const 0) @@ -9952,7 +9952,7 @@ (nop) ) (func $pb (param $0 i32) - (call_import $ja + (call $ja (i32.const 2) ) ) diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise index 4e4891a8d..847a8dd9a 100644 --- a/test/memorygrowth.fromasm.imprecise +++ b/test/memorygrowth.fromasm.imprecise @@ -251,7 +251,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -275,7 +275,7 @@ (get_local $7) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -501,7 +501,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -530,7 +530,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -623,7 +623,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $41 (get_local $5) @@ -886,7 +886,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ge_u @@ -898,7 +898,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (set_local $0 (i32.load offset=24 @@ -1005,7 +1005,7 @@ (get_local $6) (get_local $3) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $6) @@ -1027,7 +1027,7 @@ ) (get_local $3) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -1041,7 +1041,7 @@ ) (get_local $1) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -1068,7 +1068,7 @@ (get_local $17) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -1133,7 +1133,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -1172,7 +1172,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $23) @@ -1189,7 +1189,7 @@ (get_local $3) (get_local $17) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $23) @@ -1215,7 +1215,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $23) @@ -1348,7 +1348,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $42 (get_local $6) @@ -2016,7 +2016,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ge_u @@ -2028,7 +2028,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (set_local $5 (i32.load offset=24 @@ -2136,7 +2136,7 @@ (get_local $3) (get_local $10) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $3) @@ -2158,7 +2158,7 @@ ) (get_local $10) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -2172,7 +2172,7 @@ ) (get_local $11) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -2199,7 +2199,7 @@ (get_local $3) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -2264,7 +2264,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -2303,7 +2303,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $22) @@ -2320,7 +2320,7 @@ (get_local $10) (get_local $3) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $22) @@ -2346,7 +2346,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $22) @@ -2475,7 +2475,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $19 (get_local $2) @@ -2792,7 +2792,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $21) @@ -2863,7 +2863,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -3282,7 +3282,7 @@ (if (i32.eq (tee_local $19 - (call_import $ta + (call $ta (get_local $7) ) ) @@ -3340,7 +3340,7 @@ (if (i32.ne (tee_local $16 - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -3427,7 +3427,7 @@ (if (i32.eq (tee_local $19 - (call_import $ta + (call $ta (get_local $2) ) ) @@ -3517,14 +3517,14 @@ ) (if (i32.eq - (call_import $ta + (call $ta (get_local $0) ) (i32.const -1) ) (block (drop - (call_import $ta + (call $ta (get_local $19) ) ) @@ -3590,12 +3590,12 @@ (i32.and (i32.lt_u (tee_local $4 - (call_import $ta + (call $ta (get_local $13) ) ) (tee_local $13 - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -4141,7 +4141,7 @@ (get_local $21) (get_local $8) ) - (call_import $qa) + (call $qa) ) (br_if $do-once$53 (i32.eq @@ -4151,7 +4151,7 @@ (get_local $4) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4197,7 +4197,7 @@ (get_local $11) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4218,7 +4218,7 @@ (br $do-once$55) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4338,7 +4338,7 @@ (get_local $16) (get_local $8) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $16) @@ -4360,7 +4360,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -4374,7 +4374,7 @@ ) (get_local $4) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4401,7 +4401,7 @@ (get_local $0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4464,7 +4464,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4504,7 +4504,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $24) @@ -4526,7 +4526,7 @@ (get_local $11) (get_local $0) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $24) @@ -4555,7 +4555,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $24) @@ -4673,7 +4673,7 @@ (br $do-once$65) ) ) - (call_import $qa) + (call $qa) ) (block (i32.store @@ -4987,7 +4987,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $46) @@ -5058,7 +5058,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5386,7 +5386,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $47 (get_local $5) @@ -5698,7 +5698,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $48) @@ -5769,7 +5769,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6025,7 +6025,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6044,7 +6044,7 @@ ) (i32.const 1) ) - (call_import $qa) + (call $qa) ) (set_local $8 (i32.add @@ -6102,7 +6102,7 @@ ) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6210,7 +6210,7 @@ (get_local $11) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6219,7 +6219,7 @@ ) (get_local $0) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6270,7 +6270,7 @@ (get_local $1) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6287,7 +6287,7 @@ (set_local $10 (get_local $3) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6421,7 +6421,7 @@ (get_local $9) (get_local $14) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $9) @@ -6443,7 +6443,7 @@ ) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6457,7 +6457,7 @@ ) (get_local $0) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6484,7 +6484,7 @@ (get_local $1) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6554,7 +6554,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6602,7 +6602,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $4) @@ -6624,7 +6624,7 @@ (get_local $3) (get_local $1) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $4) @@ -6650,7 +6650,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $4) @@ -6695,7 +6695,7 @@ (get_local $2) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eqz @@ -6713,7 +6713,7 @@ (i32.const 1) ) ) - (call_import $qa) + (call $qa) ) (if (i32.and @@ -6892,7 +6892,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6901,7 +6901,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6948,7 +6948,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6965,7 +6965,7 @@ (set_local $17 (get_local $3) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7086,7 +7086,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $3) @@ -7110,7 +7110,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -7124,7 +7124,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7151,7 +7151,7 @@ (get_local $9) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7215,7 +7215,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7254,7 +7254,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $12) @@ -7276,7 +7276,7 @@ (get_local $0) (get_local $9) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $12) @@ -7302,7 +7302,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $12) @@ -7408,7 +7408,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $15 (get_local $4) @@ -7692,7 +7692,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $18) @@ -7763,7 +7763,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7946,7 +7946,7 @@ (i32.const 1160) ) (block - (call_import $ra + (call $ra (i32.const 1) (get_local $0) ) @@ -7966,13 +7966,13 @@ ) (set_local $9 (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $12) ) ) ) - (call_import $oa + (call $oa (i32.const 0) ) (get_local $9) @@ -7993,7 +7993,7 @@ (get_local $4) ) (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $11) ) @@ -8649,7 +8649,7 @@ (i32.const 0) ) ) - (call_import $pa + (call $pa (i32.const 1188) ) (if @@ -8718,7 +8718,7 @@ (get_local $0) ) ) - (call_import $xa + (call $xa (i32.const 1188) ) (get_local $2) @@ -9018,7 +9018,7 @@ (i32.const 4096) ) (return - (call_import $va + (call $va (get_local $0) (get_local $1) (get_local $2) @@ -9582,7 +9582,7 @@ (if (i32.lt_s (call $Pa - (call_import $ua + (call $ua (i32.const 140) (get_local $3) ) @@ -9653,7 +9653,7 @@ ) ) (if - (call_import $wa + (call $wa (i32.const 54) (get_local $3) ) @@ -9748,7 +9748,7 @@ ) (set_local $0 (call $Pa - (call_import $sa + (call $sa (i32.const 6) (get_local $2) ) @@ -9865,7 +9865,7 @@ ) ) (func $ob (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $ja + (call $ja (i32.const 1) ) (i32.const 0) @@ -9930,7 +9930,7 @@ ) ) (func $nb (param $0 i32) (result i32) - (call_import $ja + (call $ja (i32.const 0) ) (i32.const 0) @@ -9950,7 +9950,7 @@ (nop) ) (func $pb (param $0 i32) - (call_import $ja + (call $ja (i32.const 2) ) ) diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts index 064c1d821..8c5e6f8af 100644 --- a/test/memorygrowth.fromasm.imprecise.no-opts +++ b/test/memorygrowth.fromasm.imprecise.no-opts @@ -299,7 +299,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -325,7 +325,7 @@ ) (br $do-once$2) ) - (call_import $qa) + (call $qa) ) ) ) @@ -578,7 +578,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $n (i32.add @@ -609,7 +609,7 @@ ) (br $do-once$4) ) - (call_import $qa) + (call $qa) ) ) ) @@ -737,7 +737,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $w (get_local $g) @@ -1033,7 +1033,7 @@ (get_local $A) (get_local $s) ) - (call_import $qa) + (call $qa) ) (set_local $g (i32.add @@ -1046,7 +1046,7 @@ (get_local $A) (get_local $g) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.load @@ -1193,7 +1193,7 @@ (get_local $G) (get_local $s) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $G) @@ -1220,7 +1220,7 @@ (get_local $q) (get_local $s) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -1235,7 +1235,7 @@ ) (get_local $A) ) - (call_import $qa) + (call $qa) ) (set_local $f (i32.add @@ -1264,7 +1264,7 @@ ) (br $do-once$8) ) - (call_import $qa) + (call $qa) ) ) ) @@ -1334,7 +1334,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -1379,7 +1379,7 @@ (get_local $C) (get_local $o) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -1404,7 +1404,7 @@ (get_local $s) (get_local $o) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -1442,7 +1442,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -1620,7 +1620,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $H (get_local $f) @@ -2385,7 +2385,7 @@ (get_local $V) (get_local $q) ) - (call_import $qa) + (call $qa) ) (set_local $i (i32.add @@ -2398,7 +2398,7 @@ (get_local $V) (get_local $i) ) - (call_import $qa) + (call $qa) ) (set_local $g (i32.load @@ -2545,7 +2545,7 @@ (get_local $_) (get_local $q) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $_) @@ -2572,7 +2572,7 @@ (get_local $d) (get_local $q) ) - (call_import $qa) + (call $qa) ) (set_local $f (i32.add @@ -2587,7 +2587,7 @@ ) (get_local $V) ) - (call_import $qa) + (call $qa) ) (set_local $t (i32.add @@ -2616,7 +2616,7 @@ ) (br $do-once$21) ) - (call_import $qa) + (call $qa) ) ) ) @@ -2686,7 +2686,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $s (i32.add @@ -2731,7 +2731,7 @@ (get_local $W) (get_local $s) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -2756,7 +2756,7 @@ (get_local $q) (get_local $s) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -2794,7 +2794,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -2966,7 +2966,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $$ (get_local $d) @@ -3317,7 +3317,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $da) @@ -3415,7 +3415,7 @@ ) (br $do-once$29) ) - (call_import $qa) + (call $qa) ) ) ) @@ -3895,7 +3895,7 @@ ) (block (set_local $$ - (call_import $ta + (call $ta (get_local $aa) ) ) @@ -3954,7 +3954,7 @@ ) (block (set_local $U - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -4052,7 +4052,7 @@ ) ) (set_local $$ - (call_import $ta + (call $ta (get_local $la) ) ) @@ -4151,14 +4151,14 @@ ) (if (i32.eq - (call_import $ta + (call $ta (get_local $e) ) (i32.const -1) ) (block (drop - (call_import $ta + (call $ta (get_local $$) ) ) @@ -4235,12 +4235,12 @@ ) (block (set_local $ma - (call_import $ta + (call $ta (get_local $c) ) ) (set_local $c - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -5028,7 +5028,7 @@ (get_local $da) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -5042,7 +5042,7 @@ ) (br $do-once$53) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5088,7 +5088,7 @@ (get_local $V) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.add @@ -5110,7 +5110,7 @@ (br $do-once$55) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5272,7 +5272,7 @@ (get_local $Ca) (get_local $sa) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ca) @@ -5299,7 +5299,7 @@ (get_local $aa) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (set_local $ba (i32.add @@ -5314,7 +5314,7 @@ ) (get_local $ma) ) - (call_import $qa) + (call $qa) ) (set_local $U (i32.add @@ -5343,7 +5343,7 @@ ) (br $do-once$57) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5413,7 +5413,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $V (i32.add @@ -5459,7 +5459,7 @@ (get_local $ya) (get_local $e) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -5487,7 +5487,7 @@ (get_local $V) (get_local $e) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -5529,7 +5529,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -5695,7 +5695,7 @@ (br $do-once$65) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6043,7 +6043,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ja) @@ -6141,7 +6141,7 @@ ) (br $do-once$50) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6548,7 +6548,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $Ma (get_local $ga) @@ -6893,7 +6893,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ra) @@ -6991,7 +6991,7 @@ ) (br $do-once$42) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7149,7 +7149,7 @@ (get_local $b) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $d (i32.load @@ -7170,7 +7170,7 @@ (get_local $a) (i32.const 1) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.and @@ -7224,7 +7224,7 @@ (get_local $h) (get_local $c) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7345,7 +7345,7 @@ (get_local $g) (get_local $c) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -7357,7 +7357,7 @@ ) (get_local $h) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7408,7 +7408,7 @@ (get_local $j) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -7426,7 +7426,7 @@ (set_local $p (get_local $o) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7595,7 +7595,7 @@ (get_local $w) (get_local $c) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $w) @@ -7622,7 +7622,7 @@ (get_local $l) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $q (i32.add @@ -7637,7 +7637,7 @@ ) (get_local $h) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -7666,7 +7666,7 @@ ) (br $do-once$2) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7751,7 +7751,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $j (i32.add @@ -7804,7 +7804,7 @@ (get_local $s) (get_local $j) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -7832,7 +7832,7 @@ (get_local $o) (get_local $j) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -7880,7 +7880,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -7924,7 +7924,7 @@ (get_local $m) (get_local $f) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.add @@ -7944,7 +7944,7 @@ (i32.const 1) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eqz @@ -8115,7 +8115,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -8127,7 +8127,7 @@ ) (get_local $f) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8174,7 +8174,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -8192,7 +8192,7 @@ (set_local $x (get_local $u) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8356,7 +8356,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $C) @@ -8385,7 +8385,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $p (i32.add @@ -8400,7 +8400,7 @@ ) (get_local $f) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -8429,7 +8429,7 @@ ) (br $do-once$10) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8498,7 +8498,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $w (i32.add @@ -8543,7 +8543,7 @@ (get_local $y) (get_local $w) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -8571,7 +8571,7 @@ (get_local $h) (get_local $w) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -8609,7 +8609,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -8779,7 +8779,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $E (get_local $s) @@ -9127,7 +9127,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $J) @@ -9225,7 +9225,7 @@ ) (br $do-once$16) ) - (call_import $qa) + (call $qa) ) ) ) @@ -9433,7 +9433,7 @@ ) (set_local $o (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $e) ) @@ -9441,7 +9441,7 @@ ) ) (block - (call_import $ra + (call $ra (i32.const 1) (get_local $a) ) @@ -9467,13 +9467,13 @@ ) (set_local $l (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $f) ) ) ) - (call_import $oa + (call $oa (i32.const 0) ) (set_local $o @@ -10246,7 +10246,7 @@ ) ) ) - (call_import $pa + (call $pa (i32.const 1188) ) (set_local $c @@ -10349,7 +10349,7 @@ ) ) ) - (call_import $xa + (call $xa (i32.const 1188) ) (set_local $h @@ -10749,7 +10749,7 @@ (i32.const 4096) ) (return - (call_import $va + (call $va (get_local $a) (get_local $b) (get_local $c) @@ -11444,7 +11444,7 @@ (if (i32.lt_s (call $Pa - (call_import $ua + (call $ua (i32.const 140) (get_local $e) ) @@ -11532,7 +11532,7 @@ ) ) (if - (call_import $wa + (call $wa (i32.const 54) (get_local $e) ) @@ -11678,7 +11678,7 @@ ) (set_local $a (call $Pa - (call_import $sa + (call $sa (i32.const 6) (get_local $c) ) @@ -11852,7 +11852,7 @@ ) ) (func $ob (param $a i32) (param $b i32) (param $c i32) (result i32) - (call_import $ja + (call $ja (i32.const 1) ) (return @@ -11925,7 +11925,7 @@ ) ) (func $nb (param $a i32) (result i32) - (call_import $ja + (call $ja (i32.const 0) ) (return @@ -11951,7 +11951,7 @@ (return) ) (func $pb (param $a i32) - (call_import $ja + (call $ja (i32.const 2) ) ) diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts index 0639416ea..4bcafb28b 100644 --- a/test/memorygrowth.fromasm.no-opts +++ b/test/memorygrowth.fromasm.no-opts @@ -300,7 +300,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -326,7 +326,7 @@ ) (br $do-once$2) ) - (call_import $qa) + (call $qa) ) ) ) @@ -579,7 +579,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $n (i32.add @@ -610,7 +610,7 @@ ) (br $do-once$4) ) - (call_import $qa) + (call $qa) ) ) ) @@ -738,7 +738,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $w (get_local $g) @@ -1034,7 +1034,7 @@ (get_local $A) (get_local $s) ) - (call_import $qa) + (call $qa) ) (set_local $g (i32.add @@ -1047,7 +1047,7 @@ (get_local $A) (get_local $g) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.load @@ -1194,7 +1194,7 @@ (get_local $G) (get_local $s) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $G) @@ -1221,7 +1221,7 @@ (get_local $q) (get_local $s) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -1236,7 +1236,7 @@ ) (get_local $A) ) - (call_import $qa) + (call $qa) ) (set_local $f (i32.add @@ -1265,7 +1265,7 @@ ) (br $do-once$8) ) - (call_import $qa) + (call $qa) ) ) ) @@ -1335,7 +1335,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -1380,7 +1380,7 @@ (get_local $C) (get_local $o) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -1405,7 +1405,7 @@ (get_local $s) (get_local $o) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -1443,7 +1443,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -1621,7 +1621,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $H (get_local $f) @@ -2386,7 +2386,7 @@ (get_local $V) (get_local $q) ) - (call_import $qa) + (call $qa) ) (set_local $i (i32.add @@ -2399,7 +2399,7 @@ (get_local $V) (get_local $i) ) - (call_import $qa) + (call $qa) ) (set_local $g (i32.load @@ -2546,7 +2546,7 @@ (get_local $_) (get_local $q) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $_) @@ -2573,7 +2573,7 @@ (get_local $d) (get_local $q) ) - (call_import $qa) + (call $qa) ) (set_local $f (i32.add @@ -2588,7 +2588,7 @@ ) (get_local $V) ) - (call_import $qa) + (call $qa) ) (set_local $t (i32.add @@ -2617,7 +2617,7 @@ ) (br $do-once$21) ) - (call_import $qa) + (call $qa) ) ) ) @@ -2687,7 +2687,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $s (i32.add @@ -2732,7 +2732,7 @@ (get_local $W) (get_local $s) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -2757,7 +2757,7 @@ (get_local $q) (get_local $s) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -2795,7 +2795,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -2967,7 +2967,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $$ (get_local $d) @@ -3318,7 +3318,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $da) @@ -3416,7 +3416,7 @@ ) (br $do-once$29) ) - (call_import $qa) + (call $qa) ) ) ) @@ -3896,7 +3896,7 @@ ) (block (set_local $$ - (call_import $ta + (call $ta (get_local $aa) ) ) @@ -3955,7 +3955,7 @@ ) (block (set_local $U - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -4053,7 +4053,7 @@ ) ) (set_local $$ - (call_import $ta + (call $ta (get_local $la) ) ) @@ -4152,14 +4152,14 @@ ) (if (i32.eq - (call_import $ta + (call $ta (get_local $e) ) (i32.const -1) ) (block (drop - (call_import $ta + (call $ta (get_local $$) ) ) @@ -4236,12 +4236,12 @@ ) (block (set_local $ma - (call_import $ta + (call $ta (get_local $c) ) ) (set_local $c - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -5029,7 +5029,7 @@ (get_local $da) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -5043,7 +5043,7 @@ ) (br $do-once$53) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5089,7 +5089,7 @@ (get_local $V) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.add @@ -5111,7 +5111,7 @@ (br $do-once$55) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5273,7 +5273,7 @@ (get_local $Ca) (get_local $sa) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ca) @@ -5300,7 +5300,7 @@ (get_local $aa) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (set_local $ba (i32.add @@ -5315,7 +5315,7 @@ ) (get_local $ma) ) - (call_import $qa) + (call $qa) ) (set_local $U (i32.add @@ -5344,7 +5344,7 @@ ) (br $do-once$57) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5414,7 +5414,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $V (i32.add @@ -5460,7 +5460,7 @@ (get_local $ya) (get_local $e) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -5488,7 +5488,7 @@ (get_local $V) (get_local $e) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -5530,7 +5530,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -5696,7 +5696,7 @@ (br $do-once$65) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6044,7 +6044,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ja) @@ -6142,7 +6142,7 @@ ) (br $do-once$50) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6549,7 +6549,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $Ma (get_local $ga) @@ -6894,7 +6894,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ra) @@ -6992,7 +6992,7 @@ ) (br $do-once$42) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7150,7 +7150,7 @@ (get_local $b) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $d (i32.load @@ -7171,7 +7171,7 @@ (get_local $a) (i32.const 1) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.and @@ -7225,7 +7225,7 @@ (get_local $h) (get_local $c) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7346,7 +7346,7 @@ (get_local $g) (get_local $c) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -7358,7 +7358,7 @@ ) (get_local $h) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7409,7 +7409,7 @@ (get_local $j) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -7427,7 +7427,7 @@ (set_local $p (get_local $o) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7596,7 +7596,7 @@ (get_local $w) (get_local $c) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $w) @@ -7623,7 +7623,7 @@ (get_local $l) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $q (i32.add @@ -7638,7 +7638,7 @@ ) (get_local $h) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -7667,7 +7667,7 @@ ) (br $do-once$2) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7752,7 +7752,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $j (i32.add @@ -7805,7 +7805,7 @@ (get_local $s) (get_local $j) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -7833,7 +7833,7 @@ (get_local $o) (get_local $j) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -7881,7 +7881,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -7925,7 +7925,7 @@ (get_local $m) (get_local $f) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.add @@ -7945,7 +7945,7 @@ (i32.const 1) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eqz @@ -8116,7 +8116,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -8128,7 +8128,7 @@ ) (get_local $f) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8175,7 +8175,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -8193,7 +8193,7 @@ (set_local $x (get_local $u) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8357,7 +8357,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $C) @@ -8386,7 +8386,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $p (i32.add @@ -8401,7 +8401,7 @@ ) (get_local $f) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -8430,7 +8430,7 @@ ) (br $do-once$10) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8499,7 +8499,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $w (i32.add @@ -8544,7 +8544,7 @@ (get_local $y) (get_local $w) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -8572,7 +8572,7 @@ (get_local $h) (get_local $w) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -8610,7 +8610,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -8780,7 +8780,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $E (get_local $s) @@ -9128,7 +9128,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $J) @@ -9226,7 +9226,7 @@ ) (br $do-once$16) ) - (call_import $qa) + (call $qa) ) ) ) @@ -9434,7 +9434,7 @@ ) (set_local $o (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $e) ) @@ -9442,7 +9442,7 @@ ) ) (block - (call_import $ra + (call $ra (i32.const 1) (get_local $a) ) @@ -9468,13 +9468,13 @@ ) (set_local $l (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $f) ) ) ) - (call_import $oa + (call $oa (i32.const 0) ) (set_local $o @@ -10247,7 +10247,7 @@ ) ) ) - (call_import $pa + (call $pa (i32.const 1188) ) (set_local $c @@ -10350,7 +10350,7 @@ ) ) ) - (call_import $xa + (call $xa (i32.const 1188) ) (set_local $h @@ -10750,7 +10750,7 @@ (i32.const 4096) ) (return - (call_import $va + (call $va (get_local $a) (get_local $b) (get_local $c) @@ -11372,7 +11372,7 @@ (get_local $c) ) (set_local $i - (call_import $i32u-div + (call $i32u-div (get_local $h) (get_local $b) ) @@ -11445,7 +11445,7 @@ (if (i32.lt_s (call $Pa - (call_import $ua + (call $ua (i32.const 140) (get_local $e) ) @@ -11533,7 +11533,7 @@ ) ) (if - (call_import $wa + (call $wa (i32.const 54) (get_local $e) ) @@ -11679,7 +11679,7 @@ ) (set_local $a (call $Pa - (call_import $sa + (call $sa (i32.const 6) (get_local $c) ) @@ -11853,7 +11853,7 @@ ) ) (func $ob (param $a i32) (param $b i32) (param $c i32) (result i32) - (call_import $ja + (call $ja (i32.const 1) ) (return @@ -11926,7 +11926,7 @@ ) ) (func $nb (param $a i32) (result i32) - (call_import $ja + (call $ja (i32.const 0) ) (return @@ -11952,7 +11952,7 @@ (return) ) (func $pb (param $a i32) - (call_import $ja + (call $ja (i32.const 2) ) ) diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt index c49f7fd6f..75a5c8f16 100644 --- a/test/passes/duplicate-function-elimination.txt +++ b/test/passes/duplicate-function-elimination.txt @@ -370,7 +370,7 @@ (import "env" "i" (func $i)) (import "env" "j" (func $i)) (func $erase (type $FUNCSIG$v) - (call_import $i) + (call $i) ) ) (module @@ -379,10 +379,10 @@ (import "env" "i" (func $i)) (import "env" "j" (func $j)) (func $keep2 (type $FUNCSIG$v) - (call_import $i) + (call $i) ) (func $other (type $FUNCSIG$v) - (call_import $j) + (call $j) ) ) (module diff --git a/test/passes/duplicate-function-elimination.wast b/test/passes/duplicate-function-elimination.wast index f72ef542e..959737f40 100644 --- a/test/passes/duplicate-function-elimination.wast +++ b/test/passes/duplicate-function-elimination.wast @@ -439,10 +439,10 @@ (import $i "env" "i") (import $i "env" "j") (func $erase (type $FUNCSIG$v) - (call_import $i) + (call $i) ) (func $other (type $FUNCSIG$v) - (call_import $i) + (call $i) ) ) (module @@ -451,10 +451,10 @@ (import $i "env" "i") (import $j "env" "j") (func $keep2 (type $FUNCSIG$v) - (call_import $i) + (call $i) ) (func $other (type $FUNCSIG$v) - (call_import $j) + (call $j) ) ) (module diff --git a/test/passes/remove-imports.wast b/test/passes/remove-imports.wast index babd60fdc..bae2e2fc6 100644 --- a/test/passes/remove-imports.wast +++ b/test/passes/remove-imports.wast @@ -7,12 +7,12 @@ (import $waka-ret "somewhere" "waka-ret" (result i32)) (import $waka-ret-d "somewhere" "waka-ret-d" (result f64)) (func $nada (type $FUNCSIG$v) - (call_import $waka) + (call $waka) (drop - (call_import $waka-ret) + (call $waka-ret) ) (drop - (call_import $waka-ret-d) + (call $waka-ret-d) ) ) ) diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt index 4b7cd2bb3..498d97d58 100644 --- a/test/passes/simplify-locals.txt +++ b/test/passes/simplify-locals.txt @@ -97,7 +97,7 @@ ) (nop) (nop) - (call_import $waka) + (call $waka) (drop (i32.const 9) ) @@ -145,19 +145,19 @@ (block $block3 (nop) (set_local $a - (call_import $waka_int) + (call $waka_int) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) (drop (i32.load @@ -167,9 +167,9 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) (i32.store (i32.const 1) @@ -178,14 +178,14 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (nop) (set_local $a (i32.load (i32.const 100) ) ) - (call_import $waka) + (call $waka) (nop) (drop (i32.load @@ -197,17 +197,17 @@ (i32.const 101) ) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 102) ) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 103) @@ -220,7 +220,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (nop) (set_local $a (block $block0 @@ -236,7 +236,7 @@ (get_local $5) ) ) - (call_import $waka) + (call $waka) (set_local $a (block $block2 (block $block4 @@ -251,11 +251,11 @@ (get_local $6) ) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block $block5 (block $block6 @@ -278,7 +278,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block $block7 (block $block8 @@ -300,7 +300,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) ) (block $out-of-block (nop) @@ -415,8 +415,8 @@ (nop) (nop) (drop - (call_import $___udivmoddi4 - (call_import $_i64Subtract + (call $___udivmoddi4 + (call $_i64Subtract (i32.xor (tee_local $$1$0 (i32.or @@ -474,7 +474,7 @@ (i32.load (i32.const 168) ) - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (tee_local $$2$0 (i32.or @@ -536,7 +536,7 @@ ) ) (set_local $$10$0 - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (i32.load (get_local $$rem) diff --git a/test/passes/simplify-locals.wast b/test/passes/simplify-locals.wast index b703613d8..4fa345770 100644 --- a/test/passes/simplify-locals.wast +++ b/test/passes/simplify-locals.wast @@ -125,7 +125,7 @@ (set_local $b (i32.const 10) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) @@ -180,22 +180,22 @@ ) (block $block3 (set_local $a - (call_import $waka_int) + (call $waka_int) ) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) (drop (i32.load @@ -205,9 +205,9 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) (i32.store (i32.const 1) @@ -216,7 +216,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 100) @@ -225,7 +225,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 101) @@ -239,17 +239,17 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 102) ) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 103) @@ -262,7 +262,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block (block @@ -280,7 +280,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block (block @@ -295,11 +295,11 @@ (get_local $6) ) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block (block @@ -322,7 +322,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block (block @@ -344,7 +344,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) ) (block $out-of-block (set_local $a @@ -550,7 +550,7 @@ ) ) (set_local $$4$0 - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (get_local $$1$0) (get_local $$a$0) @@ -569,10 +569,10 @@ ) ) (drop - (call_import $___udivmoddi4 + (call $___udivmoddi4 (get_local $$4$0) (get_local $$4$1) - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (get_local $$2$0) (get_local $$b$0) @@ -591,7 +591,7 @@ ) ) (set_local $$10$0 - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (i32.load (get_local $$rem) diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt index 04a04efc0..b7339ed20 100644 --- a/test/passes/vacuum.txt +++ b/test/passes/vacuum.txt @@ -148,7 +148,7 @@ (if (i32.const 0) (drop - (call_import $int) + (call $int) ) (br $out) ) @@ -156,25 +156,25 @@ (i32.const 1) (br $out) (drop - (call_import $int) + (call $int) ) ) ) ) (func $drop-silly (type $0) (drop - (call_import $int) + (call $int) ) (drop - (call_import $int) + (call $int) ) (drop - (call_import $int) + (call $int) ) (drop (i32.add - (call_import $int) - (call_import $int) + (call $int) + (call $int) ) ) ) diff --git a/test/passes/vacuum.wast b/test/passes/vacuum.wast index 84f3eeb6f..ecc176385 100644 --- a/test/passes/vacuum.wast +++ b/test/passes/vacuum.wast @@ -303,14 +303,14 @@ (block $out (drop (if (i32.const 0) - (call_import $int) + (call $int) (br $out) ) ) (drop (if (i32.const 1) (br $out) - (call_import $int) + (call $int) ) ) ) @@ -326,7 +326,7 @@ (drop (i32.eqz (i32.eqz - (call_import $int) + (call $int) ) ) ) @@ -339,19 +339,19 @@ (drop (i32.add (i32.const 4) - (call_import $int) + (call $int) ) ) (drop (i32.add - (call_import $int) + (call $int) (i32.const 5) ) ) (drop (i32.add - (call_import $int) - (call_import $int) + (call $int) + (call $int) ) ) ) diff --git a/test/two_sides.fromasm b/test/two_sides.fromasm index 6d8e2a14b..9ddb1a9ac 100644 --- a/test/two_sides.fromasm +++ b/test/two_sides.fromasm @@ -12,7 +12,7 @@ (local $5 f64) (if (get_local $4) - (call_import $f64-to-int + (call $f64-to-int (f64.mul (f64.add (f64.convert_s/i32 @@ -35,7 +35,7 @@ ) ) ) - (call_import $f64-to-int + (call $f64-to-int (f64.mul (f64.add (f64.convert_s/i32 diff --git a/test/two_sides.fromasm.no-opts b/test/two_sides.fromasm.no-opts index 1011976b6..56c2062cf 100644 --- a/test/two_sides.fromasm.no-opts +++ b/test/two_sides.fromasm.no-opts @@ -39,7 +39,7 @@ ) ) (set_local $i5 - (call_import $f64-to-int + (call $f64-to-int (get_local $d6) ) ) @@ -73,7 +73,7 @@ ) ) (set_local $i5 - (call_import $f64-to-int + (call $f64-to-int (get_local $d6) ) ) diff --git a/test/unit.fromasm b/test/unit.fromasm index 6dd442a36..daa696a0c 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -108,12 +108,12 @@ (local $1 f32) (local $2 i32) (drop - (call_import $f64-to-int + (call $f64-to-int (get_local $0) ) ) (set_local $2 - (call_import $f64-to-int + (call $f64-to-int (f64.promote/f32 (get_local $1) ) @@ -197,7 +197,7 @@ (br $label$break$L1) ) ) - (call_import $h + (call $h (i32.const 120) ) (br $label$continue$L1) @@ -206,14 +206,14 @@ (i32.const 0) ) (func $frem (result f64) - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) ) (func $big_uint_div_u (result i32) (i32.and - (call_import $i32u-div + (call $i32u-div (i32.const -1) (i32.const 2) ) @@ -297,7 +297,7 @@ (i32.const 200) ) (block - (call_import $h + (call $h (get_local $0) ) (set_local $0 @@ -316,29 +316,29 @@ ) (func $aborts (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 55) ) ) ) (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.const 12.34) ) ) (drop - (call_import $abort + (call $abort (f64.promote/f32 (f32.const 56.779998779296875) ) @@ -347,18 +347,18 @@ ) (func $continues (loop $while-in$1 - (call_import $print + (call $print (i32.const 1) ) (loop $unlikely-continue$3 - (call_import $print + (call $print (i32.const 5) ) (br_if $unlikely-continue$3 (i32.const 0) ) ) - (call_import $print + (call $print (i32.const 2) ) (br $while-in$1) @@ -522,12 +522,12 @@ (call $phi) ) (drop - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) (call $zeroInit - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) @@ -593,7 +593,7 @@ (if (i32.const 1) (i32.trunc_s/f64 - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 5) ) @@ -605,7 +605,7 @@ (drop (if (i32.const 3) - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 7) ) @@ -714,7 +714,7 @@ (if (i32.const 1) (drop - (call_import $return_int) + (call $return_int) ) ) ) @@ -790,7 +790,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 0) ) (br $jumpthreading$inner$0) @@ -798,11 +798,11 @@ ) (br $jumpthreading$outer$0) ) - (call_import $h + (call $h (i32.const 1) ) ) - (call_import $h + (call $h (i32.const -1) ) (block $jumpthreading$inner$1 @@ -817,16 +817,16 @@ ) ) ) - (call_import $h + (call $h (i32.const 2) ) (br $jumpthreading$inner$1) ) ) - (call_import $h + (call $h (i32.const 3) ) - (call_import $h + (call $h (i32.const -2) ) (block $jumpthreading$outer$3 @@ -835,7 +835,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 4) ) (br_if $jumpthreading$inner$2 @@ -849,16 +849,16 @@ ) (br $jumpthreading$outer$3) ) - (call_import $h + (call $h (i32.const 5) ) (br $jumpthreading$outer$3) ) - (call_import $h + (call $h (i32.const 6) ) ) - (call_import $h + (call $h (i32.const -3) ) (block $jumpthreading$outer$5 @@ -867,7 +867,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 7) ) (br_if $jumpthreading$inner$4 @@ -881,7 +881,7 @@ ) (br $jumpthreading$outer$5) ) - (call_import $h + (call $h (i32.const 8) ) (br_if $jumpthreading$inner$5 @@ -892,11 +892,11 @@ ) (br $jumpthreading$outer$5) ) - (call_import $h + (call $h (i32.const 9) ) ) - (call_import $h + (call $h (i32.const -4) ) (block $jumpthreading$outer$6 @@ -904,7 +904,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 10) ) (br $jumpthreading$inner$6) @@ -912,11 +912,11 @@ ) (br $jumpthreading$outer$6) ) - (call_import $h + (call $h (i32.const 11) ) ) - (call_import $h + (call $h (i32.const -5) ) (block $jumpthreading$outer$8 @@ -926,7 +926,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 12) ) (br_if $jumpthreading$inner$7 @@ -940,7 +940,7 @@ ) (br $jumpthreading$outer$8) ) - (call_import $h + (call $h (i32.const 13) ) (br_if $jumpthreading$inner$8 @@ -949,11 +949,11 @@ ) (br $jumpthreading$outer$8) ) - (call_import $h + (call $h (i32.const 14) ) ) - (call_import $h + (call $h (i32.const -6) ) (get_local $0) @@ -1012,7 +1012,7 @@ (func $jumpThreadDrop (result i32) (local $0 i32) (set_local $0 - (call_import $return_int) + (call $return_int) ) (block $jumpthreading$outer$2 ) diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index d007a4d82..5cd06cda0 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -184,7 +184,7 @@ (br $label$break$L1) ) ) - (call_import $h + (call $h (i32.const 120) ) (br $label$continue$L1) @@ -193,7 +193,7 @@ (i32.const 0) ) (func $frem (result f64) - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) @@ -278,7 +278,7 @@ (i32.const 200) ) (block - (call_import $h + (call $h (get_local $0) ) (set_local $0 @@ -297,29 +297,29 @@ ) (func $aborts (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 55) ) ) ) (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.const 12.34) ) ) (drop - (call_import $abort + (call $abort (f64.promote/f32 (f32.const 56.779998779296875) ) @@ -328,18 +328,18 @@ ) (func $continues (loop $while-in$1 - (call_import $print + (call $print (i32.const 1) ) (loop $unlikely-continue$3 - (call_import $print + (call $print (i32.const 5) ) (br_if $unlikely-continue$3 (i32.const 0) ) ) - (call_import $print + (call $print (i32.const 2) ) (br $while-in$1) @@ -503,12 +503,12 @@ (call $phi) ) (drop - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) (call $zeroInit - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) @@ -574,7 +574,7 @@ (if (i32.const 1) (i32.trunc_s/f64 - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 5) ) @@ -586,7 +586,7 @@ (drop (if (i32.const 3) - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 7) ) @@ -695,7 +695,7 @@ (if (i32.const 1) (drop - (call_import $return_int) + (call $return_int) ) ) ) @@ -771,7 +771,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 0) ) (br $jumpthreading$inner$0) @@ -779,11 +779,11 @@ ) (br $jumpthreading$outer$0) ) - (call_import $h + (call $h (i32.const 1) ) ) - (call_import $h + (call $h (i32.const -1) ) (block $jumpthreading$inner$1 @@ -798,16 +798,16 @@ ) ) ) - (call_import $h + (call $h (i32.const 2) ) (br $jumpthreading$inner$1) ) ) - (call_import $h + (call $h (i32.const 3) ) - (call_import $h + (call $h (i32.const -2) ) (block $jumpthreading$outer$3 @@ -816,7 +816,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 4) ) (br_if $jumpthreading$inner$2 @@ -830,16 +830,16 @@ ) (br $jumpthreading$outer$3) ) - (call_import $h + (call $h (i32.const 5) ) (br $jumpthreading$outer$3) ) - (call_import $h + (call $h (i32.const 6) ) ) - (call_import $h + (call $h (i32.const -3) ) (block $jumpthreading$outer$5 @@ -848,7 +848,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 7) ) (br_if $jumpthreading$inner$4 @@ -862,7 +862,7 @@ ) (br $jumpthreading$outer$5) ) - (call_import $h + (call $h (i32.const 8) ) (br_if $jumpthreading$inner$5 @@ -873,11 +873,11 @@ ) (br $jumpthreading$outer$5) ) - (call_import $h + (call $h (i32.const 9) ) ) - (call_import $h + (call $h (i32.const -4) ) (block $jumpthreading$outer$6 @@ -885,7 +885,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 10) ) (br $jumpthreading$inner$6) @@ -893,11 +893,11 @@ ) (br $jumpthreading$outer$6) ) - (call_import $h + (call $h (i32.const 11) ) ) - (call_import $h + (call $h (i32.const -5) ) (block $jumpthreading$outer$8 @@ -907,7 +907,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 12) ) (br_if $jumpthreading$inner$7 @@ -921,7 +921,7 @@ ) (br $jumpthreading$outer$8) ) - (call_import $h + (call $h (i32.const 13) ) (br_if $jumpthreading$inner$8 @@ -930,11 +930,11 @@ ) (br $jumpthreading$outer$8) ) - (call_import $h + (call $h (i32.const 14) ) ) - (call_import $h + (call $h (i32.const -6) ) (get_local $0) @@ -993,7 +993,7 @@ (func $jumpThreadDrop (result i32) (local $0 i32) (set_local $0 - (call_import $return_int) + (call $return_int) ) (block $jumpthreading$outer$2 ) diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts index 1e8b46835..ed7ec429f 100644 --- a/test/unit.fromasm.imprecise.no-opts +++ b/test/unit.fromasm.imprecise.no-opts @@ -313,7 +313,7 @@ (br $label$continue$L3) ) ) - (call_import $h + (call $h (i32.const 120) ) (br $label$continue$L1) @@ -330,7 +330,7 @@ ) (func $frem (result f64) (return - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) @@ -512,7 +512,7 @@ ) (br $for-out$0) ) - (call_import $h + (call $h (get_local $i) ) (set_local $i @@ -547,29 +547,29 @@ ) (func $aborts (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 55) ) ) ) (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.const 12.34) ) ) (drop - (call_import $abort + (call $abort (f64.promote/f32 (f32.const 56.779998779296875) ) @@ -579,12 +579,12 @@ (func $continues (loop $while-in$1 (block $while-out$0 - (call_import $print + (call $print (i32.const 1) ) (block $do-once$2 (loop $unlikely-continue$3 - (call_import $print + (call $print (i32.const 5) ) (if @@ -593,7 +593,7 @@ ) ) ) - (call_import $print + (call $print (i32.const 2) ) (br $while-in$1) @@ -873,12 +873,12 @@ (call $phi) ) (drop - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) (call $zeroInit - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) @@ -985,7 +985,7 @@ (if (i32.const 1) (i32.trunc_s/f64 - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 5) ) @@ -997,7 +997,7 @@ (set_local $y (if (i32.const 3) - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 7) ) @@ -1149,7 +1149,7 @@ (if (i32.const 1) (drop - (call_import $return_int) + (call $return_int) ) ) ) @@ -1255,7 +1255,7 @@ (if (get_local $x) (block - (call_import $h + (call $h (i32.const 0) ) (set_local $label @@ -1268,11 +1268,11 @@ (get_local $label) (i32.const 1) ) - (call_import $h + (call $h (i32.const 1) ) ) - (call_import $h + (call $h (i32.const -1) ) (loop $while-in$1 @@ -1286,7 +1286,7 @@ (if (get_local $x) (block - (call_import $h + (call $h (i32.const 2) ) (set_local $label @@ -1303,17 +1303,17 @@ (get_local $label) (i32.const 2) ) - (call_import $h + (call $h (i32.const 3) ) ) - (call_import $h + (call $h (i32.const -2) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 4) ) (if @@ -1335,7 +1335,7 @@ (get_local $label) (i32.const 3) ) - (call_import $h + (call $h (i32.const 5) ) (if @@ -1343,18 +1343,18 @@ (get_local $label) (i32.const 4) ) - (call_import $h + (call $h (i32.const 6) ) ) ) - (call_import $h + (call $h (i32.const -3) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 7) ) (if @@ -1377,7 +1377,7 @@ (i32.const 5) ) (block - (call_import $h + (call $h (i32.const 8) ) (if @@ -1396,17 +1396,17 @@ (get_local $label) (i32.const 6) ) - (call_import $h + (call $h (i32.const 9) ) ) - (call_import $h + (call $h (i32.const -4) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 10) ) (set_local $label @@ -1421,20 +1421,20 @@ (i32.const 7) ) (block - (call_import $h + (call $h (i32.const 11) ) (br $label$break$L1) ) ) ) - (call_import $h + (call $h (i32.const -5) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 12) ) (if @@ -1457,7 +1457,7 @@ (i32.const 8) ) (block - (call_import $h + (call $h (i32.const 13) ) (if @@ -1475,14 +1475,14 @@ (i32.const 9) ) (block - (call_import $h + (call $h (i32.const 14) ) (br $label$break$L1) ) ) ) - (call_import $h + (call $h (i32.const -6) ) (return @@ -1583,7 +1583,7 @@ (local $label i32) (local $temp i32) (set_local $temp - (call_import $return_int) + (call $return_int) ) (loop $while-in$1 (block $while-out$0 @@ -1606,7 +1606,7 @@ (i32.const 12) ) (drop - (call_import $return_int) + (call $return_int) ) (if (i32.eq diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts index 846ef21a0..faaa013e9 100644 --- a/test/unit.fromasm.no-opts +++ b/test/unit.fromasm.no-opts @@ -158,12 +158,12 @@ (local $d f64) (local $f f32) (set_local $i - (call_import $f64-to-int + (call $f64-to-int (get_local $d) ) ) (set_local $i - (call_import $f64-to-int + (call $f64-to-int (f64.promote/f32 (get_local $f) ) @@ -319,7 +319,7 @@ (br $label$continue$L3) ) ) - (call_import $h + (call $h (i32.const 120) ) (br $label$continue$L1) @@ -336,7 +336,7 @@ ) (func $frem (result f64) (return - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) @@ -346,7 +346,7 @@ (local $x i32) (set_local $x (i32.and - (call_import $i32u-div + (call $i32u-div (i32.const -1) (i32.const 2) ) @@ -518,7 +518,7 @@ ) (br $for-out$0) ) - (call_import $h + (call $h (get_local $i) ) (set_local $i @@ -553,29 +553,29 @@ ) (func $aborts (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 55) ) ) ) (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.const 12.34) ) ) (drop - (call_import $abort + (call $abort (f64.promote/f32 (f32.const 56.779998779296875) ) @@ -585,12 +585,12 @@ (func $continues (loop $while-in$1 (block $while-out$0 - (call_import $print + (call $print (i32.const 1) ) (block $do-once$2 (loop $unlikely-continue$3 - (call_import $print + (call $print (i32.const 5) ) (if @@ -599,7 +599,7 @@ ) ) ) - (call_import $print + (call $print (i32.const 2) ) (br $while-in$1) @@ -879,12 +879,12 @@ (call $phi) ) (drop - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) (call $zeroInit - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) @@ -991,7 +991,7 @@ (if (i32.const 1) (i32.trunc_s/f64 - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 5) ) @@ -1003,7 +1003,7 @@ (set_local $y (if (i32.const 3) - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 7) ) @@ -1155,7 +1155,7 @@ (if (i32.const 1) (drop - (call_import $return_int) + (call $return_int) ) ) ) @@ -1261,7 +1261,7 @@ (if (get_local $x) (block - (call_import $h + (call $h (i32.const 0) ) (set_local $label @@ -1274,11 +1274,11 @@ (get_local $label) (i32.const 1) ) - (call_import $h + (call $h (i32.const 1) ) ) - (call_import $h + (call $h (i32.const -1) ) (loop $while-in$1 @@ -1292,7 +1292,7 @@ (if (get_local $x) (block - (call_import $h + (call $h (i32.const 2) ) (set_local $label @@ -1309,17 +1309,17 @@ (get_local $label) (i32.const 2) ) - (call_import $h + (call $h (i32.const 3) ) ) - (call_import $h + (call $h (i32.const -2) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 4) ) (if @@ -1341,7 +1341,7 @@ (get_local $label) (i32.const 3) ) - (call_import $h + (call $h (i32.const 5) ) (if @@ -1349,18 +1349,18 @@ (get_local $label) (i32.const 4) ) - (call_import $h + (call $h (i32.const 6) ) ) ) - (call_import $h + (call $h (i32.const -3) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 7) ) (if @@ -1383,7 +1383,7 @@ (i32.const 5) ) (block - (call_import $h + (call $h (i32.const 8) ) (if @@ -1402,17 +1402,17 @@ (get_local $label) (i32.const 6) ) - (call_import $h + (call $h (i32.const 9) ) ) - (call_import $h + (call $h (i32.const -4) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 10) ) (set_local $label @@ -1427,20 +1427,20 @@ (i32.const 7) ) (block - (call_import $h + (call $h (i32.const 11) ) (br $label$break$L1) ) ) ) - (call_import $h + (call $h (i32.const -5) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 12) ) (if @@ -1463,7 +1463,7 @@ (i32.const 8) ) (block - (call_import $h + (call $h (i32.const 13) ) (if @@ -1481,14 +1481,14 @@ (i32.const 9) ) (block - (call_import $h + (call $h (i32.const 14) ) (br $label$break$L1) ) ) ) - (call_import $h + (call $h (i32.const -6) ) (return @@ -1589,7 +1589,7 @@ (local $label i32) (local $temp i32) (set_local $temp - (call_import $return_int) + (call $return_int) ) (loop $while-in$1 (block $while-out$0 @@ -1612,7 +1612,7 @@ (i32.const 12) ) (drop - (call_import $return_int) + (call $return_int) ) (if (i32.eq diff --git a/test/unit.wast b/test/unit.wast index 2df02df44..afa376035 100644 --- a/test/unit.wast +++ b/test/unit.wast @@ -154,7 +154,7 @@ (local $d f64) (block $block0 (set_local $i - (call_import $f64-to-int + (call $f64-to-int (get_local $d) ) ) @@ -284,7 +284,7 @@ ) ) (func $frem (type $4) (result f64) - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary index 4a311f41a..8423c4740 100644 --- a/test/unit.wast.fromBinary +++ b/test/unit.wast.fromBinary @@ -166,7 +166,7 @@ (local $var$1 f64) (block $label$0 (set_local $var$0 - (call_import $import$1 + (call $import$1 (get_local $var$1) ) ) @@ -292,7 +292,7 @@ ) ) (func $frem (type $4) (result f64) - (call_import $import$2 + (call $import$2 (f64.const 5.5) (f64.const 1.2) ) |