watr 2.2.3 → 2.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "watr",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "Ligth & fast WAT compiler",
   "main": "watr.js",
   "exports": {

package/src/compile.js

@@ -2,7 +2,7 @@ import { uleb, leb, bigleb, f64, f32 } from './util.js'
 import { OP, SECTION, ALIGN, TYPE, KIND } from './const.js'
 import parse from './parse.js'
 
-const OP_END = 0xb, OP_I32_CONST = 0x41, OP_I64_CONST = 0x42, OP_F32_CONST = 0x43, OP_F64_CONST = 0x44
+const OP_END = 0xb, OP_I32_CONST = 0x41, OP_I64_CONST = 0x42, OP_F32_CONST = 0x43, OP_F64_CONST = 0x44, OP_SKIP = 0x6
 
 /**
  * Converts a WebAssembly Text Format (WAT) tree to a WebAssembly binary format (Wasm).
@@ -121,8 +121,21 @@ const build = {
 
       // NOTE: numeric comparison is faster than generic hash lookup
 
+
+      // bulk memory: (memory.init) (memory.copy) etc
+      // https://github.com/WebAssembly/bulk-memory-operations/blob/master/proposals/bulk-memory-operations/Overview.md#instruction-encoding
+      if (opCode >= 252) {
+        immed = [0xfc, opCode %= 252]
+        // memory.init idx, memory.drop idx, table.init idx, table.drop idx
+        if (!(opCode & 0b10)) immed.push(...uleb(args.shift()))
+        else immed.push(0)
+        // even opCodes (memory.init, memory.copy, table.init, table.copy) have 2nd predefined immediate
+        if (!(opCode & 0b1)) immed.push(0)
+        opCode = null // ignore opcode
+      }
+
       // binary/unary - just consume immed
-      if (opCode >= 69 && opCode <= 252) { }
+      else if (opCode >= 69) { }
 
       // (i32.store align=n offset=m at value)
       else if (opCode >= 40 && opCode <= 62) {
@@ -161,7 +174,7 @@ const build = {
         immed = uleb(typeId), immed.push(0) // extra immediate indicates table idx (reserved)
       }
 
-      // FIXME (memory.grow $idx?)
+      // FIXME multiple memory (memory.grow $idx?)
       else if (opCode == 63 || opCode == 64) {
         immed = [0]
       }
@@ -213,6 +226,10 @@ const build = {
         // (else xxx) -> else xxx
         if (group) while (args.length) nodes.unshift(args.pop())
       }
+      // (then)
+      else if (opCode === 6) {
+        opCode = null // ignore opcode
+      }
 
       // (end)
       else if (opCode == 0x0b) blocks.pop()
@@ -230,6 +247,7 @@ const build = {
         while (!Array.isArray(args[0])) id = args.shift(), immed.push(...uleb(id[0][0] === '$' ? blocks.length - blocks[id] : id))
         immed.unshift(...uleb(immed.length - 1))
       }
+      else if (opCode < 0) err(`Unknown instruction \`${op}\``)
 
       // if group (cmd im1 im2 arg1 arg2) - insert any remaining args first: arg1 arg2
       // because inline case has them in stack already
@@ -237,20 +255,7 @@ const build = {
         while (args.length) consume(args, out)
       }
 
-      // ignore (then) and other unknown (-1) instructions
-      if (opCode >= 0) {
-        // bulk memory: (memory.init) (memory.copy) etc
-        // https://github.com/WebAssembly/bulk-memory-operations/blob/master/proposals/bulk-memory-operations/Overview.md#instruction-encoding
-        if (opCode >= 252) {
-          opCode %= 252
-          out.push(0xfc)
-          immed = [0]
-          // even opCodes (memory.init, memory.copy, table.init, table.copy) have 2 immediates
-          if (!(opCode % 2)) immed.push(0)
-        }
-
-        out.push(opCode)
-      }
+      if (opCode) out.push(opCode)
       if (immed) out.push(...immed)
     }
 

package/src/const.js

@@ -1,7 +1,7 @@
 // ref: https://github.com/stagas/wat-compiler/blob/main/lib/const.js
 // NOTE: squashing into a string doesn't save up gzipped size
 export const OP = [
-  'unreachable', 'nop', 'block', 'loop', 'if', 'else', , , , , ,
+  'unreachable', 'nop', 'block', 'loop', 'if', 'else', 'then', , , , ,
   'end', 'br', 'br_if', 'br_table', 'return', 'call', 'call_indirect', , , , , , , , ,
   'drop', 'select', , , , ,
   'local.get', 'local.set', 'local.tee', 'global.get', 'global.set', , , ,
@@ -25,7 +25,8 @@ export const OP = [
   'i64.trunc_f32_s', 'i64.trunc_f32_u', 'i64.trunc_f64_s', 'i64.trunc_f64_u',
   'f32.convert_i32_s', 'f32.convert_i32_u', 'f32.convert_i64_s', 'f32.convert_i64_u', 'f32.demote_f64',
   'f64.convert_i32_s', 'f64.convert_i32_u', 'f64.convert_i64_s', 'f64.convert_i64_u', 'f64.promote_f32',
-  'i32.reinterpret_f32', 'i64.reinterpret_f64', 'f32.reinterpret_i32', 'f64.reinterpret_i64', , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , 'memory.init', 'data.drop', 'memory.copy', 'memory.fill', 'table.init', 'elem.drop', 'table.copy'
+  'i32.reinterpret_f32', 'i64.reinterpret_f64', 'f32.reinterpret_i32', 'f64.reinterpret_i64', , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,
+  'memory.init', 'data.drop', 'memory.copy', 'memory.fill', 'table.init', 'elem.drop', 'table.copy'
 ],
   SECTION = { type: 1, import: 2, func: 3, table: 4, memory: 5, global: 6, export: 7, start: 8, elem: 9, code: 10, data: 11 },
   TYPE = { i32: 0x7f, i64: 0x7e, f32: 0x7d, f64: 0x7c, void: 0x40, func: 0x60, funcref: 0x70 },

package/src/util.js

@@ -57,10 +57,9 @@ const flt = input => {
   input = input.replaceAll('_', '')
 
   // 0x1.5p3
-  if (/^[+-]?0x/.test(input)) {
-    let sign = input[0] === '-' ? (input = input.slice(1), -1) : 1,
-      [sig, exp] = input.split(/p/i), [dec, fract] = sig.split('.')
-    sig = parseInt(dec) + (fract ? parseInt(fract, 16) / (16 ** fract.length) : 0)
+  if (input.includes('0x')) {
+    let [sig, exp] = input.split(/p/i), [dec, fract] = sig.split('.'), sign = dec[0] === '-' ? -1 : 1
+    sig = parseInt(dec) * sign + (fract ? parseInt(fract, 16) / (16 ** fract.length) : 0)
     return sign * (exp ? sig * 2 ** parseInt(exp, 10) : sig);
   }