From 7e3917884152eda021cff9107b5f789aee92fb1b Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Fri, 12 Aug 2016 11:57:12 -0700 Subject: support expressions in segment offsets --- src/binaryen-c.cpp | 8 ++++---- src/binaryen-c.h | 2 +- src/passes/Print.cpp | 11 ++++++----- src/shared-constants.h | 1 + src/shell-interface.h | 5 +++-- src/wasm-binary.h | 20 +++++++++++++------- src/wasm-interpreter.h | 6 +++--- src/wasm-js.cpp | 2 +- src/wasm-linker.cpp | 2 +- src/wasm-linker.h | 4 ++-- src/wasm-s-parser.h | 32 +++++++++++++++++++++++++++----- src/wasm-validator.h | 6 ------ src/wasm.cpp | 1 + src/wasm.h | 6 +++--- 14 files changed, 66 insertions(+), 40 deletions(-) (limited to 'src') diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp index b7fc4347a..b0e241ab3 100644 --- a/src/binaryen-c.cpp +++ b/src/binaryen-c.cpp @@ -736,7 +736,7 @@ void BinaryenSetFunctionTable(BinaryenModuleRef module, BinaryenFunctionRef* fun // Memory. One per module -void BinaryenSetMemory(BinaryenModuleRef module, BinaryenIndex initial, BinaryenIndex maximum, const char* exportName, const char **segments, BinaryenIndex* segmentOffsets, BinaryenIndex* segmentSizes, BinaryenIndex numSegments) { +void BinaryenSetMemory(BinaryenModuleRef module, BinaryenIndex initial, BinaryenIndex maximum, const char* exportName, const char **segments, BinaryenExpressionRef* segmentOffsets, BinaryenIndex* segmentSizes, BinaryenIndex numSegments) { if (tracing) { std::cout << " {\n"; for (BinaryenIndex i = 0; i < numSegments; i++) { @@ -754,10 +754,10 @@ void BinaryenSetMemory(BinaryenModuleRef module, BinaryenIndex initial, Binaryen } if (numSegments == 0) std::cout << "0"; // ensure the array is not empty, otherwise a compiler error on VS std::cout << " };\n"; - std::cout << " BinaryenIndex segmentOffsets[] = { "; + std::cout << " BinaryenExpressionRef segmentOffsets[] = { "; for (BinaryenIndex i = 0; i < numSegments; i++) { if (i > 0) std::cout << ", "; - std::cout << segmentOffsets[i]; + std::cout << "expressions[" << expressions[segmentOffsets[i]] << "]"; } if (numSegments == 0) std::cout << "0"; // ensure the array is not empty, otherwise a compiler error on VS std::cout << " };\n"; @@ -779,7 +779,7 @@ void BinaryenSetMemory(BinaryenModuleRef module, BinaryenIndex initial, Binaryen wasm->memory.max = maximum; if (exportName) wasm->memory.exportName = exportName; for (BinaryenIndex i = 0; i < numSegments; i++) { - wasm->memory.segments.emplace_back(segmentOffsets[i], segments[i], segmentSizes[i]); + wasm->memory.segments.emplace_back((Expression*)segmentOffsets[i], segments[i], segmentSizes[i]); } } diff --git a/src/binaryen-c.h b/src/binaryen-c.h index b32fa566a..e2086072b 100644 --- a/src/binaryen-c.h +++ b/src/binaryen-c.h @@ -346,7 +346,7 @@ void BinaryenSetFunctionTable(BinaryenModuleRef module, BinaryenFunctionRef* fun // Each segment has data in segments, a start offset in segmentOffsets, and a size in segmentSizes. // exportName can be NULL -void BinaryenSetMemory(BinaryenModuleRef module, BinaryenIndex initial, BinaryenIndex maximum, const char* exportName, const char **segments, BinaryenIndex* segmentOffsets, BinaryenIndex* segmentSizes, BinaryenIndex numSegments); +void BinaryenSetMemory(BinaryenModuleRef module, BinaryenIndex initial, BinaryenIndex maximum, const char* exportName, const char **segments, BinaryenExpressionRef* segmentOffsets, BinaryenIndex* segmentSizes, BinaryenIndex numSegments); // Start function. One per module diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp index 47e503fa4..eb97eead5 100644 --- a/src/passes/Print.cpp +++ b/src/passes/Print.cpp @@ -589,9 +589,12 @@ struct PrintSExpression : public Visitor { doIndent(o, indent); printOpening(o, "memory") << ' ' << curr->memory.initial; if (curr->memory.max && curr->memory.max != Memory::kMaxSize) o << ' ' << curr->memory.max; + o << ")\n"; for (auto segment : curr->memory.segments) { - o << maybeNewLine; - o << (minify ? "" : " ") << "(segment " << segment.offset << " \""; + doIndent(o, indent); + printOpening(o, "data ", true); + visit(segment.offset); + o << " \""; for (size_t i = 0; i < segment.data.size(); i++) { unsigned char c = segment.data[i]; switch (c) { @@ -612,10 +615,8 @@ struct PrintSExpression : public Visitor { } } } - o << "\")"; + o << "\")\n"; } - o << ((curr->memory.segments.size() > 0 && !minify) ? "\n " : "") << ')'; - o << maybeNewLine; if (curr->memory.exportName.is()) { doIndent(o, indent); printOpening(o, "export "); diff --git a/src/shared-constants.h b/src/shared-constants.h index fb94ff11b..8599d8144 100644 --- a/src/shared-constants.h +++ b/src/shared-constants.h @@ -24,6 +24,7 @@ extern Name GROW_WASM_MEMORY, PARAM, RESULT, MEMORY, + DATA, SEGMENT, EXPORT, IMPORT, diff --git a/src/shell-interface.h b/src/shell-interface.h index f6c12e8ca..55f9b2a0b 100644 --- a/src/shell-interface.h +++ b/src/shell-interface.h @@ -92,9 +92,10 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface { memory.resize(wasm.memory.initial * wasm::Memory::kPageSize); // apply memory segments for (auto& segment : wasm.memory.segments) { - assert(segment.offset + segment.data.size() <= wasm.memory.initial * wasm::Memory::kPageSize); + Address offset = ConstantExpressionRunner().visit(segment.offset).value.geti32(); + assert(offset + segment.data.size() <= wasm.memory.initial * wasm::Memory::kPageSize); for (size_t i = 0; i != segment.data.size(); ++i) { - memory.set(segment.offset + i, segment.data[i]); + memory.set(offset + i, segment.data[i]); } } } diff --git a/src/wasm-binary.h b/src/wasm-binary.h index aad142d44..b67a79c3d 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -706,7 +706,8 @@ public: o << U32LEB(num); for (auto& segment : wasm->memory.segments) { if (segment.data.size() == 0) continue; - o << U32LEB(segment.offset); + writeExpression(segment.offset); + o << int8_t(BinaryConsts::End); writeInlineBuffer(&segment.data[0], segment.data.size()); } finishSection(start); @@ -1572,6 +1573,15 @@ public: } } + Expression* readExpression() { + assert(depth == 0); + processExpressions(); + assert(expressionStack.size() == 1); + auto* ret = popExpression(); + assert(depth == 0); + return ret; + } + void readGlobals() { if (debug) std::cerr << "== readGlobals" << std::endl; size_t num = getU32LEB(); @@ -1580,11 +1590,7 @@ public: if (debug) std::cerr << "read one" << std::endl; auto curr = new Global; curr->type = getWasmType(); - assert(depth == 0); - processExpressions(); - assert(expressionStack.size() == 1); - curr->init = popExpression(); - assert(depth == 0); + curr->init = readExpression(); wasm.addGlobal(curr); } } @@ -1649,7 +1655,7 @@ public: auto num = getU32LEB(); for (size_t i = 0; i < num; i++) { Memory::Segment curr; - auto offset = getU32LEB(); + auto offset = readExpression(); auto size = getU32LEB(); std::vector buffer; buffer.resize(size); diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h index fcf03c591..0be36a677 100644 --- a/src/wasm-interpreter.h +++ b/src/wasm-interpreter.h @@ -497,8 +497,8 @@ public: } }; -// Execute an expression in global init -class GlobalInitRunner : public ExpressionRunner { +// Execute an constant expression in a global init or memory offset +class ConstantExpressionRunner : public ExpressionRunner { public: Flow visitLoop(Loop* curr) { WASM_UNREACHABLE(); } Flow visitCall(Call* curr) { WASM_UNREACHABLE(); } @@ -547,7 +547,7 @@ public: ModuleInstance(Module& wasm, ExternalInterface* externalInterface) : wasm(wasm), externalInterface(externalInterface) { memorySize = wasm.memory.initial; for (Index i = 0; i < wasm.globals.size(); i++) { - globals.push_back(GlobalInitRunner().visit(wasm.globals[i]->init).value); + globals.push_back(ConstantExpressionRunner().visit(wasm.globals[i]->init).value); } externalInterface->init(wasm); if (wasm.start.is()) { diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp index 33b0faa55..2aacd94d4 100644 --- a/src/wasm-js.cpp +++ b/src/wasm-js.cpp @@ -193,7 +193,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() { var source = Module['HEAP8'].subarray($1, $1 + $2); var target = new Int8Array(Module['outside']['newBuffer']); target.set(source, $0); - }, (uint32_t)segment.offset, &segment.data[0], segment.data.size()); + }, ConstantExpressionRunner().visit(segment.offset).value.geti32(), &segment.data[0], segment.data.size()); } } diff --git a/src/wasm-linker.cpp b/src/wasm-linker.cpp index d8bae7558..1f06c6ec2 100644 --- a/src/wasm-linker.cpp +++ b/src/wasm-linker.cpp @@ -83,7 +83,7 @@ void Linker::layout() { // Update the segments with their addresses now that they have been allocated. for (const auto& seg : out.segments) { Address address = staticAddresses[seg.first]; - out.wasm.memory.segments[seg.second].offset = address; + out.wasm.memory.segments[seg.second].offset = out.wasm.allocator.alloc()->set(Literal(uint32_t(address))); segmentsByAddress[address] = seg.second; } diff --git a/src/wasm-linker.h b/src/wasm-linker.h index 3f1e8c7ac..bf76a8f94 100644 --- a/src/wasm-linker.h +++ b/src/wasm-linker.h @@ -114,12 +114,12 @@ class LinkerObject { // Add an initializer segment for the named static variable. void addSegment(Name name, const char* data, Address size) { segments[name] = wasm.memory.segments.size(); - wasm.memory.segments.emplace_back(0, data, size); + wasm.memory.segments.emplace_back(wasm.allocator.alloc()->set(Literal(uint32_t(0))), data, size); } void addSegment(Name name, std::vector& data) { segments[name] = wasm.memory.segments.size(); - wasm.memory.segments.emplace_back(0, data); + wasm.memory.segments.emplace_back(wasm.allocator.alloc()->set(Literal(uint32_t(0))), data); } void addInitializerFunction(Name name) { diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index 750d485fb..87217cd20 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -367,13 +367,14 @@ private: if (id == START) return parseStart(curr); if (id == FUNC) return parseFunction(curr); if (id == MEMORY) return parseMemory(curr); + if (id == DATA) return parseData(curr); if (id == EXPORT) return parseExport(curr); if (id == IMPORT) return; // already done if (id == GLOBAL) return parseGlobal(curr); if (id == TABLE) return parseTable(curr); if (id == TYPE) return; // already done std::cerr << "bad module element " << id.str << '\n'; - throw ParseException("unknown module element"); + throw ParseException("unknown module element", curr.line, curr.col); } // function parsing state @@ -1321,19 +1322,40 @@ private: } while (i < s.size()) { Element& curr = *s[i]; - assert(curr[0]->str() == SEGMENT); - const char *input = curr[2]->c_str(); + size_t j = 1; + Address offsetValue; + if (curr[0]->str() == DATA) { + offsetValue = 0; + } else { + offsetValue = atoi(curr[j++]->c_str()); + } + const char *input = curr[j]->c_str(); + auto* offset = allocator.alloc(); + offset->type = i32; + offset->value = Literal(int32_t(offsetValue)); if (auto size = strlen(input)) { std::vector data; stringToBinary(input, size, data); - wasm.memory.segments.emplace_back(atoi(curr[1]->c_str()), data.data(), data.size()); + wasm.memory.segments.emplace_back(offset, data.data(), data.size()); } else { - wasm.memory.segments.emplace_back(atoi(curr[1]->c_str()), "", 0); + wasm.memory.segments.emplace_back(offset, "", 0); } i++; } } + void parseData(Element& s) { + auto* offset = parseExpression(s[1]); + const char *input = s[2]->c_str(); + if (auto size = strlen(input)) { + std::vector data; + stringToBinary(input, size, data); + wasm.memory.segments.emplace_back(offset, data.data(), data.size()); + } else { + wasm.memory.segments.emplace_back(offset, "", 0); + } + } + void parseExport(Element& s) { if (!s[2]->dollared() && !std::isdigit(s[2]->str()[0])) { assert(s[2]->str() == MEMORY); diff --git a/src/wasm-validator.h b/src/wasm-validator.h index 90930d8f4..3d9a0e1c3 100644 --- a/src/wasm-validator.h +++ b/src/wasm-validator.h @@ -281,12 +281,6 @@ public: void visitMemory(Memory *curr) { shouldBeFalse(curr->initial > curr->max, "memory", "memory max >= initial"); shouldBeTrue(curr->max <= Memory::kMaxSize, "memory", "max memory must be <= 4GB"); - size_t top = 0; - for (auto& segment : curr->segments) { - shouldBeFalse(segment.offset < top, "memory", "segment offset is small enough"); - top = segment.offset + segment.data.size(); - } - shouldBeFalse(top > curr->initial * Memory::kPageSize, "memory", "total segments must be small enough"); } void visitModule(Module *curr) { // exports diff --git a/src/wasm.cpp b/src/wasm.cpp index dbbd209b4..2138ec34d 100644 --- a/src/wasm.cpp +++ b/src/wasm.cpp @@ -49,6 +49,7 @@ Name GROW_WASM_MEMORY("__growWasmMemory"), PARAM("param"), RESULT("result"), MEMORY("memory"), + DATA("data"), SEGMENT("segment"), EXPORT("export"), IMPORT("import"), diff --git a/src/wasm.h b/src/wasm.h index 38a030e1a..c0129cf23 100644 --- a/src/wasm.h +++ b/src/wasm.h @@ -1441,14 +1441,14 @@ public: static const Address::address_t kMaxSize = ~Address::address_t(0) / kPageSize; static const Address::address_t kPageMask = ~(kPageSize - 1); struct Segment { - Address offset; + Expression* offset; std::vector data; // TODO: optimize Segment() {} - Segment(Address offset, const char *init, Address size) : offset(offset) { + Segment(Expression* offset, const char *init, Address size) : offset(offset) { data.resize(size); std::copy_n(init, size, data.begin()); } - Segment(Address offset, std::vector& init) : offset(offset) { + Segment(Expression* offset, std::vector& init) : offset(offset) { data.swap(init); } }; -- cgit v1.2.3 From 35bd9109ab07aa21f9e55214a61390fa61c93638 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Fri, 12 Aug 2016 14:40:26 -0700 Subject: support function table initial and max sizes, and new printing format --- src/asm2wasm.h | 1 + src/binaryen-c.cpp | 1 + src/passes/Print.cpp | 6 +++++- src/shared-constants.h | 2 ++ src/wasm-binary.h | 1 + src/wasm-linker.cpp | 3 +++ src/wasm-s-parser.h | 25 +++++++++++++++++++++- src/wasm.cpp | 2 ++ src/wasm.h | 5 +++++ test/dot_s/alias.wast | 3 ++- test/dot_s/basics.wast | 3 ++- test/dot_s/bcp-1.wast | 3 ++- test/dot_s/dyncall.wast | 3 ++- test/dot_s/indidx.wast | 3 ++- test/dot_s/indirect-import.wast | 3 ++- test/dot_s/invoke_wrapper.wast | 3 ++- test/emcc_O2_hello_world.fromasm | 3 ++- test/emcc_O2_hello_world.fromasm.imprecise | 3 ++- test/emcc_O2_hello_world.fromasm.imprecise.no-opts | 3 ++- test/emcc_O2_hello_world.fromasm.no-opts | 3 ++- test/emcc_hello_world.fromasm | 3 ++- test/emcc_hello_world.fromasm.imprecise | 3 ++- test/emcc_hello_world.fromasm.imprecise.no-opts | 3 ++- test/emcc_hello_world.fromasm.no-opts | 3 ++- test/example/c-api-kitchen-sink.txt | 6 ++++-- test/example/c-api-kitchen-sink.txt.txt | 3 ++- test/memorygrowth.fromasm | 3 ++- test/memorygrowth.fromasm.imprecise | 3 ++- test/memorygrowth.fromasm.imprecise.no-opts | 3 ++- test/memorygrowth.fromasm.no-opts | 3 ++- test/passes/dce.txt | 3 ++- test/passes/duplicate-function-elimination.txt | 12 +++++++---- test/passes/remove-unused-functions.txt | 3 ++- test/passes/remove-unused-names_merge-blocks.txt | 3 ++- test/unit.fromasm | 3 ++- test/unit.fromasm.imprecise | 3 ++- test/unit.fromasm.imprecise.no-opts | 3 ++- test/unit.fromasm.no-opts | 3 ++- test/unit.wast | 3 ++- test/unit.wast.fromBinary | 3 ++- 40 files changed, 114 insertions(+), 37 deletions(-) (limited to 'src') diff --git a/src/asm2wasm.h b/src/asm2wasm.h index c0f13ff8f..868aa31d3 100644 --- a/src/asm2wasm.h +++ b/src/asm2wasm.h @@ -666,6 +666,7 @@ void Asm2WasmBuilder::processAsm(Ref ast) { IString curr = contents[k][1]->getIString(); wasm.table.names.push_back(curr); } + wasm.table.initial = wasm.table.max = wasm.table.names.size(); } else { abort_on("invalid var element", pair); } diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp index b0e241ab3..d7f866663 100644 --- a/src/binaryen-c.cpp +++ b/src/binaryen-c.cpp @@ -732,6 +732,7 @@ void BinaryenSetFunctionTable(BinaryenModuleRef module, BinaryenFunctionRef* fun for (BinaryenIndex i = 0; i < numFuncs; i++) { wasm->table.names.push_back(((Function*)funcs[i])->name); } + wasm->table.initial = wasm->table.max = wasm->table.names.size(); } // Memory. One per module diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp index eb97eead5..711cc8a84 100644 --- a/src/passes/Print.cpp +++ b/src/passes/Print.cpp @@ -575,7 +575,11 @@ struct PrintSExpression : public Visitor { decIndent(); } void visitTable(Table *curr) { - printOpening(o, "table"); + printOpening(o, "table") << ' ' << curr->initial; + if (curr->max && curr->max != Table::kMaxSize) o << ' ' << curr->max; + o << " anyfunc)\n"; + doIndent(o, indent); + printOpening(o, "elem", true); for (auto name : curr->names) { o << ' '; printName(name); diff --git a/src/shared-constants.h b/src/shared-constants.h index 8599d8144..f0148cb67 100644 --- a/src/shared-constants.h +++ b/src/shared-constants.h @@ -29,6 +29,7 @@ extern Name GROW_WASM_MEMORY, EXPORT, IMPORT, TABLE, + ELEM, LOCAL, TYPE, CALL, @@ -44,6 +45,7 @@ extern Name GROW_WASM_MEMORY, NEG_NAN, CASE, BR, + ANYFUNC, FAKE_RETURN, ASSERT_RETURN, ASSERT_TRAP, diff --git a/src/wasm-binary.h b/src/wasm-binary.h index b67a79c3d..d405c91dc 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -1648,6 +1648,7 @@ public: assert(index < wasm.functions.size()); wasm.table.names.push_back(wasm.functions[index]->name); } + wasm.table.initial = wasm.table.max = wasm.table.names.size(); } void readDataSegments() { diff --git a/src/wasm-linker.cpp b/src/wasm-linker.cpp index 1f06c6ec2..29f439bfb 100644 --- a/src/wasm-linker.cpp +++ b/src/wasm-linker.cpp @@ -223,6 +223,9 @@ void Linker::layout() { if (out.symbolInfo.implementedFunctions.count("free")) { exportFunction("free", true); } + + // finalize function table + out.wasm.table.initial = out.wasm.table.max = out.wasm.table.names.size(); } bool Linker::linkObject(S2WasmBuilder& builder) { diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index 87217cd20..7f652da5a 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -372,6 +372,7 @@ private: if (id == IMPORT) return; // already done if (id == GLOBAL) return parseGlobal(curr); if (id == TABLE) return parseTable(curr); + if (id == ELEM) return parseElem(curr); if (id == TYPE) return; // already done std::cerr << "bad module element " << id.str << '\n'; throw ParseException("unknown module element", curr.line, curr.col); @@ -1424,7 +1425,29 @@ private: } void parseTable(Element& s) { - for (size_t i = 1; i < s.size(); i++) { + if (s.size() == 1) return; // empty table in old notation + if (!s[1]->dollared()) { + if (s[1]->str() == ANYFUNC) { + // (table type (elem ..)) + parseElem(*s[2]); + wasm.table.initial = wasm.table.max = wasm.table.names.size(); + return; + } + // first element isn't dollared, and isn't anyfunc. this could be old syntax for (table 0 1) which means function 0 and 1, or it could be (table initial max? type), look for type + if (s[s.size() - 1]->str() == ANYFUNC) { + // (table initial max? type) + wasm.table.initial = atoi(s[1]->c_str()); + wasm.table.max = atoi(s[2]->c_str()); + return; + } + } + // old notation (table func1 func2 ..) + parseElem(s); + wasm.table.initial = wasm.table.max = wasm.table.names.size(); + } + + void parseElem(Element& s) { + for (Index i = 1; i < s.size(); i++) { wasm.table.names.push_back(getFunctionName(*s[i])); } } diff --git a/src/wasm.cpp b/src/wasm.cpp index 2138ec34d..8cfdee759 100644 --- a/src/wasm.cpp +++ b/src/wasm.cpp @@ -54,6 +54,7 @@ Name GROW_WASM_MEMORY("__growWasmMemory"), EXPORT("export"), IMPORT("import"), TABLE("table"), + ELEM("elem"), LOCAL("local"), TYPE("type"), CALL("call"), @@ -69,6 +70,7 @@ Name GROW_WASM_MEMORY("__growWasmMemory"), NEG_NAN("-nan"), CASE("case"), BR("br"), + ANYFUNC("anyfunc"), FAKE_RETURN("fake_return_waka123"), ASSERT_RETURN("assert_return"), ASSERT_TRAP("assert_trap"), diff --git a/src/wasm.h b/src/wasm.h index c0129cf23..82933bda0 100644 --- a/src/wasm.h +++ b/src/wasm.h @@ -1432,7 +1432,12 @@ public: class Table { public: + static const Index kMaxSize = Index(-1); + + Address initial, max; std::vector names; + + Table() : initial(0), max(kMaxSize) {} }; class Memory { diff --git a/test/dot_s/alias.wast b/test/dot_s/alias.wast index bd114b9dc..ab52137a1 100644 --- a/test/dot_s/alias.wast +++ b/test/dot_s/alias.wast @@ -6,7 +6,8 @@ (export "__exit" $__exit) (export "__needs_exit" $__needs_exit) (export "dynCall_v" $dynCall_v) - (table $__wasm_nullptr $__exit) + (table 2 2 anyfunc) + (elem $__wasm_nullptr $__exit) (func $__exit (type $FUNCSIG$v) (return (i32.add diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast index 7b13be3d8..e4cd73251 100644 --- a/test/dot_s/basics.wast +++ b/test/dot_s/basics.wast @@ -10,7 +10,8 @@ (import $puts "env" "puts" (param i32)) (export "main" $main) (export "dynCall_iii" $dynCall_iii) - (table $__wasm_nullptr $main) + (table 2 2 anyfunc) + (elem $__wasm_nullptr $main) (func $main (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (call_import $puts (i32.const 16) diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast index c090d90e5..a5a63d750 100644 --- a/test/dot_s/bcp-1.wast +++ b/test/dot_s/bcp-1.wast @@ -34,7 +34,8 @@ (export "main" $main) (export "dynCall_i" $dynCall_i) (export "dynCall_ii" $dynCall_ii) - (table $__wasm_nullptr $bad0 $bad1 $bad5 $bad7 $bad8 $bad10 $bad2 $bad3 $bad6 $bad4 $bad9 $good0 $good1 $good2 $opt0 $opt1 $opt2) + (table 18 18 anyfunc) + (elem $__wasm_nullptr $bad0 $bad1 $bad5 $bad7 $bad8 $bad10 $bad2 $bad3 $bad6 $bad4 $bad9 $good0 $good1 $good2 $opt0 $opt1 $opt2) (func $bad0 (type $FUNCSIG$i) (result i32) (return (i32.const 0) diff --git a/test/dot_s/dyncall.wast b/test/dot_s/dyncall.wast index e284c838d..f349bce7f 100644 --- a/test/dot_s/dyncall.wast +++ b/test/dot_s/dyncall.wast @@ -15,7 +15,8 @@ (export "dynCall_i" $dynCall_i) (export "dynCall_if" $dynCall_if) (export "dynCall_vd" $dynCall_vd) - (table $__wasm_nullptr $i $i_f $vd $ffjjdi $vd2) + (table 6 6 anyfunc) + (elem $__wasm_nullptr $i $i_f $vd $ffjjdi $vd2) (func $i (type $FUNCSIG$i) (result i32) (i32.const 0) ) diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast index 5fb481197..797183b04 100644 --- a/test/dot_s/indidx.wast +++ b/test/dot_s/indidx.wast @@ -7,7 +7,8 @@ (import $getchar "env" "getchar" (result i32)) (export "main" $main) (export "dynCall_i" $dynCall_i) - (table $__wasm_nullptr $c $b $d $a) + (table 5 5 anyfunc) + (elem $__wasm_nullptr $c $b $d $a) (func $a (type $FUNCSIG$i) (result i32) (i32.const 0) ) diff --git a/test/dot_s/indirect-import.wast b/test/dot_s/indirect-import.wast index 22821a4e0..8c8c3e01c 100644 --- a/test/dot_s/indirect-import.wast +++ b/test/dot_s/indirect-import.wast @@ -17,7 +17,8 @@ (export "dynCall_fd" $dynCall_fd) (export "dynCall_v" $dynCall_v) (export "dynCall_vi" $dynCall_vi) - (table $__wasm_nullptr $__importThunk_extern_fd $__importThunk_extern_vj $__importThunk_extern_v $__importThunk_extern_ijidf $__importThunk_extern_struct $__importThunk_extern_sret) + (table 7 7 anyfunc) + (elem $__wasm_nullptr $__importThunk_extern_fd $__importThunk_extern_vj $__importThunk_extern_v $__importThunk_extern_ijidf $__importThunk_extern_struct $__importThunk_extern_sret) (func $bar (result i32) (local $0 i32) (local $1 i32) diff --git a/test/dot_s/invoke_wrapper.wast b/test/dot_s/invoke_wrapper.wast index 6aa7a4ce6..c4a6d5931 100644 --- a/test/dot_s/invoke_wrapper.wast +++ b/test/dot_s/invoke_wrapper.wast @@ -17,7 +17,8 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_ffd" $dynCall_ffd) (export "dynCall_iii" $dynCall_iii) - (table $__wasm_nullptr $_Z5func1v $_Z5func2iii $_Z5func3fd $_Z5func4P8mystructS_) + (table 5 5 anyfunc) + (elem $__wasm_nullptr $_Z5func1v $_Z5func2iii $_Z5func3fd $_Z5func4P8mystructS_) (func $_Z5func1v (type $FUNCSIG$v) ) (func $_Z5func2iii (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32) diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm index 828905561..a324f42ba 100644 --- a/test/emcc_O2_hello_world.fromasm +++ b/test/emcc_O2_hello_world.fromasm @@ -42,7 +42,8 @@ (export "dynCall_ii" $dynCall_ii) (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) - (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) + (table 18 18 anyfunc) + (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $0 i32) (result i32) (local $1 i32) (local $2 i32) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise index ede6c05d4..127b7f77f 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise +++ b/test/emcc_O2_hello_world.fromasm.imprecise @@ -41,7 +41,8 @@ (export "dynCall_ii" $dynCall_ii) (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) - (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) + (table 18 18 anyfunc) + (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $0 i32) (result i32) (local $1 i32) (local $2 i32) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts index d34022a9e..6822928b3 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts @@ -41,7 +41,8 @@ (export "dynCall_ii" $dynCall_ii) (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) - (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) + (table 18 18 anyfunc) + (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $i1 i32) (result i32) (local $i2 i32) (local $i3 i32) diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts index f850b8306..6c6ad73c7 100644 --- a/test/emcc_O2_hello_world.fromasm.no-opts +++ b/test/emcc_O2_hello_world.fromasm.no-opts @@ -42,7 +42,8 @@ (export "dynCall_ii" $dynCall_ii) (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) - (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) + (table 18 18 anyfunc) + (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $i1 i32) (result i32) (local $i2 i32) (local $i3 i32) diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm index c99290ba8..9d4993ec3 100644 --- a/test/emcc_hello_world.fromasm +++ b/test/emcc_hello_world.fromasm @@ -55,7 +55,8 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) (export "___udivmoddi4" $___udivmoddi4) - (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) + (table 18 18 anyfunc) + (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $0 i32) (result i32) (local $1 i32) (set_local $1 diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise index ee84765a1..6c9047895 100644 --- a/test/emcc_hello_world.fromasm.imprecise +++ b/test/emcc_hello_world.fromasm.imprecise @@ -49,7 +49,8 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) (export "___udivmoddi4" $___udivmoddi4) - (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) + (table 18 18 anyfunc) + (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $0 i32) (result i32) (local $1 i32) (set_local $1 diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts index 327618169..35e23d120 100644 --- a/test/emcc_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_hello_world.fromasm.imprecise.no-opts @@ -49,7 +49,8 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) (export "___udivmoddi4" $___udivmoddi4) - (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) + (table 18 18 anyfunc) + (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $size i32) (result i32) (local $ret i32) (set_local $ret diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts index 41e3e9e26..27409fe49 100644 --- a/test/emcc_hello_world.fromasm.no-opts +++ b/test/emcc_hello_world.fromasm.no-opts @@ -55,7 +55,8 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) (export "___udivmoddi4" $___udivmoddi4) - (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) + (table 18 18 anyfunc) + (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $size i32) (result i32) (local $ret i32) (set_local $ret diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt index c8f123bdd..6b766f173 100644 --- a/test/example/c-api-kitchen-sink.txt +++ b/test/example/c-api-kitchen-sink.txt @@ -17,7 +17,8 @@ BinaryenFloat64: 4 (type $3 (func)) (import $an-imported "module" "base" (param i32 f64) (result f32)) (export "kitchen_sinker" "$kitchen()sinker") - (table "$kitchen()sinker") + (table 1 1 anyfunc) + (elem "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) (block $the-body @@ -1409,7 +1410,8 @@ int main() { (type $3 (func)) (import $an-imported "module" "base" (param i32 f64) (result f32)) (export "kitchen_sinker" "$kitchen()sinker") - (table "$kitchen()sinker") + (table 1 1 anyfunc) + (elem "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) (block $the-body diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt index 24dcc8a5c..feae7152c 100644 --- a/test/example/c-api-kitchen-sink.txt.txt +++ b/test/example/c-api-kitchen-sink.txt.txt @@ -12,7 +12,8 @@ (type $3 (func)) (import $an-imported "module" "base" (param i32 f64) (result f32)) (export "kitchen_sinker" "$kitchen()sinker") - (table "$kitchen()sinker") + (table 1 1 anyfunc) + (elem "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) (block $the-body diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm index 5c005ba99..ee6b3ae68 100644 --- a/test/memorygrowth.fromasm +++ b/test/memorygrowth.fromasm @@ -40,7 +40,8 @@ (export "dynCall_iiii" $lb) (export "dynCall_vi" $mb) (export "__growWasmMemory" $__growWasmMemory) - (table $nb $Oa $ob $Va $Ua $Ra $pb $Sa) + (table 8 8 anyfunc) + (elem $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $0 i32) (result i32) (local $1 i32) (local $2 i32) diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise index b70bc7c9e..458ab8f8f 100644 --- a/test/memorygrowth.fromasm.imprecise +++ b/test/memorygrowth.fromasm.imprecise @@ -39,7 +39,8 @@ (export "dynCall_iiii" $lb) (export "dynCall_vi" $mb) (export "__growWasmMemory" $__growWasmMemory) - (table $nb $Oa $ob $Va $Ua $Ra $pb $Sa) + (table 8 8 anyfunc) + (elem $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $0 i32) (result i32) (local $1 i32) (local $2 i32) diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts index dd03e651e..c30a5933b 100644 --- a/test/memorygrowth.fromasm.imprecise.no-opts +++ b/test/memorygrowth.fromasm.imprecise.no-opts @@ -39,7 +39,8 @@ (export "dynCall_iiii" $lb) (export "dynCall_vi" $mb) (export "__growWasmMemory" $__growWasmMemory) - (table $nb $Oa $ob $Va $Ua $Ra $pb $Sa) + (table 8 8 anyfunc) + (elem $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $a i32) (result i32) (local $b i32) (local $c i32) diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts index 29aa4aa30..3abed2662 100644 --- a/test/memorygrowth.fromasm.no-opts +++ b/test/memorygrowth.fromasm.no-opts @@ -40,7 +40,8 @@ (export "dynCall_iiii" $lb) (export "dynCall_vi" $mb) (export "__growWasmMemory" $__growWasmMemory) - (table $nb $Oa $ob $Va $Ua $Ra $pb $Sa) + (table 8 8 anyfunc) + (elem $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $a i32) (result i32) (local $b i32) (local $c i32) diff --git a/test/passes/dce.txt b/test/passes/dce.txt index 692a5005e..9c2836123 100644 --- a/test/passes/dce.txt +++ b/test/passes/dce.txt @@ -2,7 +2,8 @@ (memory 10) (type $ii (func (param i32 i32))) (type $1 (func)) - (table $call-me) + (table 1 1 anyfunc) + (elem $call-me) (func $call-me (type $ii) (param $0 i32) (param $1 i32) (nop) ) diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt index 3671ce24b..6c64b081c 100644 --- a/test/passes/duplicate-function-elimination.txt +++ b/test/passes/duplicate-function-elimination.txt @@ -38,7 +38,8 @@ (type $0 (func)) (export "keep2" $keep2) (export "other" $keep2) - (table $keep2 $keep2 $caller) + (table 3 3 anyfunc) + (elem $keep2 $keep2 $caller) (func $keep2 (type $0) (nop) ) @@ -363,7 +364,8 @@ (module (memory 0) (type $T (func)) - (table $erase $erase) + (table 2 2 anyfunc) + (elem $erase $erase) (func $erase (type $T) (call_indirect $T (i32.const 0) @@ -373,7 +375,8 @@ (module (memory 0) (type $T (func)) - (table $keep2 $other) + (table 2 2 anyfunc) + (elem $keep2 $other) (func $keep2 (type $T) (call_indirect $T (i32.const 0) @@ -389,7 +392,8 @@ (memory 0) (type $T (func)) (type $S (func)) - (table $keep2 $other) + (table 2 2 anyfunc) + (elem $keep2 $other) (func $keep2 (type $T) (call_indirect $T (i32.const 0) diff --git a/test/passes/remove-unused-functions.txt b/test/passes/remove-unused-functions.txt index b6f7cf3e1..6aa8e3265 100644 --- a/test/passes/remove-unused-functions.txt +++ b/test/passes/remove-unused-functions.txt @@ -3,7 +3,8 @@ (start $start) (type $0 (func)) (export "exported" $exported) - (table $called_indirect) + (table 1 1 anyfunc) + (elem $called_indirect) (func $start (type $0) (call $called0) ) diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt index fe5bd5cf8..ead2c99ca 100644 --- a/test/passes/remove-unused-names_merge-blocks.txt +++ b/test/passes/remove-unused-names_merge-blocks.txt @@ -4,7 +4,8 @@ (type $ii (func (param i32 i32))) (type $iii (func (param i32 i32 i32))) (type $3 (func)) - (table $call-i) + (table 1 1 anyfunc) + (elem $call-i) (func $call-i (type $i) (param $0 i32) (nop) ) diff --git a/test/unit.fromasm b/test/unit.fromasm index f939782e7..e292f47ae 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -15,7 +15,8 @@ (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32)) (export "big_negative" $big_negative) (export "pick" $big_negative) - (table $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) + (table 10 10 anyfunc) + (elem $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) (func $big_negative (nop) ) diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index f80f4ce6c..ef3c09ff0 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -11,7 +11,8 @@ (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64)) (export "big_negative" $big_negative) (export "pick" $big_negative) - (table $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) + (table 10 10 anyfunc) + (elem $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) (func $big_negative (nop) ) diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts index 4fa627938..cde7eb176 100644 --- a/test/unit.fromasm.imprecise.no-opts +++ b/test/unit.fromasm.imprecise.no-opts @@ -11,7 +11,8 @@ (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64)) (export "big_negative" $big_negative) (export "pick" $exportMe) - (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) + (table 10 10 anyfunc) + (elem $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (local $temp f64) (set_local $temp diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts index c10bd3dff..c0650ebd5 100644 --- a/test/unit.fromasm.no-opts +++ b/test/unit.fromasm.no-opts @@ -15,7 +15,8 @@ (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32)) (export "big_negative" $big_negative) (export "pick" $exportMe) - (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) + (table 10 10 anyfunc) + (elem $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (local $temp f64) (set_local $temp diff --git a/test/unit.wast b/test/unit.wast index b18ba6fdf..30d16d1a2 100644 --- a/test/unit.wast +++ b/test/unit.wast @@ -13,7 +13,8 @@ (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32)) (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64)) (export "big_negative" $big_negative) - (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) + (table 10 anyfunc) + (elem $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (type $FUNCSIG$v) (local $temp f64) (block $block0 diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary index 495b3daed..4348394af 100644 --- a/test/unit.wast.fromBinary +++ b/test/unit.wast.fromBinary @@ -13,7 +13,8 @@ (import $import$1 "asm2wasm" "f64-to-int" (param f64) (result i32)) (import $import$2 "asm2wasm" "f64-rem" (param f64 f64) (result f64)) (export "big_negative" $big_negative) - (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) + (table 10 10 anyfunc) + (elem $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (type $1) (local $var$0 f64) (block $label$0 -- cgit v1.2.3 From 113efcaa1e814304662ccc56312d8c59014a3a6c Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Mon, 15 Aug 2016 14:29:57 -0700 Subject: offset support in table --- src/asm2wasm.h | 10 +++- src/binaryen-c.cpp | 6 +- src/passes/DuplicateFunctionElimination.cpp | 10 ++-- src/passes/Print.cpp | 15 +++-- src/passes/RemoveUnusedFunctions.cpp | 6 +- src/passes/ReorderFunctions.cpp | 6 +- src/shell-interface.h | 24 ++++++++ src/wasm-binary.h | 37 ++++++++---- src/wasm-interpreter.h | 21 +++---- src/wasm-js.cpp | 68 +++++++++++++++++++--- src/wasm-linker.cpp | 31 +++++++--- src/wasm-linker.h | 4 ++ src/wasm-s-parser.h | 18 ++++-- src/wasm.h | 14 ++++- test/dot_s/alias.wast | 2 +- test/dot_s/basics.wast | 2 +- test/dot_s/bcp-1.wast | 2 +- test/dot_s/dyncall.wast | 2 +- test/dot_s/indidx.wast | 2 +- test/dot_s/indirect-import.wast | 2 +- test/dot_s/invoke_wrapper.wast | 2 +- test/emcc_O2_hello_world.fromasm | 2 +- test/emcc_O2_hello_world.fromasm.imprecise | 2 +- test/emcc_O2_hello_world.fromasm.imprecise.no-opts | 2 +- test/emcc_O2_hello_world.fromasm.no-opts | 2 +- test/emcc_hello_world.fromasm | 2 +- test/emcc_hello_world.fromasm.imprecise | 2 +- test/emcc_hello_world.fromasm.imprecise.no-opts | 2 +- test/emcc_hello_world.fromasm.no-opts | 2 +- test/example/c-api-kitchen-sink.txt | 4 +- test/example/c-api-kitchen-sink.txt.txt | 2 +- test/memorygrowth.fromasm | 2 +- test/memorygrowth.fromasm.imprecise | 2 +- test/memorygrowth.fromasm.imprecise.no-opts | 2 +- test/memorygrowth.fromasm.no-opts | 2 +- test/passes/dce.txt | 2 +- test/passes/duplicate-function-elimination.txt | 8 +-- test/passes/remove-unused-functions.txt | 2 +- test/passes/remove-unused-names_merge-blocks.txt | 2 +- test/unit.fromasm | 2 +- test/unit.fromasm.imprecise | 2 +- test/unit.fromasm.imprecise.no-opts | 2 +- test/unit.fromasm.no-opts | 2 +- test/unit.wast | 2 +- test/unit.wast.fromBinary | 4 +- 45 files changed, 240 insertions(+), 102 deletions(-) (limited to 'src') diff --git a/src/asm2wasm.h b/src/asm2wasm.h index 868aa31d3..a5754f725 100644 --- a/src/asm2wasm.h +++ b/src/asm2wasm.h @@ -660,13 +660,17 @@ void Asm2WasmBuilder::processAsm(Ref ast) { // TODO: when not using aliasing function pointers, we could merge them by noticing that // index 0 in each table is the null func, and each other index should only have one // non-null func. However, that breaks down when function pointer casts are emulated. - functionTableStarts[name] = wasm.table.names.size(); // this table starts here + if (wasm.table.segments.size() == 0) { + wasm.table.segments.emplace_back(wasm.allocator.alloc()->set(Literal(uint32_t(0)))); + } + auto& segment = wasm.table.segments[0]; + functionTableStarts[name] = segment.data.size(); // this table starts here Ref contents = value[1]; for (unsigned k = 0; k < contents->size(); k++) { IString curr = contents[k][1]->getIString(); - wasm.table.names.push_back(curr); + segment.data.push_back(curr); } - wasm.table.initial = wasm.table.max = wasm.table.names.size(); + wasm.table.initial = wasm.table.max = segment.data.size(); } else { abort_on("invalid var element", pair); } diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp index d7f866663..83c626eb1 100644 --- a/src/binaryen-c.cpp +++ b/src/binaryen-c.cpp @@ -729,10 +729,12 @@ void BinaryenSetFunctionTable(BinaryenModuleRef module, BinaryenFunctionRef* fun } auto* wasm = (Module*)module; + Table::Segment segment(wasm->allocator.alloc()->set(Literal(int32_t(0)))); for (BinaryenIndex i = 0; i < numFuncs; i++) { - wasm->table.names.push_back(((Function*)funcs[i])->name); + segment.data.push_back(((Function*)funcs[i])->name); } - wasm->table.initial = wasm->table.max = wasm->table.names.size(); + wasm->table.segments.push_back(segment); + wasm->table.initial = wasm->table.max = numFuncs; } // Memory. One per module diff --git a/src/passes/DuplicateFunctionElimination.cpp b/src/passes/DuplicateFunctionElimination.cpp index 961d26ba5..2b8e69b54 100644 --- a/src/passes/DuplicateFunctionElimination.cpp +++ b/src/passes/DuplicateFunctionElimination.cpp @@ -123,10 +123,12 @@ struct DuplicateFunctionElimination : public Pass { replacerRunner.add(&replacements); replacerRunner.run(); // replace in table - for (auto& name : module->table.names) { - auto iter = replacements.find(name); - if (iter != replacements.end()) { - name = iter->second; + for (auto& segment : module->table.segments) { + for (auto& name : segment.data) { + auto iter = replacements.find(name); + if (iter != replacements.end()) { + name = iter->second; + } } } // replace in start diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp index 711cc8a84..5eea38bdc 100644 --- a/src/passes/Print.cpp +++ b/src/passes/Print.cpp @@ -579,12 +579,15 @@ struct PrintSExpression : public Visitor { if (curr->max && curr->max != Table::kMaxSize) o << ' ' << curr->max; o << " anyfunc)\n"; doIndent(o, indent); - printOpening(o, "elem", true); - for (auto name : curr->names) { - o << ' '; - printName(name); + for (auto& segment : curr->segments) { + printOpening(o, "elem ", true); + visit(segment.offset); + for (auto name : segment.data) { + o << ' '; + printName(name); + } + o << ')'; } - o << ')'; } void visitModule(Module *curr) { currModule = curr; @@ -652,7 +655,7 @@ struct PrintSExpression : public Visitor { visitGlobal(child.get()); o << maybeNewLine; } - if (curr->table.names.size() > 0) { + if (curr->table.segments.size() > 0 || curr->table.initial > 0 || curr->table.max != Table::kMaxSize) { doIndent(o, indent); visitTable(&curr->table); o << maybeNewLine; diff --git a/src/passes/RemoveUnusedFunctions.cpp b/src/passes/RemoveUnusedFunctions.cpp index a2941aff6..78b0f0ffc 100644 --- a/src/passes/RemoveUnusedFunctions.cpp +++ b/src/passes/RemoveUnusedFunctions.cpp @@ -39,8 +39,10 @@ struct RemoveUnusedFunctions : public Pass { root.push_back(module->getFunction(curr->value)); } // For now, all functions that can be called indirectly are marked as roots. - for (auto& curr : module->table.names) { - root.push_back(module->getFunction(curr)); + for (auto& segment : module->table.segments) { + for (auto& curr : segment.data) { + root.push_back(module->getFunction(curr)); + } } // Compute function reachability starting from the root set. DirectCallGraphAnalyzer analyzer(module, root); diff --git a/src/passes/ReorderFunctions.cpp b/src/passes/ReorderFunctions.cpp index 38ef98afb..679fedb61 100644 --- a/src/passes/ReorderFunctions.cpp +++ b/src/passes/ReorderFunctions.cpp @@ -38,8 +38,10 @@ struct ReorderFunctions : public WalkerPassexports) { counts[curr->value]++; } - for (auto& curr : module->table.names) { - counts[curr]++; + for (auto& segment : module->table.segments) { + for (auto& curr : segment.data) { + counts[curr]++; + } } std::sort(module->functions.begin(), module->functions.end(), [this]( const std::unique_ptr& a, diff --git a/src/shell-interface.h b/src/shell-interface.h index 55f9b2a0b..f332307ad 100644 --- a/src/shell-interface.h +++ b/src/shell-interface.h @@ -86,6 +86,8 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface { } } memory; + std::vector table; + ShellExternalInterface() : memory() {} void init(Module& wasm) override { @@ -98,6 +100,15 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface { memory.set(offset + i, segment.data[i]); } } + + table.resize(wasm.table.initial); + for (auto& segment : wasm.table.segments) { + Address offset = ConstantExpressionRunner().visit(segment.offset).value.geti32(); + assert(offset + segment.data.size() <= wasm.table.initial); + for (size_t i = 0; i != segment.data.size(); ++i) { + table[offset + i] = segment.data[i]; + } + } } Literal callImport(Import *import, LiteralList& arguments) override { @@ -115,6 +126,19 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface { abort(); } + Literal callTable(Index index, Name type, LiteralList& arguments, ModuleInstance& instance) override { + if (index >= table.size()) trap("callTable overflow"); + auto* func = instance.wasm.getFunction(table[index]); + if (func->type.is() && func->type != type) trap("callIndirect: bad type"); + if (func->params.size() != arguments.size()) trap("callIndirect: bad # of arguments"); + for (size_t i = 0; i < func->params.size(); i++) { + if (func->params[i] != arguments[i].type) { + trap("callIndirect: bad argument type"); + } + } + return instance.callFunctionInternal(func->name, arguments); + } + Literal load(Load* load, Address addr) override { switch (load->type) { case i32: { diff --git a/src/wasm-binary.h b/src/wasm-binary.h index d405c91dc..04bebddc5 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -740,12 +740,19 @@ public: } void writeFunctionTable() { - if (wasm->table.names.size() == 0) return; + if (wasm->table.segments.size() == 0) return; if (debug) std::cerr << "== writeFunctionTable" << std::endl; auto start = startSection(BinaryConsts::Section::FunctionTable); - o << U32LEB(wasm->table.names.size()); - for (auto name : wasm->table.names) { - o << U32LEB(getFunctionIndex(name)); + o << U32LEB(wasm->table.initial); + o << U32LEB(wasm->table.max); + o << U32LEB(wasm->table.segments.size()); + for (auto& segment : wasm->table.segments) { + writeExpression(segment.offset); + o << int8_t(BinaryConsts::End); + o << U32LEB(segment.data.size()); + for (auto name : segment.data) { + o << U32LEB(getFunctionIndex(name)); + } } finishSection(start); } @@ -1644,11 +1651,13 @@ public: } } - for (size_t index : functionTable) { - assert(index < wasm.functions.size()); - wasm.table.names.push_back(wasm.functions[index]->name); + for (auto& pair : functionTable) { + 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.initial = wasm.table.max = wasm.table.names.size(); } void readDataSegments() { @@ -1667,14 +1676,20 @@ public: } } - std::vector functionTable; + std::map> functionTable; void readFunctionTable() { if (debug) std::cerr << "== readFunctionTable" << std::endl; + wasm.table.initial = getU32LEB(); + wasm.table.max = getU32LEB(); auto num = getU32LEB(); for (size_t i = 0; i < num; i++) { - auto index = getU32LEB(); - functionTable.push_back(index); + wasm.table.segments.emplace_back(readExpression()); + auto& temporary = functionTable[i]; + auto size = getU32LEB(); + for (Index j = 0; j < size; j++) { + temporary.push_back(getU32LEB()); + } } } diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h index 0be36a677..f2deed039 100644 --- a/src/wasm-interpreter.h +++ b/src/wasm-interpreter.h @@ -533,6 +533,7 @@ public: struct ExternalInterface { virtual void init(Module& wasm) {} virtual Literal callImport(Import* import, LiteralList& arguments) = 0; + virtual Literal callTable(Index index, Name type, LiteralList& arguments, ModuleInstance& instance) = 0; virtual Literal load(Load* load, Address addr) = 0; virtual void store(Store* store, Address addr, Literal value) = 0; virtual void growMemory(Address oldSize, Address newSize) = 0; @@ -591,8 +592,8 @@ private: return callFunctionInternal(name, arguments); } -private: - // Internal function call. +public: + // Internal function call. Must be public so that callTable implementations can use it (refactor?) Literal callFunctionInternal(IString name, LiteralList& arguments) { class FunctionScope { @@ -672,18 +673,8 @@ private: LiteralList arguments; Flow flow = generateArguments(curr->operands, arguments); if (flow.breaking()) return flow; - size_t index = target.value.geti32(); - if (index >= instance.wasm.table.names.size()) trap("callIndirect: overflow"); - Name name = instance.wasm.table.names[index]; - Function *func = instance.wasm.getFunction(name); - if (func->type.is() && func->type != curr->fullType) trap("callIndirect: bad type"); - if (func->params.size() != arguments.size()) trap("callIndirect: bad # of arguments"); - for (size_t i = 0; i < func->params.size(); i++) { - if (func->params[i] != arguments[i].type) { - trap("callIndirect: bad argument type"); - } - } - return instance.callFunctionInternal(name, arguments); + Index index = target.value.geti32(); + return instance.externalInterface->callTable(index, curr->fullType, arguments, instance); } Flow visitGetLocal(GetLocal *curr) { @@ -802,6 +793,8 @@ private: return ret; } +private: + Address memorySize; // in pages template diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp index 2aacd94d4..83956e47e 100644 --- a/src/wasm-js.cpp +++ b/src/wasm-js.cpp @@ -195,10 +195,23 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() { target.set(source, $0); }, ConstantExpressionRunner().visit(segment.offset).value.geti32(), &segment.data[0], segment.data.size()); } + // Table support is in a JS array. If the entry is a number, it's a function pointer. If not, it's a JS method to be called directly + // TODO: make them all JS methods, wrapping a dynCall where necessary? + EM_ASM_({ + Module['outside']['wasmTable'] = new Array($0); + }, wasm.table.initial); + for (auto segment : wasm.table.segments) { + Address offset = ConstantExpressionRunner().visit(segment.offset).value.geti32(); + assert(offset + segment.data.size() <= wasm.table.initial); + for (size_t i = 0; i != segment.data.size(); ++i) { + EM_ASM_({ + Module['outside']['wasmTable'][$0] = $1; + }, offset + i, wasm.getFunction(segment.data[i])); + } + } } - Literal callImport(Import *import, LiteralList& arguments) override { - if (wasmJSDebug) std::cout << "calling import " << import->name.str << '\n'; + void prepareTempArgments(LiteralList& arguments) { EM_ASM({ Module['tempArguments'] = []; }); @@ -213,6 +226,21 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() { abort(); } } + } + + Literal getResultFromJS(double ret, WasmType type) { + switch (type) { + case none: return Literal(0); + case i32: return Literal((int32_t)ret); + case f32: return Literal((float)ret); + case f64: return Literal((double)ret); + default: abort(); + } + } + + Literal callImport(Import *import, LiteralList& arguments) override { + if (wasmJSDebug) std::cout << "calling import " << import->name.str << '\n'; + prepareTempArgments(arguments); double ret = EM_ASM_DOUBLE({ var mod = Pointer_stringify($0); var base = Pointer_stringify($1); @@ -224,12 +252,36 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() { if (wasmJSDebug) std::cout << "calling import returning " << ret << '\n'; - switch (import->type->result) { - case none: return Literal(0); - case i32: return Literal((int32_t)ret); - case f32: return Literal((float)ret); - case f64: return Literal((double)ret); - default: abort(); + return getResultFromJS(ret, import->type->result); + } + + Literal callTable(Index index, Name type, LiteralList& arguments, ModuleInstance& instance) override { + void* ptr = (void*)EM_ASM_INT({ + var value = Module['outside']['wasmTable'][$0]; + return typeof value === "number" ? value : -1; + }, index); + if (ptr == nullptr) trap("callTable overflow"); + if (ptr != (void*)-1) { + // a Function we can call + Function* func = (Function*)ptr; + if (func->type.is() && func->type != type) trap("callIndirect: bad type"); + if (func->params.size() != arguments.size()) trap("callIndirect: bad # of arguments"); + for (size_t i = 0; i < func->params.size(); i++) { + if (func->params[i] != arguments[i].type) { + trap("callIndirect: bad argument type"); + } + } + return instance.callFunctionInternal(func->name, arguments); + } else { + // A JS function JS can call + prepareTempArgments(arguments); + double ret = EM_ASM_DOUBLE({ + var func = Module['outside']['wasmTable'][$0]; + var tempArguments = Module['tempArguments']; + Module['tempArguments'] = null; + return func.apply(null, tempArguments); + }, index); + return getResultFromJS(ret, instance.wasm.getFunctionType(type)->result); } } diff --git a/src/wasm-linker.cpp b/src/wasm-linker.cpp index 29f439bfb..2c9a4cd4d 100644 --- a/src/wasm-linker.cpp +++ b/src/wasm-linker.cpp @@ -132,7 +132,7 @@ void Linker::layout() { // Emit the pre-assigned function names in sorted order for (const auto& P : functionNames) { - out.wasm.table.names.push_back(P.second); + getTableSegment().data.push_back(P.second); } for (auto& relocation : out.relocations) { @@ -206,9 +206,11 @@ void Linker::layout() { } // ensure an explicit function type for indirect call targets - for (auto& name : out.wasm.table.names) { - auto* func = out.wasm.getFunction(name); - func->type = ensureFunctionType(getSig(func), &out.wasm)->name; + for (auto& segment : out.wasm.table.segments) { + for (auto& name : segment.data) { + auto* func = out.wasm.getFunction(name); + func->type = ensureFunctionType(getSig(func), &out.wasm)->name; + } } // Export malloc and free whenever availble. JavsScript version of malloc has @@ -225,7 +227,9 @@ void Linker::layout() { } // finalize function table - out.wasm.table.initial = out.wasm.table.max = out.wasm.table.names.size(); + if (out.wasm.table.segments.size() > 0) { + out.wasm.table.initial = out.wasm.table.max = getTableSegment().data.size(); + } } bool Linker::linkObject(S2WasmBuilder& builder) { @@ -385,10 +389,19 @@ void Linker::emscriptenGlue(std::ostream& o) { o << " }\n"; } +Table::Segment& Linker::getTableSegment() { + if (out.wasm.table.segments.size() == 0) { + out.wasm.table.segments.emplace_back(out.wasm.allocator.alloc()->set(Literal(uint32_t(0)))); + } else { + assert(out.wasm.table.segments.size() == 1); + } + return out.wasm.table.segments[0]; +} + Index Linker::getFunctionIndex(Name name) { if (!functionIndexes.count(name)) { - functionIndexes[name] = out.wasm.table.names.size(); - out.wasm.table.names.push_back(name); + functionIndexes[name] = getTableSegment().data.size(); + getTableSegment().data.push_back(name); if (debug) { std::cerr << "function index: " << name << ": " << functionIndexes[name] << '\n'; @@ -406,7 +419,6 @@ bool hasI64ResultOrParam(FunctionType* ft) { } void Linker::makeDummyFunction() { - assert(out.wasm.table.names.empty()); bool create = false; // Check if there are address-taken functions for (auto& relocation : out.relocations) { @@ -424,9 +436,10 @@ void Linker::makeDummyFunction() { } void Linker::makeDynCallThunks() { + if (out.wasm.table.segments.size() == 0) return; std::unordered_set sigs; wasm::Builder wasmBuilder(out.wasm); - for (const auto& indirectFunc : out.wasm.table.names) { + for (const auto& indirectFunc : getTableSegment().data) { // Skip generating thunks for the dummy function if (indirectFunc == dummyFunction) continue; std::string sig(getSig(out.wasm.getFunction(indirectFunc))); diff --git a/src/wasm-linker.h b/src/wasm-linker.h index bf76a8f94..a6f5d319a 100644 --- a/src/wasm-linker.h +++ b/src/wasm-linker.h @@ -282,6 +282,10 @@ class Linker { void ensureImport(Name target, std::string signature); + // Makes sure the table has a single segment, with offset 0, + // to which we can add content. + Table::Segment& getTableSegment(); + // Retrieves (and assigns) an entry index in the indirect function table for // a given function. Index getFunctionIndex(Name name); diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index 7f652da5a..b70f70b4e 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -1430,7 +1430,7 @@ private: if (s[1]->str() == ANYFUNC) { // (table type (elem ..)) parseElem(*s[2]); - wasm.table.initial = wasm.table.max = wasm.table.names.size(); + wasm.table.initial = wasm.table.max = wasm.table.segments[0].data.size(); return; } // first element isn't dollared, and isn't anyfunc. this could be old syntax for (table 0 1) which means function 0 and 1, or it could be (table initial max? type), look for type @@ -1443,13 +1443,23 @@ private: } // old notation (table func1 func2 ..) parseElem(s); - wasm.table.initial = wasm.table.max = wasm.table.names.size(); + wasm.table.initial = wasm.table.max = wasm.table.segments[0].data.size(); } void parseElem(Element& s) { - for (Index i = 1; i < s.size(); i++) { - wasm.table.names.push_back(getFunctionName(*s[i])); + Index i = 1; + Expression* offset; + if (s[i]->isList()) { + // there is an init expression + offset = parseExpression(s[i++]); + } else { + offset = allocator.alloc()->set(Literal(int32_t(0))); + } + Table::Segment segment(offset); + for (; i < s.size(); i++) { + segment.data.push_back(getFunctionName(*s[i])); } + wasm.table.segments.push_back(segment); } void parseType(Element& s) { diff --git a/src/wasm.h b/src/wasm.h index 82933bda0..68558033d 100644 --- a/src/wasm.h +++ b/src/wasm.h @@ -1434,8 +1434,19 @@ class Table { public: static const Index kMaxSize = Index(-1); + struct Segment { + Expression* offset; + std::vector data; + Segment() {} + Segment(Expression* offset) : offset(offset) { + } + Segment(Expression* offset, std::vector& init) : offset(offset) { + data.swap(init); + } + }; + Address initial, max; - std::vector names; + std::vector segments; Table() : initial(0), max(kMaxSize) {} }; @@ -1445,6 +1456,7 @@ public: static const Address::address_t kPageSize = 64 * 1024; static const Address::address_t kMaxSize = ~Address::address_t(0) / kPageSize; static const Address::address_t kPageMask = ~(kPageSize - 1); + struct Segment { Expression* offset; std::vector data; // TODO: optimize diff --git a/test/dot_s/alias.wast b/test/dot_s/alias.wast index ab52137a1..8ba469564 100644 --- a/test/dot_s/alias.wast +++ b/test/dot_s/alias.wast @@ -7,7 +7,7 @@ (export "__needs_exit" $__needs_exit) (export "dynCall_v" $dynCall_v) (table 2 2 anyfunc) - (elem $__wasm_nullptr $__exit) + (elem (i32.const 0) $__wasm_nullptr $__exit) (func $__exit (type $FUNCSIG$v) (return (i32.add diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast index e4cd73251..3562140fb 100644 --- a/test/dot_s/basics.wast +++ b/test/dot_s/basics.wast @@ -11,7 +11,7 @@ (export "main" $main) (export "dynCall_iii" $dynCall_iii) (table 2 2 anyfunc) - (elem $__wasm_nullptr $main) + (elem (i32.const 0) $__wasm_nullptr $main) (func $main (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (call_import $puts (i32.const 16) diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast index a5a63d750..1b76a98af 100644 --- a/test/dot_s/bcp-1.wast +++ b/test/dot_s/bcp-1.wast @@ -35,7 +35,7 @@ (export "dynCall_i" $dynCall_i) (export "dynCall_ii" $dynCall_ii) (table 18 18 anyfunc) - (elem $__wasm_nullptr $bad0 $bad1 $bad5 $bad7 $bad8 $bad10 $bad2 $bad3 $bad6 $bad4 $bad9 $good0 $good1 $good2 $opt0 $opt1 $opt2) + (elem (i32.const 0) $__wasm_nullptr $bad0 $bad1 $bad5 $bad7 $bad8 $bad10 $bad2 $bad3 $bad6 $bad4 $bad9 $good0 $good1 $good2 $opt0 $opt1 $opt2) (func $bad0 (type $FUNCSIG$i) (result i32) (return (i32.const 0) diff --git a/test/dot_s/dyncall.wast b/test/dot_s/dyncall.wast index f349bce7f..c6dae687a 100644 --- a/test/dot_s/dyncall.wast +++ b/test/dot_s/dyncall.wast @@ -16,7 +16,7 @@ (export "dynCall_if" $dynCall_if) (export "dynCall_vd" $dynCall_vd) (table 6 6 anyfunc) - (elem $__wasm_nullptr $i $i_f $vd $ffjjdi $vd2) + (elem (i32.const 0) $__wasm_nullptr $i $i_f $vd $ffjjdi $vd2) (func $i (type $FUNCSIG$i) (result i32) (i32.const 0) ) diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast index 797183b04..6cdb6c4ce 100644 --- a/test/dot_s/indidx.wast +++ b/test/dot_s/indidx.wast @@ -8,7 +8,7 @@ (export "main" $main) (export "dynCall_i" $dynCall_i) (table 5 5 anyfunc) - (elem $__wasm_nullptr $c $b $d $a) + (elem (i32.const 0) $__wasm_nullptr $c $b $d $a) (func $a (type $FUNCSIG$i) (result i32) (i32.const 0) ) diff --git a/test/dot_s/indirect-import.wast b/test/dot_s/indirect-import.wast index 8c8c3e01c..86c8ded00 100644 --- a/test/dot_s/indirect-import.wast +++ b/test/dot_s/indirect-import.wast @@ -18,7 +18,7 @@ (export "dynCall_v" $dynCall_v) (export "dynCall_vi" $dynCall_vi) (table 7 7 anyfunc) - (elem $__wasm_nullptr $__importThunk_extern_fd $__importThunk_extern_vj $__importThunk_extern_v $__importThunk_extern_ijidf $__importThunk_extern_struct $__importThunk_extern_sret) + (elem (i32.const 0) $__wasm_nullptr $__importThunk_extern_fd $__importThunk_extern_vj $__importThunk_extern_v $__importThunk_extern_ijidf $__importThunk_extern_struct $__importThunk_extern_sret) (func $bar (result i32) (local $0 i32) (local $1 i32) diff --git a/test/dot_s/invoke_wrapper.wast b/test/dot_s/invoke_wrapper.wast index c4a6d5931..d54e94d03 100644 --- a/test/dot_s/invoke_wrapper.wast +++ b/test/dot_s/invoke_wrapper.wast @@ -18,7 +18,7 @@ (export "dynCall_ffd" $dynCall_ffd) (export "dynCall_iii" $dynCall_iii) (table 5 5 anyfunc) - (elem $__wasm_nullptr $_Z5func1v $_Z5func2iii $_Z5func3fd $_Z5func4P8mystructS_) + (elem (i32.const 0) $__wasm_nullptr $_Z5func1v $_Z5func2iii $_Z5func3fd $_Z5func4P8mystructS_) (func $_Z5func1v (type $FUNCSIG$v) ) (func $_Z5func2iii (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32) diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm index a324f42ba..49d63fa8c 100644 --- a/test/emcc_O2_hello_world.fromasm +++ b/test/emcc_O2_hello_world.fromasm @@ -43,7 +43,7 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) (table 18 18 anyfunc) - (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) + (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $0 i32) (result i32) (local $1 i32) (local $2 i32) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise index 127b7f77f..4f0513d28 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise +++ b/test/emcc_O2_hello_world.fromasm.imprecise @@ -42,7 +42,7 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) (table 18 18 anyfunc) - (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) + (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $0 i32) (result i32) (local $1 i32) (local $2 i32) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts index 6822928b3..494915489 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts @@ -42,7 +42,7 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) (table 18 18 anyfunc) - (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) + (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $i1 i32) (result i32) (local $i2 i32) (local $i3 i32) diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts index 6c6ad73c7..e75c5e4b2 100644 --- a/test/emcc_O2_hello_world.fromasm.no-opts +++ b/test/emcc_O2_hello_world.fromasm.no-opts @@ -43,7 +43,7 @@ (export "dynCall_iiii" $dynCall_iiii) (export "dynCall_vi" $dynCall_vi) (table 18 18 anyfunc) - (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) + (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $i1 i32) (result i32) (local $i2 i32) (local $i3 i32) diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm index 9d4993ec3..1ef3b9017 100644 --- a/test/emcc_hello_world.fromasm +++ b/test/emcc_hello_world.fromasm @@ -56,7 +56,7 @@ (export "dynCall_vi" $dynCall_vi) (export "___udivmoddi4" $___udivmoddi4) (table 18 18 anyfunc) - (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) + (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $0 i32) (result i32) (local $1 i32) (set_local $1 diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise index 6c9047895..13c8baec6 100644 --- a/test/emcc_hello_world.fromasm.imprecise +++ b/test/emcc_hello_world.fromasm.imprecise @@ -50,7 +50,7 @@ (export "dynCall_vi" $dynCall_vi) (export "___udivmoddi4" $___udivmoddi4) (table 18 18 anyfunc) - (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) + (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $0 i32) (result i32) (local $1 i32) (set_local $1 diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts index 35e23d120..d8b887891 100644 --- a/test/emcc_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_hello_world.fromasm.imprecise.no-opts @@ -50,7 +50,7 @@ (export "dynCall_vi" $dynCall_vi) (export "___udivmoddi4" $___udivmoddi4) (table 18 18 anyfunc) - (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) + (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $size i32) (result i32) (local $ret i32) (set_local $ret diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts index 27409fe49..efa2de849 100644 --- a/test/emcc_hello_world.fromasm.no-opts +++ b/test/emcc_hello_world.fromasm.no-opts @@ -56,7 +56,7 @@ (export "dynCall_vi" $dynCall_vi) (export "___udivmoddi4" $___udivmoddi4) (table 18 18 anyfunc) - (elem $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) + (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $size i32) (result i32) (local $ret i32) (set_local $ret diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt index 6b766f173..42a5bfee1 100644 --- a/test/example/c-api-kitchen-sink.txt +++ b/test/example/c-api-kitchen-sink.txt @@ -18,7 +18,7 @@ BinaryenFloat64: 4 (import $an-imported "module" "base" (param i32 f64) (result f32)) (export "kitchen_sinker" "$kitchen()sinker") (table 1 1 anyfunc) - (elem "$kitchen()sinker") + (elem (i32.const 0) "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) (block $the-body @@ -1411,7 +1411,7 @@ int main() { (import $an-imported "module" "base" (param i32 f64) (result f32)) (export "kitchen_sinker" "$kitchen()sinker") (table 1 1 anyfunc) - (elem "$kitchen()sinker") + (elem (i32.const 0) "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) (block $the-body diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt index feae7152c..7e32ba431 100644 --- a/test/example/c-api-kitchen-sink.txt.txt +++ b/test/example/c-api-kitchen-sink.txt.txt @@ -13,7 +13,7 @@ (import $an-imported "module" "base" (param i32 f64) (result f32)) (export "kitchen_sinker" "$kitchen()sinker") (table 1 1 anyfunc) - (elem "$kitchen()sinker") + (elem (i32.const 0) "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) (block $the-body diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm index ee6b3ae68..c07cc247e 100644 --- a/test/memorygrowth.fromasm +++ b/test/memorygrowth.fromasm @@ -41,7 +41,7 @@ (export "dynCall_vi" $mb) (export "__growWasmMemory" $__growWasmMemory) (table 8 8 anyfunc) - (elem $nb $Oa $ob $Va $Ua $Ra $pb $Sa) + (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $0 i32) (result i32) (local $1 i32) (local $2 i32) diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise index 458ab8f8f..5482b08f6 100644 --- a/test/memorygrowth.fromasm.imprecise +++ b/test/memorygrowth.fromasm.imprecise @@ -40,7 +40,7 @@ (export "dynCall_vi" $mb) (export "__growWasmMemory" $__growWasmMemory) (table 8 8 anyfunc) - (elem $nb $Oa $ob $Va $Ua $Ra $pb $Sa) + (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $0 i32) (result i32) (local $1 i32) (local $2 i32) diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts index c30a5933b..ddd73a5f8 100644 --- a/test/memorygrowth.fromasm.imprecise.no-opts +++ b/test/memorygrowth.fromasm.imprecise.no-opts @@ -40,7 +40,7 @@ (export "dynCall_vi" $mb) (export "__growWasmMemory" $__growWasmMemory) (table 8 8 anyfunc) - (elem $nb $Oa $ob $Va $Ua $Ra $pb $Sa) + (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $a i32) (result i32) (local $b i32) (local $c i32) diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts index 3abed2662..c0a7307c5 100644 --- a/test/memorygrowth.fromasm.no-opts +++ b/test/memorygrowth.fromasm.no-opts @@ -41,7 +41,7 @@ (export "dynCall_vi" $mb) (export "__growWasmMemory" $__growWasmMemory) (table 8 8 anyfunc) - (elem $nb $Oa $ob $Va $Ua $Ra $pb $Sa) + (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $a i32) (result i32) (local $b i32) (local $c i32) diff --git a/test/passes/dce.txt b/test/passes/dce.txt index 9c2836123..9ae5977b6 100644 --- a/test/passes/dce.txt +++ b/test/passes/dce.txt @@ -3,7 +3,7 @@ (type $ii (func (param i32 i32))) (type $1 (func)) (table 1 1 anyfunc) - (elem $call-me) + (elem (i32.const 0) $call-me) (func $call-me (type $ii) (param $0 i32) (param $1 i32) (nop) ) diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt index 6c64b081c..a7511fc5c 100644 --- a/test/passes/duplicate-function-elimination.txt +++ b/test/passes/duplicate-function-elimination.txt @@ -39,7 +39,7 @@ (export "keep2" $keep2) (export "other" $keep2) (table 3 3 anyfunc) - (elem $keep2 $keep2 $caller) + (elem (i32.const 0) $keep2 $keep2 $caller) (func $keep2 (type $0) (nop) ) @@ -365,7 +365,7 @@ (memory 0) (type $T (func)) (table 2 2 anyfunc) - (elem $erase $erase) + (elem (i32.const 0) $erase $erase) (func $erase (type $T) (call_indirect $T (i32.const 0) @@ -376,7 +376,7 @@ (memory 0) (type $T (func)) (table 2 2 anyfunc) - (elem $keep2 $other) + (elem (i32.const 0) $keep2 $other) (func $keep2 (type $T) (call_indirect $T (i32.const 0) @@ -393,7 +393,7 @@ (type $T (func)) (type $S (func)) (table 2 2 anyfunc) - (elem $keep2 $other) + (elem (i32.const 0) $keep2 $other) (func $keep2 (type $T) (call_indirect $T (i32.const 0) diff --git a/test/passes/remove-unused-functions.txt b/test/passes/remove-unused-functions.txt index 6aa8e3265..cd819d347 100644 --- a/test/passes/remove-unused-functions.txt +++ b/test/passes/remove-unused-functions.txt @@ -4,7 +4,7 @@ (type $0 (func)) (export "exported" $exported) (table 1 1 anyfunc) - (elem $called_indirect) + (elem (i32.const 0) $called_indirect) (func $start (type $0) (call $called0) ) diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt index ead2c99ca..88d284a5a 100644 --- a/test/passes/remove-unused-names_merge-blocks.txt +++ b/test/passes/remove-unused-names_merge-blocks.txt @@ -5,7 +5,7 @@ (type $iii (func (param i32 i32 i32))) (type $3 (func)) (table 1 1 anyfunc) - (elem $call-i) + (elem (i32.const 0) $call-i) (func $call-i (type $i) (param $0 i32) (nop) ) diff --git a/test/unit.fromasm b/test/unit.fromasm index e292f47ae..49189df43 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -16,7 +16,7 @@ (export "big_negative" $big_negative) (export "pick" $big_negative) (table 10 10 anyfunc) - (elem $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) + (elem (i32.const 0) $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) (func $big_negative (nop) ) diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index ef3c09ff0..d2c10b549 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -12,7 +12,7 @@ (export "big_negative" $big_negative) (export "pick" $big_negative) (table 10 10 anyfunc) - (elem $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) + (elem (i32.const 0) $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) (func $big_negative (nop) ) diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts index cde7eb176..7037a6c1c 100644 --- a/test/unit.fromasm.imprecise.no-opts +++ b/test/unit.fromasm.imprecise.no-opts @@ -12,7 +12,7 @@ (export "big_negative" $big_negative) (export "pick" $exportMe) (table 10 10 anyfunc) - (elem $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) + (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (local $temp f64) (set_local $temp diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts index c0650ebd5..51ae345b9 100644 --- a/test/unit.fromasm.no-opts +++ b/test/unit.fromasm.no-opts @@ -16,7 +16,7 @@ (export "big_negative" $big_negative) (export "pick" $exportMe) (table 10 10 anyfunc) - (elem $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) + (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (local $temp f64) (set_local $temp diff --git a/test/unit.wast b/test/unit.wast index 30d16d1a2..2e21d44dd 100644 --- a/test/unit.wast +++ b/test/unit.wast @@ -14,7 +14,7 @@ (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64)) (export "big_negative" $big_negative) (table 10 anyfunc) - (elem $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) + (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (type $FUNCSIG$v) (local $temp f64) (block $block0 diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary index 4348394af..29d53598a 100644 --- a/test/unit.wast.fromBinary +++ b/test/unit.wast.fromBinary @@ -13,8 +13,8 @@ (import $import$1 "asm2wasm" "f64-to-int" (param f64) (result i32)) (import $import$2 "asm2wasm" "f64-rem" (param f64 f64) (result f64)) (export "big_negative" $big_negative) - (table 10 10 anyfunc) - (elem $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) + (table 10 anyfunc) + (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (type $1) (local $var$0 f64) (block $label$0 -- cgit v1.2.3