summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/tools/wasm-emscripten-finalize.cpp88
-rw-r--r--test/lld/bigint.wat.out16
-rw-r--r--test/lld/duplicate_imports.wat.out10
-rw-r--r--test/lld/em_asm_table.wat.out16
-rw-r--r--test/lld/main_module.wat.out16
-rw-r--r--test/lld/main_module_table.wat.out16
-rw-r--r--test/lld/main_module_table_2.wat.out16
-rw-r--r--test/lld/main_module_table_3.wat.out16
-rw-r--r--test/lld/main_module_table_4.wat.out16
-rw-r--r--test/lld/main_module_table_5.wat.out16
-rw-r--r--test/lld/reserved_func_ptr.wat.out16
11 files changed, 118 insertions, 124 deletions
diff --git a/src/tools/wasm-emscripten-finalize.cpp b/src/tools/wasm-emscripten-finalize.cpp
index 8ca10b79b..7bb8ed310 100644
--- a/src/tools/wasm-emscripten-finalize.cpp
+++ b/src/tools/wasm-emscripten-finalize.cpp
@@ -241,30 +241,61 @@ int main(int argc, const char* argv[]) {
}
wasm.updateMaps();
+ if (!standaloneWasm) {
+ // This is also not needed in standalone mode since standalone mode uses
+ // crt1.c to invoke the main and is aware of __main_argc_argv mangling.
+ generator.renameMainArgcArgv();
+ }
+
+ PassRunner passRunner(&wasm, options.passOptions);
+ passRunner.setDebug(options.debug);
+ passRunner.setDebugInfo(debugInfo);
+
if (checkStackOverflow && !sideModule) {
- PassOptions options;
if (!standaloneWasm) {
// In standalone mode we don't set a handler at all.. which means
// just trap on overflow.
- options.arguments["stack-check-handler"] = "__handle_stack_overflow";
+ passRunner.options.arguments["stack-check-handler"] =
+ "__handle_stack_overflow";
}
- PassRunner passRunner(&wasm, options);
passRunner.add("stack-check");
- passRunner.run();
}
if (sideModule) {
- BYN_TRACE("finalizing as side module\n");
- PassRunner passRunner(&wasm);
passRunner.add("replace-stack-pointer");
passRunner.add("emscripten-pic");
- passRunner.run();
+ } else {
+ passRunner.add("emscripten-pic-main-module");
+ }
+
+ if (!standaloneWasm) {
+ // If not standalone wasm then JS is relevant and we need dynCalls.
+ passRunner.add("generate-dyncalls");
+ }
+
+ // Legalize the wasm, if BigInts don't make that moot.
+ if (!bigInt) {
+ passRunner.add(ABI::getLegalizationPass(
+ legalizeJavaScriptFFI ? ABI::LegalizationLevel::Full
+ : ABI::LegalizationLevel::Minimal));
+ }
+
+ // Strip target features section (its information is in the metadata)
+ passRunner.add("strip-target-features");
+
+ // If DWARF is unused, strip it out. This avoids us keeping it alive
+ // until wasm-opt strips it later.
+ if (!DWARF) {
+ passRunner.add("strip-dwarf");
+ }
+
+ passRunner.run();
+
+ if (sideModule) {
+ BYN_TRACE("finalizing as side module\n");
generator.generatePostInstantiateFunction();
} else {
BYN_TRACE("finalizing as regular module\n");
- PassRunner passRunner(&wasm);
- passRunner.add("emscripten-pic-main-module");
- passRunner.run();
generator.internalizeStackPointerGlobal();
generator.generateMemoryGrowthFunction();
// For side modules these gets called via __post_instantiate
@@ -285,28 +316,6 @@ int main(int argc, const char* argv[]) {
}
}
- if (!standaloneWasm) {
- // If not standalone wasm then JS is relevant and we need dynCalls.
- PassRunner passRunner(&wasm);
- passRunner.add("generate-dyncalls");
- passRunner.run();
- // This is also not needed in standalone mode since standalone mode uses
- // crt1.c to invoke the main and is aware of __main_argc_argv mangling.
- generator.renameMainArgcArgv();
- }
-
- // Legalize the wasm, if BigInts don't make that moot.
- if (!bigInt) {
- BYN_TRACE("legalizing types\n");
- PassRunner passRunner(&wasm, options.passOptions);
- passRunner.setDebug(options.debug);
- passRunner.setDebugInfo(debugInfo);
- passRunner.add(ABI::getLegalizationPass(
- legalizeJavaScriptFFI ? ABI::LegalizationLevel::Full
- : ABI::LegalizationLevel::Minimal));
- passRunner.run();
- }
-
BYN_TRACE("generated metadata\n");
// Substantial changes to the wasm are done, enough to create the metadata.
std::string metadata =
@@ -326,21 +335,6 @@ int main(int argc, const char* argv[]) {
BYN_DEBUG_WITH_TYPE("emscripten-dump",
WasmPrinter::printModule(&wasm, std::cerr));
- // Strip target features section (its information is in the metadata)
- {
- PassRunner passRunner(&wasm);
- passRunner.add("strip-target-features");
- passRunner.run();
- }
-
- // If DWARF is unused, strip it out. This avoids us keeping it alive
- // until wasm-opt strips it later.
- if (!DWARF) {
- PassRunner passRunner(&wasm);
- passRunner.add("strip-dwarf");
- passRunner.run();
- }
-
Output output(outfile, emitBinary ? Flags::Binary : Flags::Text);
ModuleWriter writer;
writer.setDebugInfo(debugInfo);
diff --git a/test/lld/bigint.wat.out b/test/lld/bigint.wat.out
index d45da9dea..cbe8fb7a6 100644
--- a/test/lld/bigint.wat.out
+++ b/test/lld/bigint.wat.out
@@ -7,22 +7,22 @@
(global $global$0 (mut i32) (i32.const 66208))
(global $global$1 i32 (i32.const 658))
(export "__data_end" (global $global$1))
- (export "__growWasmMemory" (func $__growWasmMemory))
(export "dynCall_jj" (func $dynCall_jj))
+ (export "__growWasmMemory" (func $__growWasmMemory))
(func $foo (param $0 i64) (result i64)
(unreachable)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $dynCall_jj (param $fptr i32) (param $0 i64) (result i64)
(call_indirect (type $i64_=>_i64)
(local.get $0)
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -34,8 +34,8 @@
"externs": [
],
"exports": [
- "__growWasmMemory",
- "dynCall_jj"
+ "dynCall_jj",
+ "__growWasmMemory"
],
"namedGlobals": {
"__data_end" : "658"
diff --git a/test/lld/duplicate_imports.wat.out b/test/lld/duplicate_imports.wat.out
index 2163841ed..29ed9af65 100644
--- a/test/lld/duplicate_imports.wat.out
+++ b/test/lld/duplicate_imports.wat.out
@@ -33,11 +33,6 @@
(func $__wasm_call_ctors
(nop)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $legalfunc$puts2 (param $0 i64) (result i32)
(call $legalimport$puts2
(i32.wrap_i64
@@ -51,6 +46,11 @@
)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
diff --git a/test/lld/em_asm_table.wat.out b/test/lld/em_asm_table.wat.out
index 024298055..401cb86d4 100644
--- a/test/lld/em_asm_table.wat.out
+++ b/test/lld/em_asm_table.wat.out
@@ -12,14 +12,9 @@
(global $global$0 (mut i32) (i32.const 1024))
(global $global$1 i32 (i32.const 1048))
(export "__data_end" (global $global$1))
- (export "__growWasmMemory" (func $__growWasmMemory))
(export "dynCall_vii" (func $dynCall_vii))
(export "dynCall_iiii" (func $dynCall_iiii))
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
+ (export "__growWasmMemory" (func $__growWasmMemory))
(func $dynCall_vii (param $fptr i32) (param $0 i32) (param $1 i32)
(call_indirect (type $i32_i32_=>_none)
(local.get $0)
@@ -35,6 +30,11 @@
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -47,9 +47,9 @@
"externs": [
],
"exports": [
- "__growWasmMemory",
"dynCall_vii",
- "dynCall_iiii"
+ "dynCall_iiii",
+ "__growWasmMemory"
],
"namedGlobals": {
"__data_end" : "1048"
diff --git a/test/lld/main_module.wat.out b/test/lld/main_module.wat.out
index dbfe3510b..8d885bc2c 100644
--- a/test/lld/main_module.wat.out
+++ b/test/lld/main_module.wat.out
@@ -24,9 +24,9 @@
(export "ptr_puts" (global $global$0))
(export "ptr_local_func" (global $global$1))
(export "__data_end" (global $global))
+ (export "dynCall_i" (func $dynCall_i))
(export "__growWasmMemory" (func $__growWasmMemory))
(export "__assign_got_enties" (func $__assign_got_enties))
- (export "dynCall_i" (func $dynCall_i))
(func $__wasm_call_ctors
(call $__wasm_apply_relocs)
)
@@ -73,16 +73,16 @@
)
)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $dynCall_i (param $fptr i32) (result i32)
(call_indirect (type $none_=>_i32)
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -106,9 +106,9 @@
"exports": [
"__wasm_call_ctors",
"_Z13print_messagev",
+ "dynCall_i",
"__growWasmMemory",
- "__assign_got_enties",
- "dynCall_i"
+ "__assign_got_enties"
],
"namedGlobals": {
"ptr_puts" : "16",
diff --git a/test/lld/main_module_table.wat.out b/test/lld/main_module_table.wat.out
index 29fe19f04..2d58d5056 100644
--- a/test/lld/main_module_table.wat.out
+++ b/test/lld/main_module_table.wat.out
@@ -11,9 +11,9 @@
(global $sp (mut i32) (global.get $sp_import))
(export "__stdio_write" (func $__stdio_write))
(export "__data_end" (global $global))
+ (export "dynCall_v" (func $dynCall_v))
(export "__growWasmMemory" (func $__growWasmMemory))
(export "__assign_got_enties" (func $__assign_got_enties))
- (export "dynCall_v" (func $dynCall_v))
(func $__stdio_write
(nop)
)
@@ -25,16 +25,16 @@
)
)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $dynCall_v (param $fptr i32)
(call_indirect (type $none_=>_none)
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -52,9 +52,9 @@
],
"exports": [
"__stdio_write",
+ "dynCall_v",
"__growWasmMemory",
- "__assign_got_enties",
- "dynCall_v"
+ "__assign_got_enties"
],
"namedGlobals": {
"__data_end" : "42"
diff --git a/test/lld/main_module_table_2.wat.out b/test/lld/main_module_table_2.wat.out
index e08906f28..93b1ef3a6 100644
--- a/test/lld/main_module_table_2.wat.out
+++ b/test/lld/main_module_table_2.wat.out
@@ -11,9 +11,9 @@
(global $sp (mut i32) (global.get $sp_import))
(export "__stdio_write" (func $__stdio_write))
(export "__data_end" (global $global))
+ (export "dynCall_v" (func $dynCall_v))
(export "__growWasmMemory" (func $__growWasmMemory))
(export "__assign_got_enties" (func $__assign_got_enties))
- (export "dynCall_v" (func $dynCall_v))
(func $__stdio_write
(nop)
)
@@ -25,16 +25,16 @@
)
)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $dynCall_v (param $fptr i32)
(call_indirect (type $none_=>_none)
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -52,9 +52,9 @@
],
"exports": [
"__stdio_write",
+ "dynCall_v",
"__growWasmMemory",
- "__assign_got_enties",
- "dynCall_v"
+ "__assign_got_enties"
],
"namedGlobals": {
"__data_end" : "42"
diff --git a/test/lld/main_module_table_3.wat.out b/test/lld/main_module_table_3.wat.out
index 0905d9dcf..714b9b852 100644
--- a/test/lld/main_module_table_3.wat.out
+++ b/test/lld/main_module_table_3.wat.out
@@ -11,9 +11,9 @@
(global $sp (mut i32) (global.get $sp_import))
(export "__stdio_write" (func $__stdio_write))
(export "__data_end" (global $global))
+ (export "dynCall_v" (func $dynCall_v))
(export "__growWasmMemory" (func $__growWasmMemory))
(export "__assign_got_enties" (func $__assign_got_enties))
- (export "dynCall_v" (func $dynCall_v))
(func $__stdio_write
(nop)
)
@@ -25,16 +25,16 @@
)
)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $dynCall_v (param $fptr i32)
(call_indirect (type $none_=>_none)
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -52,9 +52,9 @@
],
"exports": [
"__stdio_write",
+ "dynCall_v",
"__growWasmMemory",
- "__assign_got_enties",
- "dynCall_v"
+ "__assign_got_enties"
],
"namedGlobals": {
"__data_end" : "42"
diff --git a/test/lld/main_module_table_4.wat.out b/test/lld/main_module_table_4.wat.out
index f2076f4e2..cffa7c1b6 100644
--- a/test/lld/main_module_table_4.wat.out
+++ b/test/lld/main_module_table_4.wat.out
@@ -11,9 +11,9 @@
(global $sp (mut i32) (global.get $sp_import))
(export "__stdio_write" (func $__stdio_write))
(export "__data_end" (global $global))
+ (export "dynCall_v" (func $dynCall_v))
(export "__growWasmMemory" (func $__growWasmMemory))
(export "__assign_got_enties" (func $__assign_got_enties))
- (export "dynCall_v" (func $dynCall_v))
(func $__stdio_write
(nop)
)
@@ -25,16 +25,16 @@
)
)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $dynCall_v (param $fptr i32)
(call_indirect (type $none_=>_none)
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -52,9 +52,9 @@
],
"exports": [
"__stdio_write",
+ "dynCall_v",
"__growWasmMemory",
- "__assign_got_enties",
- "dynCall_v"
+ "__assign_got_enties"
],
"namedGlobals": {
"__data_end" : "42"
diff --git a/test/lld/main_module_table_5.wat.out b/test/lld/main_module_table_5.wat.out
index 99f2a5fa1..a015b6081 100644
--- a/test/lld/main_module_table_5.wat.out
+++ b/test/lld/main_module_table_5.wat.out
@@ -11,9 +11,9 @@
(global $sp (mut i32) (global.get $sp_import))
(export "__stdio_write" (func $__stdio_write))
(export "__data_end" (global $global))
+ (export "dynCall_v" (func $dynCall_v))
(export "__growWasmMemory" (func $__growWasmMemory))
(export "__assign_got_enties" (func $__assign_got_enties))
- (export "dynCall_v" (func $dynCall_v))
(func $__stdio_write
(nop)
)
@@ -31,16 +31,16 @@
)
)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $dynCall_v (param $fptr i32)
(call_indirect (type $none_=>_none)
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -58,9 +58,9 @@
],
"exports": [
"__stdio_write",
+ "dynCall_v",
"__growWasmMemory",
- "__assign_got_enties",
- "dynCall_v"
+ "__assign_got_enties"
],
"namedGlobals": {
"__data_end" : "42"
diff --git a/test/lld/reserved_func_ptr.wat.out b/test/lld/reserved_func_ptr.wat.out
index 1ec059701..e49180a0f 100644
--- a/test/lld/reserved_func_ptr.wat.out
+++ b/test/lld/reserved_func_ptr.wat.out
@@ -17,8 +17,8 @@
(export "__wasm_call_ctors" (func $__wasm_call_ctors))
(export "main" (func $main))
(export "__data_end" (global $global$1))
- (export "__growWasmMemory" (func $__growWasmMemory))
(export "dynCall_viii" (func $dynCall_viii))
+ (export "__growWasmMemory" (func $__growWasmMemory))
(func $__wasm_call_ctors
(nop)
)
@@ -112,11 +112,6 @@
)
(i32.const 0)
)
- (func $__growWasmMemory (param $newSize i32) (result i32)
- (memory.grow
- (local.get $newSize)
- )
- )
(func $dynCall_viii (param $fptr i32) (param $0 i32) (param $1 i32) (param $2 i32)
(call_indirect (type $i32_i32_i32_=>_none)
(local.get $0)
@@ -125,6 +120,11 @@
(local.get $fptr)
)
)
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+ (memory.grow
+ (local.get $newSize)
+ )
+ )
)
(;
--BEGIN METADATA --
@@ -142,8 +142,8 @@
"exports": [
"__wasm_call_ctors",
"main",
- "__growWasmMemory",
- "dynCall_viii"
+ "dynCall_viii",
+ "__growWasmMemory"
],
"namedGlobals": {
"__data_end" : "568"
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 23:54:08 +0000