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. --- test/wasm2asm/func-ptr-offset.2asm.js | 49 ----------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 test/wasm2asm/func-ptr-offset.2asm.js (limited to 'test/wasm2asm/func-ptr-offset.2asm.js') diff --git a/test/wasm2asm/func-ptr-offset.2asm.js b/test/wasm2asm/func-ptr-offset.2asm.js deleted file mode 100644 index f2cd80ed4..000000000 --- a/test/wasm2asm/func-ptr-offset.2asm.js +++ /dev/null @@ -1,49 +0,0 @@ -function asmFunc(global, env, buffer) { - "use asm"; - var HEAP8 = new global.Int8Array(buffer); - var HEAP16 = new global.Int16Array(buffer); - var HEAP32 = new global.Int32Array(buffer); - var HEAPU8 = new global.Uint8Array(buffer); - var HEAPU16 = new global.Uint16Array(buffer); - var HEAPU32 = new global.Uint32Array(buffer); - var HEAPF32 = new global.Float32Array(buffer); - var HEAPF64 = new global.Float64Array(buffer); - var Math_imul = global.Math.imul; - var Math_fround = global.Math.fround; - var Math_abs = global.Math.abs; - var Math_clz32 = global.Math.clz32; - var Math_min = global.Math.min; - var Math_max = global.Math.max; - var Math_floor = global.Math.floor; - var Math_ceil = global.Math.ceil; - var Math_sqrt = global.Math.sqrt; - var abort = env.abort; - var nan = global.NaN; - var infinity = global.Infinity; - var i64toi32_i32$HIGH_BITS = 0; - function t1() { - return 1 | 0; - } - - function t2() { - return 2 | 0; - } - - function t3() { - return 3 | 0; - } - - function $3($0) { - $0 = $0 | 0; - var wasm2asm_i32$0 = 0, wasm2asm_i32$1 = 0; - wasm2asm_i32$1 = $0; - wasm2asm_i32$0 = FUNCTION_TABLE_i[wasm2asm_i32$1 & 3]() | 0; - return wasm2asm_i32$0 | 0; - } - - var FUNCTION_TABLE_i = [t1, t1, t2, t3]; - return { - call: $3 - }; -} - -- cgit v1.2.3