diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/wasm-emscripten-finalize.cpp | 26 | ||||
-rw-r--r-- | src/wasm-emscripten.h | 3 | ||||
-rw-r--r-- | src/wasm/wasm-emscripten.cpp | 3 |
3 files changed, 3 insertions, 29 deletions
diff --git a/src/tools/wasm-emscripten-finalize.cpp b/src/tools/wasm-emscripten-finalize.cpp index d76bd4fc9..844dfbb60 100644 --- a/src/tools/wasm-emscripten-finalize.cpp +++ b/src/tools/wasm-emscripten-finalize.cpp @@ -225,30 +225,6 @@ int main(int argc, const char* argv[]) { BYN_DEBUG_WITH_TYPE("emscripten-dump", WasmPrinter::printModule(&wasm, std::cerr)); - uint32_t dataSize = 0; - - if (!sideModule) { - if (globalBase == INVALID_BASE) { - Fatal() << "globalBase must be set"; - } - Export* dataEndExport = wasm.getExport("__data_end"); - if (dataEndExport == nullptr) { - Fatal() << "__data_end export not found"; - } - Global* dataEnd = wasm.getGlobal(dataEndExport->value); - if (dataEnd == nullptr) { - Fatal() << "__data_end global not found"; - } - if (dataEnd->type != Type::i32) { - Fatal() << "__data_end global has wrong type"; - } - if (dataEnd->imported()) { - Fatal() << "__data_end must not be an imported global"; - } - Const* dataEndConst = dataEnd->init->cast<Const>(); - dataSize = dataEndConst->value.geti32() - globalBase; - } - EmscriptenGlueGenerator generator(wasm); generator.standalone = standaloneWasm; generator.sideModule = sideModule; @@ -326,7 +302,7 @@ int main(int argc, const char* argv[]) { BYN_TRACE("generated metadata\n"); // Substantial changes to the wasm are done, enough to create the metadata. std::string metadata = - generator.generateEmscriptenMetadata(dataSize, initializerFunctions); + generator.generateEmscriptenMetadata(initializerFunctions); // Finally, separate out data segments if relevant (they may have been needed // for metadata). diff --git a/src/wasm-emscripten.h b/src/wasm-emscripten.h index d0e2d8cb3..8c5eeb4e1 100644 --- a/src/wasm-emscripten.h +++ b/src/wasm-emscripten.h @@ -34,8 +34,7 @@ public: useStackPointerGlobal(stackPointerOffset == 0) {} std::string - generateEmscriptenMetadata(Address staticBump, - std::vector<Name> const& initializerFunctions); + generateEmscriptenMetadata(std::vector<Name> const& initializerFunctions); void fixInvokeFunctionNames(); diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp index a1a53af7e..9f63d32dd 100644 --- a/src/wasm/wasm-emscripten.cpp +++ b/src/wasm/wasm-emscripten.cpp @@ -434,7 +434,7 @@ void printSignatures(std::ostream& o, const std::set<Signature>& c) { } std::string EmscriptenGlueGenerator::generateEmscriptenMetadata( - Address staticBump, std::vector<Name> const& initializerFunctions) { + std::vector<Name> const& initializerFunctions) { bool commaFirst; auto nextElement = [&commaFirst]() { if (commaFirst) { @@ -479,7 +479,6 @@ std::string EmscriptenGlueGenerator::generateEmscriptenMetadata( meta << "\n },\n"; } - meta << " \"staticBump\": " << staticBump << ",\n"; meta << " \"tableSize\": " << wasm.table.initial.addr << ",\n"; if (!initializerFunctions.empty()) { |