@grain/stdlib 0.4.1 → 0.4.5

package/runtime/unsafe/conv.gr

@@ -6,13 +6,13 @@ import WasmF64 from "runtime/unsafe/wasmf64"
 import Tags from "runtime/unsafe/tags"
 
 @disableGC
-export let toInt32 = (n) => {
+export let toInt32 = n => {
   let ptr = Memory.malloc(12n)
   WasmI32.store(ptr, Tags._GRAIN_BOXED_NUM_HEAP_TAG, 0n)
   WasmI32.store(ptr, Tags._GRAIN_INT32_BOXED_NUM_TAG, 4n)
   WasmI32.store(ptr, n, 8n)
 
-  WasmI32.toGrain(ptr) : Int32
+  WasmI32.toGrain(ptr): Int32
 }
 
 @disableGC
@@ -22,13 +22,13 @@ export let fromInt32 = (n: Int32) => {
 }
 
 @disableGC
-export let toInt64 = (n) => {
+export let toInt64 = n => {
   let ptr = Memory.malloc(16n)
   WasmI32.store(ptr, Tags._GRAIN_BOXED_NUM_HEAP_TAG, 0n)
   WasmI32.store(ptr, Tags._GRAIN_INT64_BOXED_NUM_TAG, 4n)
   WasmI64.store(ptr, n, 8n)
 
-  WasmI32.toGrain(ptr) : Int64
+  WasmI32.toGrain(ptr): Int64
 }
 
 @disableGC
@@ -38,13 +38,13 @@ export let fromInt64 = (n: Int64) => {
 }
 
 @disableGC
-export let toFloat32 = (n) => {
+export let toFloat32 = n => {
   let ptr = Memory.malloc(12n)
   WasmI32.store(ptr, Tags._GRAIN_BOXED_NUM_HEAP_TAG, 0n)
   WasmI32.store(ptr, Tags._GRAIN_FLOAT32_BOXED_NUM_TAG, 4n)
   WasmF32.store(ptr, n, 8n)
 
-  WasmI32.toGrain(ptr) : Float32
+  WasmI32.toGrain(ptr): Float32
 }
 
 @disableGC
@@ -54,13 +54,13 @@ export let fromFloat32 = (n: Float32) => {
 }
 
 @disableGC
-export let toFloat64 = (n) => {
+export let toFloat64 = n => {
   let ptr = Memory.malloc(16n)
   WasmI32.store(ptr, Tags._GRAIN_BOXED_NUM_HEAP_TAG, 0n)
   WasmI32.store(ptr, Tags._GRAIN_FLOAT64_BOXED_NUM_TAG, 4n)
   WasmF64.store(ptr, n, 8n)
 
-  WasmI32.toGrain(ptr) : Float64
+  WasmI32.toGrain(ptr): Float64
 }
 
 @disableGC
@@ -68,3 +68,46 @@ export let fromFloat64 = (n: Float64) => {
   let ptr = WasmI32.fromGrain(n)
   WasmF64.load(ptr, 8n)
 }
+
+/**
+ * Converts a WasmI32 value to Number.
+ * 
+ * This function is meant to be called from a `@disableGC` context without
+ * need to call incRef on the function.
+ * 
+ * @param n: The WasmI32 to convert
+ * @returns The value converted to either a simple or a 32 bit heap allocated number.
+ */
+@disableGC
+export let wasmI32ToNumber = (n: WasmI32) => {
+  // Follows a little optimization. Instead of testing if n is range of allowed
+  // non heap allocated simple numbers (-1073741824n..1073741823n), actually
+  // make a simple number, convert it back to WasmI32, and test if it stayed
+  // the same. This may sound counter intuitive, but for numbers that fit into
+  // the range it is faster than performing the check with WasmI32.geS and
+  // WasmI32.leS by about 20%. An additional ~33% is gained by avoiding a
+  // call to tagSimpleNumber and instead doing it inline. For the case of
+  // numbers not fitting into the range, the cost of these simple ALU
+  // instructions are negligible compared to heap allocations.
+
+  // First step: naively convert to simple number, just like tagSimpleNumber.
+  // This will overflow for values not in the range, but it's fine.
+  let simple = WasmI32.xor(WasmI32.shl(n, 1n), 1n)
+
+  // Untag it, just like numbers.untagSimple.
+  let untagged = WasmI32.shrS(simple, 1n)
+
+  let result = if (WasmI32.eq(untagged, n)) {
+    // Just test if the untagged number is the same. If it didn't overflow, then
+    // we're good. We just need to cast the raw value into a Number at the type
+    // system level.
+    WasmI32.toGrain(simple): Number
+  } else {
+    // If it did overflow, then the value differs and we need to discard it and
+    // allocate the number on the heap. A boxed 32 bit number actually is the
+    // same thing as an Int32. It only needs to be cast into Number.
+    let asInt32 = toInt32(n)
+    WasmI32.toGrain(WasmI32.fromGrain(asInt32)): Number
+  }
+  result
+}

package/runtime/unsafe/memory.gr

@@ -1,13 +1,20 @@
 /* grainc-flags --compilation-mode=runtime */
 
-import { malloc, free, incRef, decRef, utoa32Buffered, decimalCount32 } from "runtime/gc"
+import {
+  malloc,
+  free,
+  incRef,
+  decRef,
+  utoa32Buffered,
+  decimalCount32,
+} from "runtime/gc"
 import WasmI32, {
   add as (+),
   sub as (-),
   shl as (<<),
   eq as (==),
   ne as (!=),
-  ltU as (<)
+  ltU as (<),
 } from "runtime/unsafe/wasmi32"
 
 export malloc
@@ -48,4 +55,8 @@ export let fill = (dest, c, n) => {
   }
 }
 
-export primitive compare: (WasmI32, WasmI32, WasmI32) -> WasmI32 = "@wasm.memory_compare"
+export primitive compare: (
+  WasmI32,
+  WasmI32,
+  WasmI32,
+) -> WasmI32 = "@wasm.memory_compare"

package/runtime/unsafe/printWasm.gr

@@ -5,7 +5,7 @@ import Memory from "runtime/unsafe/memory"
 // [FIXME] These all leak ATM (grain-lang/grain#791)
 
 @disableGC
-export let printI32 = (val) => {
+export let printI32 = val => {
   Memory.incRef(WasmI32.fromGrain(print))
   Memory.incRef(WasmI32.fromGrain(toString))
   let conv = Conv.toInt32(val)
@@ -23,7 +23,7 @@ export let printI32 = (val) => {
 }
 
 @disableGC
-export let printI64 = (val) => {
+export let printI64 = val => {
   Memory.incRef(WasmI32.fromGrain(print))
   Memory.incRef(WasmI32.fromGrain(toString))
   let conv = Conv.toInt64(val)
@@ -41,7 +41,7 @@ export let printI64 = (val) => {
 }
 
 @disableGC
-export let printF32 = (val) => {
+export let printF32 = val => {
   Memory.incRef(WasmI32.fromGrain(print))
   Memory.incRef(WasmI32.fromGrain(toString))
   let conv = Conv.toFloat32(val)
@@ -59,7 +59,7 @@ export let printF32 = (val) => {
 }
 
 @disableGC
-export let printF64 = (val) => {
+export let printF64 = val => {
   Memory.incRef(WasmI32.fromGrain(print))
   Memory.incRef(WasmI32.fromGrain(toString))
   let conv = Conv.toFloat64(val)

package/runtime/unsafe/tags.gr

@@ -1,7 +1,7 @@
 /* grainc-flags --compilation-mode=runtime */
 
-export let _GRAIN_NUMBER_TAG_TYPE       = 0b0001n
-export let _GRAIN_CONST_TAG_TYPE        = 0b0110n
+export let _GRAIN_NUMBER_TAG_TYPE = 0b0001n
+export let _GRAIN_CONST_TAG_TYPE = 0b0110n
 export let _GRAIN_GENERIC_HEAP_TAG_TYPE = 0b0000n
 
 export let _GRAIN_NUMBER_TAG_MASK = 0b0001n

package/runtime/unsafe/wasmf32.gr

@@ -2,7 +2,11 @@
 
 // WebAssembly Memory Instructions
 export primitive load: (WasmI32, WasmI32) -> WasmF32 = "@wasm.load_float32"
-export primitive store: (WasmI32, WasmF32, WasmI32) -> Void = "@wasm.store_float32"
+export primitive store: (
+  WasmI32,
+  WasmF32,
+  WasmI32,
+) -> Void = "@wasm.store_float32"
 
 // WebAssembly Unary Instructions
 export primitive neg: WasmF32 -> WasmF32 = "@wasm.neg_float32"
@@ -18,7 +22,10 @@ export primitive add: (WasmF32, WasmF32) -> WasmF32 = "@wasm.add_float32"
 export primitive sub: (WasmF32, WasmF32) -> WasmF32 = "@wasm.sub_float32"
 export primitive mul: (WasmF32, WasmF32) -> WasmF32 = "@wasm.mul_float32"
 export primitive div: (WasmF32, WasmF32) -> WasmF32 = "@wasm.div_float32"
-export primitive copySign: (WasmF32, WasmF32) -> WasmF32 = "@wasm.copy_sign_float32"
+export primitive copySign: (
+  WasmF32,
+  WasmF32,
+) -> WasmF32 = "@wasm.copy_sign_float32"
 export primitive min: (WasmF32, WasmF32) -> WasmF32 = "@wasm.min_float32"
 export primitive max: (WasmF32, WasmF32) -> WasmF32 = "@wasm.max_float32"
 export primitive eq: (WasmF32, WasmF32) -> Bool = "@wasm.eq_float32"

package/runtime/unsafe/wasmf64.gr

@@ -2,7 +2,11 @@
 
 // WebAssembly Memory Instructions
 export primitive load: (WasmI32, WasmI32) -> WasmF64 = "@wasm.load_float64"
-export primitive store: (WasmI32, WasmF64, WasmI32) -> Void = "@wasm.store_float64"
+export primitive store: (
+  WasmI32,
+  WasmF64,
+  WasmI32,
+) -> Void = "@wasm.store_float64"
 
 // WebAssembly Unary Instructions
 export primitive neg: WasmF64 -> WasmF64 = "@wasm.neg_float64"
@@ -18,7 +22,10 @@ export primitive add: (WasmF64, WasmF64) -> WasmF64 = "@wasm.add_float64"
 export primitive sub: (WasmF64, WasmF64) -> WasmF64 = "@wasm.sub_float64"
 export primitive mul: (WasmF64, WasmF64) -> WasmF64 = "@wasm.mul_float64"
 export primitive div: (WasmF64, WasmF64) -> WasmF64 = "@wasm.div_float64"
-export primitive copySign: (WasmF64, WasmF64) -> WasmF64 = "@wasm.copy_sign_float64"
+export primitive copySign: (
+  WasmF64,
+  WasmF64,
+) -> WasmF64 = "@wasm.copy_sign_float64"
 export primitive min: (WasmF64, WasmF64) -> WasmF64 = "@wasm.min_float64"
 export primitive max: (WasmF64, WasmF64) -> WasmF64 = "@wasm.max_float64"
 export primitive eq: (WasmF64, WasmF64) -> Bool = "@wasm.eq_float64"

package/runtime/unsafe/wasmi32.gr

@@ -1,58 +1,76 @@
 /* grainc-flags --compilation-mode=runtime */
 
 // WebAssembly Memory Instructions
-export primitive load : (WasmI32, WasmI32) -> WasmI32 = "@wasm.load_int32"
-export primitive load8S : (WasmI32, WasmI32) -> WasmI32 = "@wasm.load_8_s_int32"
-export primitive load8U : (WasmI32, WasmI32) -> WasmI32 = "@wasm.load_8_u_int32"
-export primitive load16S : (WasmI32, WasmI32) -> WasmI32 = "@wasm.load_16_s_int32"
-export primitive load16U : (WasmI32, WasmI32) -> WasmI32 = "@wasm.load_16_u_int32"
-export primitive store : (WasmI32, WasmI32, WasmI32) -> Void = "@wasm.store_int32"
-export primitive store8 : (WasmI32, WasmI32, WasmI32) -> Void = "@wasm.store_8_int32"
-export primitive store16 : (WasmI32, WasmI32, WasmI32) -> Void = "@wasm.store_16_int32"
+export primitive load: (WasmI32, WasmI32) -> WasmI32 = "@wasm.load_int32"
+export primitive load8S: (WasmI32, WasmI32) -> WasmI32 = "@wasm.load_8_s_int32"
+export primitive load8U: (WasmI32, WasmI32) -> WasmI32 = "@wasm.load_8_u_int32"
+export primitive load16S: (
+  WasmI32,
+  WasmI32,
+) -> WasmI32 = "@wasm.load_16_s_int32"
+export primitive load16U: (
+  WasmI32,
+  WasmI32,
+) -> WasmI32 = "@wasm.load_16_u_int32"
+export primitive store: (
+  WasmI32,
+  WasmI32,
+  WasmI32,
+) -> Void = "@wasm.store_int32"
+export primitive store8: (
+  WasmI32,
+  WasmI32,
+  WasmI32,
+) -> Void = "@wasm.store_8_int32"
+export primitive store16: (
+  WasmI32,
+  WasmI32,
+  WasmI32,
+) -> Void = "@wasm.store_16_int32"
 
 // WebAssembly Unary Instructions
-export primitive clz : WasmI32 -> WasmI32 = "@wasm.clz_int32"
-export primitive ctz : WasmI32 -> WasmI32 = "@wasm.ctz_int32"
-export primitive popcnt : WasmI32 -> WasmI32 = "@wasm.popcnt_int32"
-export primitive eqz : WasmI32 -> Bool = "@wasm.eq_z_int32"
+export primitive clz: WasmI32 -> WasmI32 = "@wasm.clz_int32"
+export primitive ctz: WasmI32 -> WasmI32 = "@wasm.ctz_int32"
+export primitive popcnt: WasmI32 -> WasmI32 = "@wasm.popcnt_int32"
+export primitive eqz: WasmI32 -> Bool = "@wasm.eq_z_int32"
 
 // WebAssembly Binary Instructions
-export primitive add : (WasmI32, WasmI32) -> WasmI32 = "@wasm.add_int32"
-export primitive sub : (WasmI32, WasmI32) -> WasmI32 = "@wasm.sub_int32"
-export primitive mul : (WasmI32, WasmI32) -> WasmI32 = "@wasm.mul_int32"
-export primitive divS : (WasmI32, WasmI32) -> WasmI32 = "@wasm.div_s_int32"
-export primitive divU : (WasmI32, WasmI32) -> WasmI32 = "@wasm.div_u_int32"
-export primitive remS : (WasmI32, WasmI32) -> WasmI32 = "@wasm.rem_s_int32"
-export primitive remU : (WasmI32, WasmI32) -> WasmI32 = "@wasm.rem_u_int32"
-export primitive and : (WasmI32, WasmI32) -> WasmI32 = "@wasm.and_int32"
-export primitive or : (WasmI32, WasmI32) -> WasmI32 = "@wasm.or_int32"
-export primitive xor : (WasmI32, WasmI32) -> WasmI32 = "@wasm.xor_int32"
-export primitive shl : (WasmI32, WasmI32) -> WasmI32 = "@wasm.shl_int32"
-export primitive shrS : (WasmI32, WasmI32) -> WasmI32 = "@wasm.shr_s_int32"
-export primitive shrU : (WasmI32, WasmI32) -> WasmI32 = "@wasm.shr_u_int32"
-export primitive rotl : (WasmI32, WasmI32) -> WasmI32 = "@wasm.rot_l_int32"
-export primitive rotr : (WasmI32, WasmI32) -> WasmI32 = "@wasm.rot_r_int32"
-export primitive eq : (WasmI32, WasmI32) -> Bool = "@wasm.eq_int32"
-export primitive ne : (WasmI32, WasmI32) -> Bool = "@wasm.ne_int32"
-export primitive ltS : (WasmI32, WasmI32) -> Bool = "@wasm.lt_s_int32"
-export primitive ltU : (WasmI32, WasmI32) -> Bool = "@wasm.lt_u_int32"
-export primitive leS : (WasmI32, WasmI32) -> Bool = "@wasm.le_s_int32"
-export primitive leU : (WasmI32, WasmI32) -> Bool = "@wasm.le_u_int32"
-export primitive gtS : (WasmI32, WasmI32) -> Bool = "@wasm.gt_s_int32"
-export primitive gtU : (WasmI32, WasmI32) -> Bool = "@wasm.gt_u_int32"
-export primitive geS : (WasmI32, WasmI32) -> Bool = "@wasm.ge_s_int32"
-export primitive geU : (WasmI32, WasmI32) -> Bool = "@wasm.ge_u_int32"
+export primitive add: (WasmI32, WasmI32) -> WasmI32 = "@wasm.add_int32"
+export primitive sub: (WasmI32, WasmI32) -> WasmI32 = "@wasm.sub_int32"
+export primitive mul: (WasmI32, WasmI32) -> WasmI32 = "@wasm.mul_int32"
+export primitive divS: (WasmI32, WasmI32) -> WasmI32 = "@wasm.div_s_int32"
+export primitive divU: (WasmI32, WasmI32) -> WasmI32 = "@wasm.div_u_int32"
+export primitive remS: (WasmI32, WasmI32) -> WasmI32 = "@wasm.rem_s_int32"
+export primitive remU: (WasmI32, WasmI32) -> WasmI32 = "@wasm.rem_u_int32"
+export primitive and: (WasmI32, WasmI32) -> WasmI32 = "@wasm.and_int32"
+export primitive or: (WasmI32, WasmI32) -> WasmI32 = "@wasm.or_int32"
+export primitive xor: (WasmI32, WasmI32) -> WasmI32 = "@wasm.xor_int32"
+export primitive shl: (WasmI32, WasmI32) -> WasmI32 = "@wasm.shl_int32"
+export primitive shrS: (WasmI32, WasmI32) -> WasmI32 = "@wasm.shr_s_int32"
+export primitive shrU: (WasmI32, WasmI32) -> WasmI32 = "@wasm.shr_u_int32"
+export primitive rotl: (WasmI32, WasmI32) -> WasmI32 = "@wasm.rot_l_int32"
+export primitive rotr: (WasmI32, WasmI32) -> WasmI32 = "@wasm.rot_r_int32"
+export primitive eq: (WasmI32, WasmI32) -> Bool = "@wasm.eq_int32"
+export primitive ne: (WasmI32, WasmI32) -> Bool = "@wasm.ne_int32"
+export primitive ltS: (WasmI32, WasmI32) -> Bool = "@wasm.lt_s_int32"
+export primitive ltU: (WasmI32, WasmI32) -> Bool = "@wasm.lt_u_int32"
+export primitive leS: (WasmI32, WasmI32) -> Bool = "@wasm.le_s_int32"
+export primitive leU: (WasmI32, WasmI32) -> Bool = "@wasm.le_u_int32"
+export primitive gtS: (WasmI32, WasmI32) -> Bool = "@wasm.gt_s_int32"
+export primitive gtU: (WasmI32, WasmI32) -> Bool = "@wasm.gt_u_int32"
+export primitive geS: (WasmI32, WasmI32) -> Bool = "@wasm.ge_s_int32"
+export primitive geU: (WasmI32, WasmI32) -> Bool = "@wasm.ge_u_int32"
 
 // WebAssembly Conversion Instructions
-export primitive wrapI64 : WasmI64 -> WasmI32 = "@wasm.wrap_int64"
-export primitive truncF32S : WasmF32 -> WasmI32 = "@wasm.trunc_s_float32_to_int32"
-export primitive truncF32U : WasmF32 -> WasmI32 = "@wasm.trunc_u_float32_to_int32"
-export primitive truncF64S : WasmF64 -> WasmI32 = "@wasm.trunc_s_float64_to_int32"
-export primitive truncF64U : WasmF64 -> WasmI32 = "@wasm.trunc_u_float64_to_int32"
-export primitive reinterpretF32 : WasmF32 -> WasmI32 = "@wasm.reinterpret_float32"
-export primitive extendS8 : WasmI32 -> WasmI32 = "@wasm.extend_s8_int32"
-export primitive extendS16 : WasmI32 -> WasmI32 = "@wasm.extend_s16_int32"
+export primitive wrapI64: WasmI64 -> WasmI32 = "@wasm.wrap_int64"
+export primitive truncF32S: WasmF32 -> WasmI32 = "@wasm.trunc_s_float32_to_int32"
+export primitive truncF32U: WasmF32 -> WasmI32 = "@wasm.trunc_u_float32_to_int32"
+export primitive truncF64S: WasmF64 -> WasmI32 = "@wasm.trunc_s_float64_to_int32"
+export primitive truncF64U: WasmF64 -> WasmI32 = "@wasm.trunc_u_float64_to_int32"
+export primitive reinterpretF32: WasmF32 -> WasmI32 = "@wasm.reinterpret_float32"
+export primitive extendS8: WasmI32 -> WasmI32 = "@wasm.extend_s8_int32"
+export primitive extendS16: WasmI32 -> WasmI32 = "@wasm.extend_s16_int32"
 
 // Grain Conversions
-export primitive fromGrain : a -> WasmI32 = "@wasm.fromGrain"
-export primitive toGrain : WasmI32 -> a = "@wasm.toGrain"
+export primitive fromGrain: a -> WasmI32 = "@wasm.fromGrain"
+export primitive toGrain: WasmI32 -> a = "@wasm.toGrain"

package/runtime/unsafe/wasmi64.gr

@@ -1,59 +1,87 @@
 /* grainc-flags --compilation-mode=runtime */
 
 // WebAssembly Memory Instructions
-export primitive load : (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_int64"
-export primitive load8S : (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_8_s_int64"
-export primitive load8U : (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_8_u_int64"
-export primitive load16S : (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_16_s_int64"
-export primitive load16U : (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_16_u_int64"
-export primitive load32S : (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_32_s_int64"
-export primitive load32U : (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_32_u_int64"
-export primitive store : (WasmI32, WasmI64, WasmI32) -> Void = "@wasm.store_int64"
-export primitive store8 : (WasmI32, WasmI64, WasmI32) -> Void = "@wasm.store_8_int64"
-export primitive store16 : (WasmI32, WasmI64, WasmI32) -> Void = "@wasm.store_16_int64"
-export primitive store32 : (WasmI32, WasmI64, WasmI32) -> Void = "@wasm.store_32_int64"
+export primitive load: (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_int64"
+export primitive load8S: (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_8_s_int64"
+export primitive load8U: (WasmI32, WasmI32) -> WasmI64 = "@wasm.load_8_u_int64"
+export primitive load16S: (
+  WasmI32,
+  WasmI32,
+) -> WasmI64 = "@wasm.load_16_s_int64"
+export primitive load16U: (
+  WasmI32,
+  WasmI32,
+) -> WasmI64 = "@wasm.load_16_u_int64"
+export primitive load32S: (
+  WasmI32,
+  WasmI32,
+) -> WasmI64 = "@wasm.load_32_s_int64"
+export primitive load32U: (
+  WasmI32,
+  WasmI32,
+) -> WasmI64 = "@wasm.load_32_u_int64"
+export primitive store: (
+  WasmI32,
+  WasmI64,
+  WasmI32,
+) -> Void = "@wasm.store_int64"
+export primitive store8: (
+  WasmI32,
+  WasmI64,
+  WasmI32,
+) -> Void = "@wasm.store_8_int64"
+export primitive store16: (
+  WasmI32,
+  WasmI64,
+  WasmI32,
+) -> Void = "@wasm.store_16_int64"
+export primitive store32: (
+  WasmI32,
+  WasmI64,
+  WasmI32,
+) -> Void = "@wasm.store_32_int64"
 
 // WebAssembly Unary Instructions
-export primitive clz : WasmI64 -> WasmI64 = "@wasm.clz_int64"
-export primitive ctz : WasmI64 -> WasmI64 = "@wasm.ctz_int64"
-export primitive popcnt : WasmI64 -> WasmI64 = "@wasm.popcnt_int64"
-export primitive eqz : WasmI64 -> Bool = "@wasm.eq_z_int64"
+export primitive clz: WasmI64 -> WasmI64 = "@wasm.clz_int64"
+export primitive ctz: WasmI64 -> WasmI64 = "@wasm.ctz_int64"
+export primitive popcnt: WasmI64 -> WasmI64 = "@wasm.popcnt_int64"
+export primitive eqz: WasmI64 -> Bool = "@wasm.eq_z_int64"
 
 // WebAssembly Binary Instructions
-export primitive add : (WasmI64, WasmI64) -> WasmI64 = "@wasm.add_int64"
-export primitive sub : (WasmI64, WasmI64) -> WasmI64 = "@wasm.sub_int64"
-export primitive mul : (WasmI64, WasmI64) -> WasmI64 = "@wasm.mul_int64"
-export primitive divS : (WasmI64, WasmI64) -> WasmI64 = "@wasm.div_s_int64"
-export primitive divU : (WasmI64, WasmI64) -> WasmI64 = "@wasm.div_u_int64"
-export primitive remS : (WasmI64, WasmI64) -> WasmI64 = "@wasm.rem_s_int64"
-export primitive remU : (WasmI64, WasmI64) -> WasmI64 = "@wasm.rem_u_int64"
-export primitive and : (WasmI64, WasmI64) -> WasmI64 = "@wasm.and_int64"
-export primitive or : (WasmI64, WasmI64) -> WasmI64 = "@wasm.or_int64"
-export primitive xor : (WasmI64, WasmI64) -> WasmI64 = "@wasm.xor_int64"
-export primitive shl : (WasmI64, WasmI64) -> WasmI64 = "@wasm.shl_int64"
-export primitive shrU : (WasmI64, WasmI64) -> WasmI64 = "@wasm.shr_u_int64"
-export primitive shrS : (WasmI64, WasmI64) -> WasmI64 = "@wasm.shr_s_int64"
-export primitive rotl : (WasmI64, WasmI64) -> WasmI64 = "@wasm.rot_l_int64"
-export primitive rotr : (WasmI64, WasmI64) -> WasmI64 = "@wasm.rot_r_int64"
-export primitive eq : (WasmI64, WasmI64) -> Bool = "@wasm.eq_int64"
-export primitive ne : (WasmI64, WasmI64) -> Bool = "@wasm.ne_int64"
-export primitive ltS : (WasmI64, WasmI64) -> Bool = "@wasm.lt_s_int64"
-export primitive ltU : (WasmI64, WasmI64) -> Bool = "@wasm.lt_u_int64"
-export primitive leS : (WasmI64, WasmI64) -> Bool = "@wasm.le_s_int64"
-export primitive leU : (WasmI64, WasmI64) -> Bool = "@wasm.le_u_int64"
-export primitive gtS : (WasmI64, WasmI64) -> Bool = "@wasm.gt_s_int64"
-export primitive gtU : (WasmI64, WasmI64) -> Bool = "@wasm.gt_u_int64"
-export primitive geS : (WasmI64, WasmI64) -> Bool = "@wasm.ge_s_int64"
-export primitive geU : (WasmI64, WasmI64) -> Bool = "@wasm.ge_u_int64"
+export primitive add: (WasmI64, WasmI64) -> WasmI64 = "@wasm.add_int64"
+export primitive sub: (WasmI64, WasmI64) -> WasmI64 = "@wasm.sub_int64"
+export primitive mul: (WasmI64, WasmI64) -> WasmI64 = "@wasm.mul_int64"
+export primitive divS: (WasmI64, WasmI64) -> WasmI64 = "@wasm.div_s_int64"
+export primitive divU: (WasmI64, WasmI64) -> WasmI64 = "@wasm.div_u_int64"
+export primitive remS: (WasmI64, WasmI64) -> WasmI64 = "@wasm.rem_s_int64"
+export primitive remU: (WasmI64, WasmI64) -> WasmI64 = "@wasm.rem_u_int64"
+export primitive and: (WasmI64, WasmI64) -> WasmI64 = "@wasm.and_int64"
+export primitive or: (WasmI64, WasmI64) -> WasmI64 = "@wasm.or_int64"
+export primitive xor: (WasmI64, WasmI64) -> WasmI64 = "@wasm.xor_int64"
+export primitive shl: (WasmI64, WasmI64) -> WasmI64 = "@wasm.shl_int64"
+export primitive shrU: (WasmI64, WasmI64) -> WasmI64 = "@wasm.shr_u_int64"
+export primitive shrS: (WasmI64, WasmI64) -> WasmI64 = "@wasm.shr_s_int64"
+export primitive rotl: (WasmI64, WasmI64) -> WasmI64 = "@wasm.rot_l_int64"
+export primitive rotr: (WasmI64, WasmI64) -> WasmI64 = "@wasm.rot_r_int64"
+export primitive eq: (WasmI64, WasmI64) -> Bool = "@wasm.eq_int64"
+export primitive ne: (WasmI64, WasmI64) -> Bool = "@wasm.ne_int64"
+export primitive ltS: (WasmI64, WasmI64) -> Bool = "@wasm.lt_s_int64"
+export primitive ltU: (WasmI64, WasmI64) -> Bool = "@wasm.lt_u_int64"
+export primitive leS: (WasmI64, WasmI64) -> Bool = "@wasm.le_s_int64"
+export primitive leU: (WasmI64, WasmI64) -> Bool = "@wasm.le_u_int64"
+export primitive gtS: (WasmI64, WasmI64) -> Bool = "@wasm.gt_s_int64"
+export primitive gtU: (WasmI64, WasmI64) -> Bool = "@wasm.gt_u_int64"
+export primitive geS: (WasmI64, WasmI64) -> Bool = "@wasm.ge_s_int64"
+export primitive geU: (WasmI64, WasmI64) -> Bool = "@wasm.ge_u_int64"
 
 // WebAssembly Conversion instructions
-export primitive extendI32S : WasmI32 -> WasmI64 = "@wasm.extend_s_int32"
-export primitive extendI32U : WasmI32 -> WasmI64 = "@wasm.extend_u_int32"
-export primitive truncF32S : WasmF32 -> WasmI64 = "@wasm.trunc_s_float32_to_int64"
-export primitive truncF32U : WasmF32 -> WasmI64 = "@wasm.trunc_u_float32_to_int64"
-export primitive truncF64S : WasmF64 -> WasmI64 = "@wasm.trunc_s_float64_to_int64"
-export primitive truncF64U : WasmF64 -> WasmI64 = "@wasm.trunc_u_float64_to_int64"
-export primitive reinterpretF64 : WasmF64 -> WasmI64 = "@wasm.reinterpret_float64"
-export primitive extendS8 : WasmI64 -> WasmI64 = "@wasm.extend_s8_int64"
-export primitive extendS16 : WasmI64 -> WasmI64 = "@wasm.extend_s16_int64"
-export primitive extendS32 : WasmI64 -> WasmI64 = "@wasm.extend_s32_int64"
+export primitive extendI32S: WasmI32 -> WasmI64 = "@wasm.extend_s_int32"
+export primitive extendI32U: WasmI32 -> WasmI64 = "@wasm.extend_u_int32"
+export primitive truncF32S: WasmF32 -> WasmI64 = "@wasm.trunc_s_float32_to_int64"
+export primitive truncF32U: WasmF32 -> WasmI64 = "@wasm.trunc_u_float32_to_int64"
+export primitive truncF64S: WasmF64 -> WasmI64 = "@wasm.trunc_s_float64_to_int64"
+export primitive truncF64U: WasmF64 -> WasmI64 = "@wasm.trunc_u_float64_to_int64"
+export primitive reinterpretF64: WasmF64 -> WasmI64 = "@wasm.reinterpret_float64"
+export primitive extendS8: WasmI64 -> WasmI64 = "@wasm.extend_s8_int64"
+export primitive extendS16: WasmI64 -> WasmI64 = "@wasm.extend_s16_int64"
+export primitive extendS32: WasmI64 -> WasmI64 = "@wasm.extend_s32_int64"