From f109f3cae1cd81db22ba490a4da17a7a4c495047 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 30 Aug 2018 16:10:26 -0700 Subject: Rename `wasm2asm` to `wasm2js`, emit ESM by default (#1642) * Rename the `wasm2asm` tool to `wasm2js` This commit performs a relatively simple rename of the `wasm2asm` tool to `wasm2js`. The functionality of the tool doesn't change just yet but it's intended that we'll start generating an ES module instead of just an `asm.js` function soon. * wasm2js: Support `*.wasm` input files Previously `wasm2js` only supported `*.wast` files but to make it a bit easier to use in tooling pipelines this commit adds support for reading in a `*.wasm` file directly. Determining which parser to use depends on the input filename, where the binary parser is used with `*.wasm` files and the wast parser is used for all other files. * wasm2js: Emit ESM imports/exports by default This commit alters the default behavior of `wasm2js` to emit an ESM by default, either importing items from the environment or exporting. Items like initialization of memory are also handled here. --- check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'check.py') diff --git a/check.py b/check.py index f5e8b104a..907c14b16 100755 --- a/check.py +++ b/check.py @@ -31,7 +31,7 @@ from scripts.test.shared import ( import scripts.test.asm2wasm as asm2wasm import scripts.test.lld as lld -import scripts.test.wasm2asm as wasm2asm +import scripts.test.wasm2js as wasm2js if options.interpreter: print '[ using wasm interpreter at "%s" ]' % options.interpreter @@ -648,7 +648,7 @@ def main(): run_spec_tests() run_binaryen_js_tests() lld.test_wasm_emscripten_finalize() - wasm2asm.test_wasm2asm() + wasm2js.test_wasm2js() run_validator_tests() if has_vanilla_emcc and has_vanilla_llvm and 0: run_vanilla_tests() -- cgit v1.2.3