Add a --standalone-wasm flag to wasm-emscripten-finalize (#2333)

The flag indicates that we want to run the wasm by itself, without JS support. In that case we don't emit JS dynCalls etc., and we also emit a wasi _start if there is a main, i.e., we try to use the current conventions in the wasm-only space.

6 files changed, 327 insertions, 0 deletions

diff --git a/test/lld/standalone-wasm.wast b/test/lld/standalone-wasm.wast
new file mode 100644
index 000000000..2ccbf3f29
--- /dev/null
+++ b/test/lld/standalone-wasm.wast
@@ -0,0 +1,20 @@
+(module
+ (memory $0 2)
+ (table $0 1 1 funcref)
+ (elem (i32.const 0) $foo)
+ (global $global$0 (mut i32) (i32.const 66112))
+ (global $global$1 i32 (i32.const 66112))
+ (global $global$2 i32 (i32.const 576))
+ (export "memory" (memory $0))
+ (export "main" (func $main))
+ (export "__heap_base" (global $global$1))
+ (export "__data_end" (global $global$2))
+ (func $__original_main (result i32)
+  (nop)
+ )
+ (func $main (param $0 i32) (param $1 i32) (result i32)
+  (call $__original_main)
+ )
+ (func $foo (result i32))
+)
+
diff --git a/test/lld/standalone-wasm.wast.out b/test/lld/standalone-wasm.wast.out
new file mode 100644
index 000000000..5e9fa4c91
--- /dev/null
+++ b/test/lld/standalone-wasm.wast.out
@@ -0,0 +1,101 @@
+(module
+ (type $FUNCSIG$i (func (result i32)))
+ (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
+ (memory $0 2)
+ (table $0 1 1 funcref)
+ (elem (i32.const 0) $foo)
+ (global $global$0 (mut i32) (i32.const 66112))
+ (global $global$1 i32 (i32.const 66112))
+ (global $global$2 i32 (i32.const 576))
+ (export "memory" (memory $0))
+ (export "main" (func $main))
+ (export "__heap_base" (global $global$1))
+ (export "__data_end" (global $global$2))
+ (export "stackSave" (func $stackSave))
+ (export "stackAlloc" (func $stackAlloc))
+ (export "stackRestore" (func $stackRestore))
+ (export "__growWasmMemory" (func $__growWasmMemory))
+ (export "_start" (func $_start))
+ (func $__original_main (; 0 ;) (type $FUNCSIG$i) (result i32)
+  (nop)
+ )
+ (func $main (; 1 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+  (call $__original_main)
+ )
+ (func $foo (; 2 ;) (type $FUNCSIG$i) (result i32)
+  (nop)
+ )
+ (func $stackSave (; 3 ;) (result i32)
+  (global.get $global$0)
+ )
+ (func $stackAlloc (; 4 ;) (param $0 i32) (result i32)
+  (local $1 i32)
+  (global.set $global$0
+   (local.tee $1
+    (i32.and
+     (i32.sub
+      (global.get $global$0)
+      (local.get $0)
+     )
+     (i32.const -16)
+    )
+   )
+  )
+  (local.get $1)
+ )
+ (func $stackRestore (; 5 ;) (param $0 i32)
+  (global.set $global$0
+   (local.get $0)
+  )
+ )
+ (func $__growWasmMemory (; 6 ;) (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
+ (func $_start (; 7 ;)
+  (drop
+   (call $main
+    (i32.const 0)
+    (i32.const 0)
+   )
+  )
+ )
+)
+(;
+--BEGIN METADATA --
+{
+  "staticBump": 8,
+  "tableSize": 1,
+  "declares": [
+  ],
+  "externs": [
+  ],
+  "implementedFunctions": [
+    "_main",
+    "_stackSave",
+    "_stackAlloc",
+    "_stackRestore",
+    "___growWasmMemory",
+    "__start"
+  ],
+  "exports": [
+    "main",
+    "stackSave",
+    "stackAlloc",
+    "stackRestore",
+    "__growWasmMemory",
+    "_start"
+  ],
+  "namedGlobals": {
+    "__heap_base" : "66112",
+    "__data_end" : "576"
+  },
+  "invokeFuncs": [
+  ],
+  "features": [
+  ],
+  "mainReadsParams": 0
+}
+-- END METADATA --
+;)
diff --git a/test/lld/standalone-wasm2.wast b/test/lld/standalone-wasm2.wast
new file mode 100644
index 000000000..f4c7843b6
--- /dev/null
+++ b/test/lld/standalone-wasm2.wast
@@ -0,0 +1,17 @@
+(module
+ (memory $0 2)
+ (global $global$0 (mut i32) (i32.const 66112))
+ (global $global$1 i32 (i32.const 66112))
+ (global $global$2 i32 (i32.const 576))
+ (export "memory" (memory $0))
+ (export "main" (func $main))
+ (export "__heap_base" (global $global$1))
+ (export "__data_end" (global $global$2))
+ (func $__original_main (param $0 i32) (param $1 i32) (result i32)
+  (nop)
+ )
+ (func $main (param $0 i32) (param $1 i32) (result i32)
+  (call $__original_main (local.get $0) (local.get $1))
+ )
+)
+
diff --git a/test/lld/standalone-wasm2.wast.out b/test/lld/standalone-wasm2.wast.out
new file mode 100644
index 000000000..fe669b414
--- /dev/null
+++ b/test/lld/standalone-wasm2.wast.out
@@ -0,0 +1,98 @@
+(module
+ (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
+ (memory $0 2)
+ (global $global$0 (mut i32) (i32.const 66112))
+ (global $global$1 i32 (i32.const 66112))
+ (global $global$2 i32 (i32.const 576))
+ (export "memory" (memory $0))
+ (export "main" (func $main))
+ (export "__heap_base" (global $global$1))
+ (export "__data_end" (global $global$2))
+ (export "stackSave" (func $stackSave))
+ (export "stackAlloc" (func $stackAlloc))
+ (export "stackRestore" (func $stackRestore))
+ (export "__growWasmMemory" (func $__growWasmMemory))
+ (export "_start" (func $_start))
+ (func $__original_main (; 0 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+  (nop)
+ )
+ (func $main (; 1 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+  (call $__original_main
+   (local.get $0)
+   (local.get $1)
+  )
+ )
+ (func $stackSave (; 2 ;) (result i32)
+  (global.get $global$0)
+ )
+ (func $stackAlloc (; 3 ;) (param $0 i32) (result i32)
+  (local $1 i32)
+  (global.set $global$0
+   (local.tee $1
+    (i32.and
+     (i32.sub
+      (global.get $global$0)
+      (local.get $0)
+     )
+     (i32.const -16)
+    )
+   )
+  )
+  (local.get $1)
+ )
+ (func $stackRestore (; 4 ;) (param $0 i32)
+  (global.set $global$0
+   (local.get $0)
+  )
+ )
+ (func $__growWasmMemory (; 5 ;) (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
+ (func $_start (; 6 ;)
+  (drop
+   (call $main
+    (i32.const 0)
+    (i32.const 0)
+   )
+  )
+ )
+)
+(;
+--BEGIN METADATA --
+{
+  "staticBump": 8,
+  "tableSize": 0,
+  "declares": [
+  ],
+  "externs": [
+  ],
+  "implementedFunctions": [
+    "_main",
+    "_stackSave",
+    "_stackAlloc",
+    "_stackRestore",
+    "___growWasmMemory",
+    "__start"
+  ],
+  "exports": [
+    "main",
+    "stackSave",
+    "stackAlloc",
+    "stackRestore",
+    "__growWasmMemory",
+    "_start"
+  ],
+  "namedGlobals": {
+    "__heap_base" : "66112",
+    "__data_end" : "576"
+  },
+  "invokeFuncs": [
+  ],
+  "features": [
+  ],
+  "mainReadsParams": 1
+}
+-- END METADATA --
+;)
diff --git a/test/lld/standalone-wasm3.wast b/test/lld/standalone-wasm3.wast
new file mode 100644
index 000000000..45c0bed35
--- /dev/null
+++ b/test/lld/standalone-wasm3.wast
@@ -0,0 +1,13 @@
+(module
+ (memory $0 2)
+ (global $global$0 (mut i32) (i32.const 66112))
+ (global $global$1 i32 (i32.const 66112))
+ (global $global$2 i32 (i32.const 576))
+ (export "memory" (memory $0))
+ (export "__heap_base" (global $global$1))
+ (export "__data_end" (global $global$2))
+ (func $__original_main (param $0 i32) (param $1 i32) (result i32)
+  (nop)
+ )
+)
+
diff --git a/test/lld/standalone-wasm3.wast.out b/test/lld/standalone-wasm3.wast.out
new file mode 100644
index 000000000..a334d96e4
--- /dev/null
+++ b/test/lld/standalone-wasm3.wast.out
@@ -0,0 +1,78 @@
+(module
+ (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
+ (memory $0 2)
+ (global $global$0 (mut i32) (i32.const 66112))
+ (global $global$1 i32 (i32.const 66112))
+ (global $global$2 i32 (i32.const 576))
+ (export "memory" (memory $0))
+ (export "__heap_base" (global $global$1))
+ (export "__data_end" (global $global$2))
+ (export "stackSave" (func $stackSave))
+ (export "stackAlloc" (func $stackAlloc))
+ (export "stackRestore" (func $stackRestore))
+ (export "__growWasmMemory" (func $__growWasmMemory))
+ (func $__original_main (; 0 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+  (nop)
+ )
+ (func $stackSave (; 1 ;) (result i32)
+  (global.get $global$0)
+ )
+ (func $stackAlloc (; 2 ;) (param $0 i32) (result i32)
+  (local $1 i32)
+  (global.set $global$0
+   (local.tee $1
+    (i32.and
+     (i32.sub
+      (global.get $global$0)
+      (local.get $0)
+     )
+     (i32.const -16)
+    )
+   )
+  )
+  (local.get $1)
+ )
+ (func $stackRestore (; 3 ;) (param $0 i32)
+  (global.set $global$0
+   (local.get $0)
+  )
+ )
+ (func $__growWasmMemory (; 4 ;) (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
+)
+(;
+--BEGIN METADATA --
+{
+  "staticBump": 8,
+  "tableSize": 0,
+  "declares": [
+  ],
+  "externs": [
+  ],
+  "implementedFunctions": [
+    "_stackSave",
+    "_stackAlloc",
+    "_stackRestore",
+    "___growWasmMemory"
+  ],
+  "exports": [
+    "stackSave",
+    "stackAlloc",
+    "stackRestore",
+    "__growWasmMemory"
+  ],
+  "namedGlobals": {
+    "__heap_base" : "66112",
+    "__data_end" : "576"
+  },
+  "invokeFuncs": [
+  ],
+  "features": [
+  ],
+  "mainReadsParams": 0
+}
+-- END METADATA --
+;)