diff options
29 files changed, 32 insertions, 30 deletions
diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp index 5b5d557e7..58ef41c9b 100644 --- a/src/wasm/wasm-emscripten.cpp +++ b/src/wasm/wasm-emscripten.cpp @@ -736,8 +736,10 @@ std::string EmscriptenGlueGenerator::generateEmscriptenMetadata( meta << ", \"implementedFunctions\": ["; commaFirst = true; - for (const auto& func : wasm.functions) { - meta << maybeComma() << "\"_" << func->name.str << '"'; + for (const auto& ex : wasm.exports) { + if (ex->kind == ExternalKind::Function) { + meta << maybeComma() << "\"_" << ex->name.str << '"'; + } } meta << "]"; diff --git a/test/dot_s/alias.wast b/test/dot_s/alias.wast index 121df1a72..542be996a 100644 --- a/test/dot_s/alias.wast +++ b/test/dot_s/alias.wast @@ -66,4 +66,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 28, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["___exit","___needs_exit","___wasm_nullptr","_stackSave","_stackAlloc","_stackRestore","_dynCall_v"], "exports": ["__exit","__needs_exit","stackSave","stackAlloc","stackRestore","dynCall_v"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 28, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["___exit","___needs_exit","_stackSave","_stackAlloc","_stackRestore","_dynCall_v"], "exports": ["__exit","__needs_exit","stackSave","stackAlloc","stackRestore","dynCall_v"], "invokeFuncs": [] } diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast index c032a0a28..5a602368d 100644 --- a/test/dot_s/basics.wast +++ b/test/dot_s/basics.wast @@ -137,4 +137,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 52, "initializers": [], "declares": ["puts"], "externs": [], "implementedFunctions": ["_main","___wasm_nullptr","_stackSave","_stackAlloc","_stackRestore","_dynCall_iii"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_iii"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 52, "initializers": [], "declares": ["puts"], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore","_dynCall_iii"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_iii"], "invokeFuncs": [] } diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast index f4f146bd5..6881bae87 100644 --- a/test/dot_s/bcp-1.wast +++ b/test/dot_s/bcp-1.wast @@ -353,4 +353,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 104, "initializers": [], "declares": ["abort","exit"], "externs": [], "implementedFunctions": ["_bad0","_bad1","_bad2","_bad3","_bad4","_bad5","_bad6","_bad7","_bad8","_bad9","_bad10","_good0","_good1","_good2","_opt0","_opt1","_opt2","_main","___wasm_nullptr","_stackSave","_stackAlloc","_stackRestore","_dynCall_i","_dynCall_ii"], "exports": ["bad0","bad1","bad2","bad3","bad4","bad5","bad6","bad7","bad8","bad9","bad10","good0","good1","good2","opt0","opt1","opt2","main","stackSave","stackAlloc","stackRestore","dynCall_i","dynCall_ii"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 104, "initializers": [], "declares": ["abort","exit"], "externs": [], "implementedFunctions": ["_bad0","_bad1","_bad2","_bad3","_bad4","_bad5","_bad6","_bad7","_bad8","_bad9","_bad10","_good0","_good1","_good2","_opt0","_opt1","_opt2","_main","_stackSave","_stackAlloc","_stackRestore","_dynCall_i","_dynCall_ii"], "exports": ["bad0","bad1","bad2","bad3","bad4","bad5","bad6","bad7","bad8","bad9","bad10","good0","good1","good2","opt0","opt1","opt2","main","stackSave","stackAlloc","stackRestore","dynCall_i","dynCall_ii"], "invokeFuncs": [] } diff --git a/test/dot_s/dyncall.wast b/test/dot_s/dyncall.wast index c263dfc0d..4bbd9a204 100644 --- a/test/dot_s/dyncall.wast +++ b/test/dot_s/dyncall.wast @@ -100,4 +100,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_i","_i_f","_vd","_ffjjdi","_vd2","_main","___wasm_nullptr","_stackSave","_stackAlloc","_stackRestore","_dynCall_i","_dynCall_if","_dynCall_vd"], "exports": ["i","i_f","vd","ffjjdi","vd2","main","stackSave","stackAlloc","stackRestore","dynCall_i","dynCall_if","dynCall_vd"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_i","_i_f","_vd","_ffjjdi","_vd2","_main","_stackSave","_stackAlloc","_stackRestore","_dynCall_i","_dynCall_if","_dynCall_vd"], "exports": ["i","i_f","vd","ffjjdi","vd2","main","stackSave","stackAlloc","stackRestore","dynCall_i","dynCall_if","dynCall_vd"], "invokeFuncs": [] } diff --git a/test/dot_s/export_malloc_free.wast b/test/dot_s/export_malloc_free.wast index eb04afd11..9daf74f3c 100644 --- a/test/dot_s/export_malloc_free.wast +++ b/test/dot_s/export_malloc_free.wast @@ -56,4 +56,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","_malloc","_free","_realloc","_memalign","_not_a_malloc","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","malloc","free","realloc","memalign","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","_malloc","_free","_realloc","_memalign","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","malloc","free","realloc","memalign","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/fix_em_ehsjlj_names.wast b/test/dot_s/fix_em_ehsjlj_names.wast index 3fbac3936..cfa283a44 100644 --- a/test/dot_s/fix_em_ehsjlj_names.wast +++ b/test/dot_s/fix_em_ehsjlj_names.wast @@ -136,4 +136,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": ["emscripten_longjmp"], "externs": [], "implementedFunctions": ["__Z5func1v","__Z5func2iii","__Z5func3fd","__Z5func4P8mystructS_","_main","___wasm_nullptr","_stackSave","_stackAlloc","_stackRestore","_dynCall_v","_dynCall_iiii","_dynCall_ffd","_dynCall_iii"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_v","dynCall_iiii","dynCall_ffd","dynCall_iii"], "invokeFuncs": ["invoke_iii","invoke_ffd","invoke_iiii","invoke_v"] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": ["emscripten_longjmp"], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore","_dynCall_v","_dynCall_iiii","_dynCall_ffd","_dynCall_iii"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_v","dynCall_iiii","dynCall_ffd","dynCall_iii"], "invokeFuncs": ["invoke_iii","invoke_ffd","invoke_iiii","invoke_v"] } diff --git a/test/dot_s/hostFinalize.wast b/test/dot_s/hostFinalize.wast index c5865deff..825f29e4b 100644 --- a/test/dot_s/hostFinalize.wast +++ b/test/dot_s/hostFinalize.wast @@ -44,4 +44,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["__main","_stackSave","_stackAlloc","_stackRestore"], "exports": ["stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_stackSave","_stackAlloc","_stackRestore"], "exports": ["stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast index a31317079..21b3b160d 100644 --- a/test/dot_s/indidx.wast +++ b/test/dot_s/indidx.wast @@ -89,4 +89,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 32, "initializers": [], "declares": ["getchar"], "externs": [], "implementedFunctions": ["_a","_b","_c","_d","_main","___wasm_nullptr","_stackSave","_stackAlloc","_stackRestore","_dynCall_i"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_i"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 32, "initializers": [], "declares": ["getchar"], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore","_dynCall_i"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_i"], "invokeFuncs": [] } diff --git a/test/dot_s/indirect-import.wast b/test/dot_s/indirect-import.wast index 85d622efa..408e256cc 100644 --- a/test/dot_s/indirect-import.wast +++ b/test/dot_s/indirect-import.wast @@ -169,4 +169,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": ["extern_ijidf","extern_v","extern_vj","extern_fd","extern_struct","extern_sret"], "externs": [], "implementedFunctions": ["_bar","_baz","___wasm_nullptr","___importThunk_extern_fd","___importThunk_extern_vj","___importThunk_extern_v","___importThunk_extern_ijidf","___importThunk_extern_struct","___importThunk_extern_sret","_stackSave","_stackAlloc","_stackRestore","_dynCall_fd","_dynCall_v","_dynCall_vi"], "exports": ["bar","baz","stackSave","stackAlloc","stackRestore","dynCall_fd","dynCall_v","dynCall_vi"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": ["extern_ijidf","extern_v","extern_vj","extern_fd","extern_struct","extern_sret"], "externs": [], "implementedFunctions": ["_bar","_baz","_stackSave","_stackAlloc","_stackRestore","_dynCall_fd","_dynCall_v","_dynCall_vi"], "exports": ["bar","baz","stackSave","stackAlloc","stackRestore","dynCall_fd","dynCall_v","dynCall_vi"], "invokeFuncs": [] } diff --git a/test/dot_s/local_align.wast b/test/dot_s/local_align.wast index d581c8903..52db4a6ec 100644 --- a/test/dot_s/local_align.wast +++ b/test/dot_s/local_align.wast @@ -43,4 +43,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 172, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_foo","_main","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 172, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/memops.wast b/test/dot_s/memops.wast index fae318d64..e155ddc6b 100644 --- a/test/dot_s/memops.wast +++ b/test/dot_s/memops.wast @@ -238,4 +238,4 @@ ) ) ) -;; METADATA: { "asmConsts": {"0": ["{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }", ["v"]]},"staticBump": 67, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["__Z6reporti","_main","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {"0": ["{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }", ["v"]]},"staticBump": 67, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/reserved_func_ptrs.jscall.wast b/test/dot_s/reserved_func_ptrs.jscall.wast index ef037a189..d3dc05d18 100644 --- a/test/dot_s/reserved_func_ptrs.jscall.wast +++ b/test/dot_s/reserved_func_ptrs.jscall.wast @@ -278,4 +278,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "jsCallStartIndex": 3, "jsCallFuncType": ["ddi","fffi","iii","v","vi","viii"], "declares": ["atoi"], "externs": [], "implementedFunctions": ["__Z18address_taken_funciii","__Z19address_taken_func2iii","_main","___wasm_nullptr","_stackSave","_stackAlloc","_stackRestore","_dynCall_viii","_jsCall_ddi_0","_jsCall_ddi_1","_jsCall_ddi_2","_jsCall_fffi_0","_jsCall_fffi_1","_jsCall_fffi_2","_jsCall_iii_0","_jsCall_iii_1","_jsCall_iii_2","_jsCall_v_0","_jsCall_v_1","_jsCall_v_2","_jsCall_vi_0","_jsCall_vi_1","_jsCall_vi_2","_jsCall_viii_0","_jsCall_viii_1","_jsCall_viii_2"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_viii"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "jsCallStartIndex": 3, "jsCallFuncType": ["ddi","fffi","iii","v","vi","viii"], "declares": ["atoi"], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore","_dynCall_viii"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_viii"], "invokeFuncs": [] } diff --git a/test/dot_s/reserved_func_ptrs.wast b/test/dot_s/reserved_func_ptrs.wast index b06d4583d..ded33e78d 100644 --- a/test/dot_s/reserved_func_ptrs.wast +++ b/test/dot_s/reserved_func_ptrs.wast @@ -144,4 +144,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": ["atoi"], "externs": [], "implementedFunctions": ["__Z18address_taken_funciii","__Z19address_taken_func2iii","_main","___wasm_nullptr","_stackSave","_stackAlloc","_stackRestore","_dynCall_viii"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_viii"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": ["atoi"], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore","_dynCall_viii"], "exports": ["main","stackSave","stackAlloc","stackRestore","dynCall_viii"], "invokeFuncs": [] } diff --git a/test/dot_s/return.wast b/test/dot_s/return.wast index 309b3311b..d1688f797 100644 --- a/test/dot_s/return.wast +++ b/test/dot_s/return.wast @@ -50,4 +50,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_return_i32","_return_void","_fallthrough_return_nested_loop_i32","_stackSave","_stackAlloc","_stackRestore"], "exports": ["return_i32","return_void","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_return_i32","_return_void","_stackSave","_stackAlloc","_stackRestore"], "exports": ["return_i32","return_void","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/start_main0.wast b/test/dot_s/start_main0.wast index c8ef251bf..33905205a 100644 --- a/test/dot_s/start_main0.wast +++ b/test/dot_s/start_main0.wast @@ -41,4 +41,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","__start","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/start_main2.wast b/test/dot_s/start_main2.wast index 3b1b91189..716af3660 100644 --- a/test/dot_s/start_main2.wast +++ b/test/dot_s/start_main2.wast @@ -51,4 +51,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","__start","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/text_before_type.wast b/test/dot_s/text_before_type.wast index 67f82979c..f85b1ffde 100644 --- a/test/dot_s/text_before_type.wast +++ b/test/dot_s/text_before_type.wast @@ -41,4 +41,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","_foo","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_main","_stackSave","_stackAlloc","_stackRestore"], "exports": ["main","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/traps.clamp.wast b/test/dot_s/traps.clamp.wast index 493e03477..81bcec13b 100644 --- a/test/dot_s/traps.clamp.wast +++ b/test/dot_s/traps.clamp.wast @@ -109,4 +109,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_test_traps","_f32-to-int","_f64-to-uint","_i32u-div","_stackSave","_stackAlloc","_stackRestore"], "exports": ["test_traps","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_test_traps","_stackSave","_stackAlloc","_stackRestore"], "exports": ["test_traps","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/traps.js.wast b/test/dot_s/traps.js.wast index 1da8907f7..788663c91 100644 --- a/test/dot_s/traps.js.wast +++ b/test/dot_s/traps.js.wast @@ -61,4 +61,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": ["f64-to-int"], "externs": [], "implementedFunctions": ["_test_traps","_i32u-div","_stackSave","_stackAlloc","_stackRestore"], "exports": ["test_traps","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": ["f64-to-int"], "externs": [], "implementedFunctions": ["_test_traps","_stackSave","_stackAlloc","_stackRestore"], "exports": ["test_traps","stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/dot_s/unreachable_blocks.wast b/test/dot_s/unreachable_blocks.wast index 94dc2a254..240d07c38 100644 --- a/test/dot_s/unreachable_blocks.wast +++ b/test/dot_s/unreachable_blocks.wast @@ -119,4 +119,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_unreachable_block_void","_unreachable_block_i32","_unreachable_block_i64","_unreachable_block_f32","_unreachable_block_f64","_unreachable_loop_void","_unreachable_loop_i32","_unreachable_loop_i64","_unreachable_loop_f32","_unreachable_loop_f64","_stackSave","_stackAlloc","_stackRestore"], "exports": ["stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [], "declares": [], "externs": [], "implementedFunctions": ["_stackSave","_stackAlloc","_stackRestore"], "exports": ["stackSave","stackAlloc","stackRestore"], "invokeFuncs": [] } diff --git a/test/lld/em_asm.wast.out b/test/lld/em_asm.wast.out index 91717d7c1..487551ee6 100644 --- a/test/lld/em_asm.wast.out +++ b/test/lld/em_asm.wast.out @@ -75,4 +75,4 @@ ) ) ) -;; METADATA: { "asmConsts": {"2": ["{ Module.print(\"Got \" + $0); }", ["ii"]],"0": ["{ Module.print(\"Hello world\"); }", ["i"]],"1": ["{ return $0 + $1; }", ["iii"]]},"staticBump": 84, "initializers": ["__wasm_call_ctors"], "declares": [], "externs": [], "implementedFunctions": ["_main","___wasm_call_ctors","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {"2": ["{ Module.print(\"Got \" + $0); }", ["ii"]],"0": ["{ Module.print(\"Hello world\"); }", ["i"]],"1": ["{ return $0 + $1; }", ["iii"]]},"staticBump": 84, "initializers": ["__wasm_call_ctors"], "declares": [], "externs": [], "implementedFunctions": ["___wasm_call_ctors","_main","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory"], "invokeFuncs": [] } diff --git a/test/lld/hello_world.wast.out b/test/lld/hello_world.wast.out index 04d6334c5..86d75ff3a 100644 --- a/test/lld/hello_world.wast.out +++ b/test/lld/hello_world.wast.out @@ -59,4 +59,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 13, "initializers": ["__wasm_call_ctors"], "declares": ["puts"], "externs": [], "implementedFunctions": ["_main","___wasm_call_ctors","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 13, "initializers": ["__wasm_call_ctors"], "declares": ["puts"], "externs": [], "implementedFunctions": ["___wasm_call_ctors","_main","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory"], "invokeFuncs": [] } diff --git a/test/lld/init.wast.out b/test/lld/init.wast.out index 19b2d5e99..b0c97195a 100644 --- a/test/lld/init.wast.out +++ b/test/lld/init.wast.out @@ -71,4 +71,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 8, "initializers": ["__wasm_call_ctors"], "declares": [], "externs": [], "implementedFunctions": ["_init_x","_init_y","_main","___wasm_call_ctors","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 8, "initializers": ["__wasm_call_ctors"], "declares": [], "externs": [], "implementedFunctions": ["___wasm_call_ctors","_main","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory"], "invokeFuncs": [] } diff --git a/test/lld/recursive.wast.out b/test/lld/recursive.wast.out index 42719ebd3..47527d058 100644 --- a/test/lld/recursive.wast.out +++ b/test/lld/recursive.wast.out @@ -117,4 +117,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 19, "initializers": ["__wasm_call_ctors"], "declares": ["printf"], "externs": [], "implementedFunctions": ["_foo","_main","___wasm_call_ctors","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 19, "initializers": ["__wasm_call_ctors"], "declares": ["printf"], "externs": [], "implementedFunctions": ["___wasm_call_ctors","_main","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory"], "invokeFuncs": [] } diff --git a/test/lld/reserved_func_ptr.wast.jscall.out b/test/lld/reserved_func_ptr.wast.jscall.out index 6a60843c7..c688e69f2 100644 --- a/test/lld/reserved_func_ptr.wast.jscall.out +++ b/test/lld/reserved_func_ptr.wast.jscall.out @@ -294,4 +294,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 0, "initializers": ["__wasm_call_ctors"], "jsCallStartIndex": 2, "jsCallFuncType": ["ddi","fffi","iii","v","vi","viii"], "declares": ["_Z4atoiPKc"], "externs": [], "implementedFunctions": ["__Z18address_taken_funciii","__Z19address_taken_func2iii","_main","___wasm_call_ctors","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory","_dynCall_viii","_jsCall_ddi_0","_jsCall_ddi_1","_jsCall_ddi_2","_jsCall_fffi_0","_jsCall_fffi_1","_jsCall_fffi_2","_jsCall_iii_0","_jsCall_iii_1","_jsCall_iii_2","_jsCall_v_0","_jsCall_v_1","_jsCall_v_2","_jsCall_vi_0","_jsCall_vi_1","_jsCall_vi_2","_jsCall_viii_0","_jsCall_viii_1","_jsCall_viii_2"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory","dynCall_viii"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 0, "initializers": ["__wasm_call_ctors"], "jsCallStartIndex": 2, "jsCallFuncType": ["ddi","fffi","iii","v","vi","viii"], "declares": ["_Z4atoiPKc"], "externs": [], "implementedFunctions": ["___wasm_call_ctors","_main","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory","_dynCall_viii"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory","dynCall_viii"], "invokeFuncs": [] } diff --git a/test/lld/reserved_func_ptr.wast.out b/test/lld/reserved_func_ptr.wast.out index 58a48ef6a..c94b4fdd6 100644 --- a/test/lld/reserved_func_ptr.wast.out +++ b/test/lld/reserved_func_ptr.wast.out @@ -155,4 +155,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 0, "initializers": ["__wasm_call_ctors"], "declares": ["_Z4atoiPKc"], "externs": [], "implementedFunctions": ["__Z18address_taken_funciii","__Z19address_taken_func2iii","_main","___wasm_call_ctors","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory","_dynCall_viii"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory","dynCall_viii"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 0, "initializers": ["__wasm_call_ctors"], "declares": ["_Z4atoiPKc"], "externs": [], "implementedFunctions": ["___wasm_call_ctors","_main","_stackSave","_stackAlloc","_stackRestore","___growWasmMemory","_dynCall_viii"], "exports": ["memory","__wasm_call_ctors","main","__heap_base","__data_end","stackSave","stackAlloc","stackRestore","__growWasmMemory","dynCall_viii"], "invokeFuncs": [] } diff --git a/test/llvm_autogenerated/indirect-import.wast b/test/llvm_autogenerated/indirect-import.wast index 44195cb6e..012b4f69b 100644 --- a/test/llvm_autogenerated/indirect-import.wast +++ b/test/llvm_autogenerated/indirect-import.wast @@ -169,4 +169,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 1040, "initializers": [], "declares": ["extern_ijidf","extern_v","extern_vj","extern_fd","extern_struct","extern_sret"], "externs": [], "implementedFunctions": ["_bar","___wasm_nullptr","___importThunk_extern_fd","___importThunk_extern_vj","___importThunk_extern_v","___importThunk_extern_ijidf","___importThunk_extern_struct","___importThunk_extern_sret","_stackSave","_stackAlloc","_stackRestore","_dynCall_fd","_dynCall_v","_dynCall_vi"], "exports": ["bar","stackSave","stackAlloc","stackRestore","dynCall_fd","dynCall_v","dynCall_vi"], "invokeFuncs": [] } +;; METADATA: { "asmConsts": {},"staticBump": 1040, "initializers": [], "declares": ["extern_ijidf","extern_v","extern_vj","extern_fd","extern_struct","extern_sret"], "externs": [], "implementedFunctions": ["_bar","_stackSave","_stackAlloc","_stackRestore","_dynCall_fd","_dynCall_v","_dynCall_vi"], "exports": ["bar","stackSave","stackAlloc","stackRestore","dynCall_fd","dynCall_v","dynCall_vi"], "invokeFuncs": [] } diff --git a/test/llvm_autogenerated/lower-em-ehsjlj-options.wast b/test/llvm_autogenerated/lower-em-ehsjlj-options.wast index 0c165fb65..112e1825e 100644 --- a/test/llvm_autogenerated/lower-em-ehsjlj-options.wast +++ b/test/llvm_autogenerated/lower-em-ehsjlj-options.wast @@ -149,4 +149,4 @@ ) ) ) -;; METADATA: { "asmConsts": {},"staticBump": 1056, "initializers": [], "declares": ["__cxa_begin_catch","__cxa_end_catch","__cxa_find_matching_catch_3","longjmp","setjmp","foo"], "externs": [], "implementedFunctions": ["_exception","_setjmp_longjmp","_setThrew","_setTempRet0","___wasm_nullptr","___importThunk_foo","_stackSave","_stackAlloc","_stackRestore","_dynCall_v"], "exports": ["exception","setjmp_longjmp","setThrew","setTempRet0","stackSave","stackAlloc","stackRestore","dynCall_v"], "invokeFuncs": ["invoke_v"] } +;; METADATA: { "asmConsts": {},"staticBump": 1056, "initializers": [], "declares": ["__cxa_begin_catch","__cxa_end_catch","__cxa_find_matching_catch_3","longjmp","setjmp","foo"], "externs": [], "implementedFunctions": ["_exception","_setjmp_longjmp","_setThrew","_setTempRet0","_stackSave","_stackAlloc","_stackRestore","_dynCall_v"], "exports": ["exception","setjmp_longjmp","setThrew","setTempRet0","stackSave","stackAlloc","stackRestore","dynCall_v"], "invokeFuncs": ["invoke_v"] } |