porffor 0.2.0-181627c → 0.2.0-2265539

package/compiler/builtins/base64.ts

@@ -1,73 +1,106 @@
-// @porf -funsafe-no-unlikely-proto-checks
-
-import type { i32, bytestring } from './porffor.d.ts';
-
-// const appendKeyChar = (target: bytestring, ind: i32): bytestring => {
-//   const keyStr: bytestring = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-//   return target + keyStr.charAt(ind);
-// };
-
-// const appendKeyChar = (target: bytestring, ind: i32): void => {
-//   const keyStr: bytestring = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-
-//   Porffor.bytestring.appendCharAt(target, keyStr, ind);
-
-//   Porffor.wasm`local.get ${ind}
-// i32.to_u
-// i32.const 2
-// i32.mul
-// local.get ${keyStr}
-// i32.to_u
-// i32.add
-// i32.load8_u 0 4
-
-// local targetI32 i32
-// local.get ${target}
-// i32.to_u
-// local.tee targetI32
-// local.get targetI32
-// i32.load 1 0
-// i32.const 2
-// i32.mul
-// i32.add
-
-// i32.store8 0 4`;
-// };
+// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+
+import type { i32, i64, bytestring } from './porffor.d.ts';
+
+//   while (len >= 8) {
+//     // Porffor.wasm`local tmp i64`;
+//     // const tmp: i64 = Porffor.wasm.i64.load(i, 0, 4);
+
+// Porffor.wasm`
+// local tmp i64
+// local k i32
+
+// local.get ${i}
+// i64.load 0 4
+// local.set tmp
+
+// loop 64
+//   local.get ${j}
+//   local.get ${j}
+//   i32.const 1
+//   i32.add
+//   local.set ${j}
+
+//   local.get ${keyStrPtr}
+//   local.get tmp
+
+//   i32.const 58
+
+//   local.get k
+//   i32.const 6
+//   i32.mul
+
+//   i32.sub
+
+//   i64.extend_i32_u
+
+//   i64.shr_u
+
+//   i64.const 63
+//   i64.and
+
+//   i32.wrap_i64
+//   i32.add
+
+//   i32.load8_u 0 4
+//   i32.store8 0 4
+
+//   local.get k
+//   i32.const 1
+//   i32.add
+//   local.tee k
+
+//   i32.const 8
+//   i32.lt_s
+//   br_if 1
+// end
+
+// `;
+//     // while (k < 8) {
+//     //   Porffor.wasm.i32.store8(j++, Porffor.wasm.i32.load8_u(keyStrPtr + Porffor.wasm.i32.wrap_i64(Porffor.wasm.i64.and(
+//     //     Porffor.wasm.i64.shr_u(tmp, Porffor.wasm.i64.extend_i32_u(58 - k * 6)),
+//     //     Porffor.wasm.i64.const(0x3f)
+//     //   )), 0, 4), 0, 4);
+//     //   k += 1;
+//     // }
+
+//     i += 6;
+//     len -= 6;
+//   }
 
 export const btoa = (input: bytestring): bytestring => {
   const keyStr: bytestring = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+  const keyStrPtr: i32 = Porffor.i32.ptrUnsafe(keyStr);
 
-  // todo: throw invalid character for unicode
-
+  let len: i32 = input.length;
   let output: bytestring = '';
-  let i: i32 = 0;
+  output.length = 4 * (len / 3 + !!(len % 3));
 
-  while (i < input.length) {
-    const chr1: i32 = input.charCodeAt(i++);
-    const chr2: i32 = input.charCodeAt(i++);
-    const chr3: i32 = input.charCodeAt(i++);
+  let i: i32 = Porffor.i32.ptrUnsafe(input),
+      j: i32 = Porffor.i32.ptrUnsafe(output);
+
+  const endPtr = i + len;
+  while (i < endPtr) {
+    const chr1: i32 = Porffor.wasm.i32.load8_u(i++, 0, 4);
+    const chr2: i32 = i < endPtr ? Porffor.wasm.i32.load8_u(i++, 0, 4) : -1;
+    const chr3: i32 = i < endPtr ? Porffor.wasm.i32.load8_u(i++, 0, 4) : -1;
 
     const enc1: i32 = chr1 >> 2;
-    const enc2: i32 = ((chr1 & 3) << 4) | (chr2 >> 4);
-    let enc3: i32 = ((chr2 & 15) << 2) | (chr3 >> 6);
+    const enc2: i32 = ((chr1 & 3) << 4) | (chr2 == -1 ? 0 : (chr2 >> 4));
+    let enc3: i32 = ((chr2 & 15) << 2) | (chr3 == -1 ? 0 : (chr3 >> 6));
     let enc4: i32 = chr3 & 63;
 
-    if (Number.isNaN(chr2)) {
+    if (chr2 == -1) {
       enc3 = 64;
       enc4 = 64;
-    } else if (Number.isNaN(chr3)) {
+    } else if (chr3 == -1) {
       enc4 = 64;
     }
 
-    Porffor.bytestring.appendCharAt(output, keyStr, enc1);
-    Porffor.bytestring.appendCharAt(output, keyStr, enc2);
-    Porffor.bytestring.appendCharAt(output, keyStr, enc3);
-    Porffor.bytestring.appendCharAt(output, keyStr, enc4);
-
-    // output += keyStr.charAt(enc1);
-    // output += keyStr.charAt(enc2);
-    // output += keyStr.charAt(enc3);
-    // output += keyStr.charAt(enc4);
+    Porffor.wasm.i32.store8(j++, Porffor.wasm.i32.load8_u(keyStrPtr + enc1, 0, 4), 0, 4);
+    Porffor.wasm.i32.store8(j++, Porffor.wasm.i32.load8_u(keyStrPtr + enc2, 0, 4), 0, 4);
+    Porffor.wasm.i32.store8(j++, Porffor.wasm.i32.load8_u(keyStrPtr + enc3, 0, 4), 0, 4);
+    Porffor.wasm.i32.store8(j++, Porffor.wasm.i32.load8_u(keyStrPtr + enc4, 0, 4), 0, 4);
   }
 
   return output;

package/compiler/builtins/porffor.d.ts

@@ -1,12 +1,32 @@
 export type i32 = number;
+export type i64 = number;
 export type bytestring = string;
 
 type PorfforGlobal = {
-  wasm: (...args: any[]) => void;
+  wasm: {
+    (...args: any[]): void;
+    i32: {
+      load8_u: (pointer: i32, align: i32, offset: i32) => i32;
+      store8: (pointer: i32, value: i32, align: i32, offset: i32) => i32;
+      wrap_i64: (x: i64) => i32;
+    }
+    i64: {
+      load: (pointer: i32, align: i32, offset: i32) => i64;
+      shr_u: (a: i64, b: i64) => i64;
+      extend_i32_u: (x: i32) => i64;
+      and: (a: i64, b: i64) => i64;
+      const: (val: number) => i64;
+    }
+  }
+  ptr: (obj: any) => i32;
+
+  i32: {
+    ptr: (obj: any) => i32;
+    ptrUnsafe: (obj: any) => i32;
 
-  bytestring: {
-    appendCharAt: (target: bytestring, lookup: bytestring, ind: i32) => void;
-    appendCharCode: (target: bytestring, code: i32) => void;
+    bytestring: {
+      setCharAt: (target: bytestring, targetIndex: i32, lookup: bytestring, lookupIndex: i32) => void;
+    }
   }
 };
 

package/compiler/builtins.js

@@ -1,6 +1,7 @@
 import { Blocktype, Opcodes, Valtype, ValtypeSize } from "./wasmSpec.js";
 import { number, i32x4 } from "./embedding.js";
 import Prefs from './prefs.js';
+import * as GeneratedBuiltins from './generated_builtins.js';
 
 export const importedFuncs = [
   {
@@ -240,6 +241,40 @@ export const BuiltinFuncs = function() {
 
           [ Opcodes.end ]
         ],
+        [TYPES._bytestring]: [
+          // simply print a (byte)string :))
+          // cache input pointer as i32
+          [ Opcodes.local_get, 0 ],
+          Opcodes.i32_to_u,
+          [ Opcodes.local_tee, 2 ],
+
+          // make end pointer
+          [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
+          [ Opcodes.local_get, 2 ],
+          [ Opcodes.i32_add ],
+          [ Opcodes.local_set, 3 ],
+
+          [ Opcodes.loop, Blocktype.void ],
+
+          // print current char
+          [ Opcodes.local_get, 2 ],
+          [ Opcodes.i32_load8_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
+          Opcodes.i32_from_u,
+          [ Opcodes.call, importedFuncs.printChar ],
+
+          // increment pointer
+          [ Opcodes.local_get, 2 ],
+          [ Opcodes.i32_const, 1 ],
+          [ Opcodes.i32_add ],
+          [ Opcodes.local_tee, 2 ],
+
+          // if pointer != end pointer, loop
+          [ Opcodes.local_get, 3 ],
+          [ Opcodes.i32_ne ],
+          [ Opcodes.br_if, 0 ],
+
+          [ Opcodes.end ]
+        ],
         [TYPES._array]: [
           ...printStaticStr('[ '),
 
@@ -708,7 +743,7 @@ export const BuiltinFuncs = function() {
     return out;
   };
 
-  this.__Porffor_pointer = {
+  this.__Porffor_ptr = {
     params: [ valtypeBinary, Valtype.i32 ],
     typedParams: true,
     locals: [ Valtype.i32, Valtype.i32 ],
@@ -723,248 +758,34 @@ export const BuiltinFuncs = function() {
     ]
   };
 
-  this.__Porffor_bytestring_appendCharAt = {
-    params: [ valtypeBinary, valtypeBinary, valtypeBinary ],
-    locals: [ Valtype.i32 ],
-    localNames: ['target', 'lookup', 'index', 'length'],
-    returns: [],
-    wasm: [
-      // get ptr for target[target.length]
-      [ Opcodes.local_get, 0 ],
-      Opcodes.i32_to_u,
-      [ Opcodes.local_get, 0 ],
-      Opcodes.i32_to_u,
-      [ Opcodes.i32_load, 1, 0 ],
-      [ Opcodes.local_tee, 3 ],
-      [ Opcodes.i32_const, 2 ],
-      [ Opcodes.i32_mul ],
-      [ Opcodes.i32_add ],
-
-      // get lookup[index]
-      [ Opcodes.local_get, 2 ],
-      Opcodes.i32_to_u,
-      [ Opcodes.i32_const, 2 ],
-      [ Opcodes.i32_mul ],
-      [ Opcodes.local_get, 1 ],
-      Opcodes.i32_to_u,
-      [ Opcodes.i32_add ],
-      [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
-
-      // store target[target.length] = lookup[index]
-      [ Opcodes.i32_store8, 0, 4 ],
-
-      // store target.length = target.length + 1
-      [ Opcodes.local_get, 0 ],
-      Opcodes.i32_to_u,
-      [ Opcodes.local_get, 3 ],
-      [ Opcodes.i32_const, 1 ],
-      [ Opcodes.i32_add ],
-      [ Opcodes.i32_store, 0, 0 ],
-    ]
-  };
-
-  this.__Porffor_bytestring_appendCharCode = {
-    params: [ valtypeBinary, valtypeBinary ],
-    locals: [ Valtype.i32 ],
-    localnames: ['target', 'code', 'length'],
-    returns: [],
-    wasm: [
-      // get ptr for target[target.length]
-      [ Opcodes.local_get, 0 ],
-      Opcodes.i32_to_u,
-      [ Opcodes.local_get, 0 ],
-      Opcodes.i32_to_u,
-      [ Opcodes.i32_load, 1, 0 ],
-      [ Opcodes.local_tee, 3 ],
-      [ Opcodes.i32_const, 2 ],
-      [ Opcodes.i32_mul ],
-      [ Opcodes.i32_add ],
-
-      // get code
-      [ Opcodes.local_get, 1 ],
-      [ Opcodes.i32_to_u ],
-
-      // set target[target.length] = code
-      [ Opcodes.i32_store8, 0, 4 ],
-
-      // store target.length = target.length + 1
-      [ Opcodes.local_get, 0 ],
-      Opcodes.i32_to_u,
-      [ Opcodes.local_get, 3 ],
-      [ Opcodes.i32_const, 1 ],
-      [ Opcodes.i32_add ],
-      [ Opcodes.i32_store, 0, 0 ],
-    ]
-  };
-
-  // todo: indexOfCharAt
-
-
-  this.__SIMD_i32x4_load = {
-    params: [ Valtype.i32 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
+  this.__Porffor_i32_ptr = {
+    params: [ Valtype.i32, Valtype.i32 ],
+    typedParams: true,
+    locals: [ Valtype.i32, Valtype.i32 ],
+    returns: [ Valtype.i32 ],
+    wasm: (scope, { TYPES }) => [
+      ...localIsOneOf([ [ Opcodes.local_get, 1 ] ], [ TYPES.string, TYPES._array, TYPES._bytestring ], Valtype.i32),
+      [ Opcodes.if, Valtype.i32 ],
       [ Opcodes.local_get, 0 ],
-      [ ...Opcodes.v128_load, 0, 0 ]
+      [ Opcodes.else ],
+      ...number(-1, Valtype.i32),
+      [ Opcodes.end ]
     ]
   };
 
-  this.__SIMD_i32x4_splat = {
+  // unsafe: does not check type just ~casts to number
+  this.__Porffor_i32_ptrUnsafe = {
     params: [ Valtype.i32 ],
     locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      [ ...Opcodes.i32x4_splat ],
-    ]
-  };
-
-  this.__SIMD_i16x8_create = {
-    params: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      ...i32x4(0, 0, 0, 0),
-      [ Opcodes.local_get, 0 ],
-      [ ...Opcodes.i16x8_replace_lane, 0 ],
-      [ Opcodes.local_get, 1 ],
-      [ ...Opcodes.i16x8_replace_lane, 1 ],
-      [ Opcodes.local_get, 2 ],
-      [ ...Opcodes.i16x8_replace_lane, 2 ],
-      [ Opcodes.local_get, 3 ],
-      [ ...Opcodes.i16x8_replace_lane, 3 ],
-      [ Opcodes.local_get, 4 ],
-      [ ...Opcodes.i16x8_replace_lane, 4 ],
-      [ Opcodes.local_get, 5 ],
-      [ ...Opcodes.i16x8_replace_lane, 5 ],
-      [ Opcodes.local_get, 6 ],
-      [ ...Opcodes.i16x8_replace_lane, 6 ],
-      [ Opcodes.local_get, 7 ],
-      [ ...Opcodes.i16x8_replace_lane, 7 ],
-    ]
-  };
-
-  this.__SIMD_i32x4_dot_i16x8 = {
-    params: [ Valtype.v128, Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      [ Opcodes.local_get, 1 ],
-      [ ...Opcodes.i32x4_dot_i16x8_s ]
-    ]
-  };
-
-  this.__SIMD_i32x4_create = {
-    params: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      ...i32x4(0, 0, 0, 0),
-      [ Opcodes.local_get, 0 ],
-      [ ...Opcodes.i32x4_replace_lane, 0 ],
-      [ Opcodes.local_get, 1 ],
-      [ ...Opcodes.i32x4_replace_lane, 1 ],
-      [ Opcodes.local_get, 2 ],
-      [ ...Opcodes.i32x4_replace_lane, 2 ],
-      [ Opcodes.local_get, 3 ],
-      [ ...Opcodes.i32x4_replace_lane, 3 ],
-    ]
-  };
-
-  this.__SIMD_i32x4_add = {
-    params: [ Valtype.v128, Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      [ Opcodes.local_get, 1 ],
-      [ ...Opcodes.i32x4_add ]
-    ]
-  };
-
-  this.__SIMD_i32x4_sub = {
-    params: [ Valtype.v128, Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      [ Opcodes.local_get, 1 ],
-      [ ...Opcodes.i32x4_sub ]
-    ]
-  };
-
-  this.__SIMD_i32x4_mul = {
-    params: [ Valtype.v128, Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      [ Opcodes.local_get, 1 ],
-      [ ...Opcodes.i32x4_mul ]
-    ]
-  };
-
-  this.__SIMD_i32x4_get0 = {
-    params: [ Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.i32 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      [ ...Opcodes.i32x4_extract_lane, 0 ],
-    ],
-  },
-
-  this.__SIMD_i32x4_get1 = {
-    params: [ Valtype.v128 ],
-    locals: [],
     returns: [ Valtype.i32 ],
     wasm: [
       [ Opcodes.local_get, 0 ],
-      [ ...Opcodes.i32x4_extract_lane, 1 ],
-    ],
-  };
-
-  this.__SIMD_i32x4_get2 = {
-    params: [ Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.i32 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      [ ...Opcodes.i32x4_extract_lane, 2 ],
-    ],
-  };
-
-  this.__SIMD_i32x4_get3 = {
-    params: [ Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.i32 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      [ ...Opcodes.i32x4_extract_lane, 3 ],
-    ],
-  };
-
-  this.__SIMD_i32x4_shuffle_000c = {
-    params: [ Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      ...i32x4(0, 0, 0, 0),
-      [ ...Opcodes.i8x16_shuffle, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 8, 9, 10, 11 ], // i32x4 (a, b, c, d) -> i32x4 (0, 0, 0, c)
     ]
   };
 
-  this.__SIMD_i32x4_shuffle_00ab = {
-    params: [ Valtype.v128 ],
-    locals: [],
-    returns: [ Valtype.v128 ],
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      ...i32x4(0, 0, 0, 0),
-      [ ...Opcodes.i8x16_shuffle, 16, 16, 16, 16, 16, 16, 16, 16, 0, 1, 2, 3, 4, 5, 6, 7 ], // i32x4 (a, b, c, d) -> i32x4 (0, 0, a, b)
-    ]
-  };
+
+  const generated = new GeneratedBuiltins.BuiltinFuncs();
+  for (const x in generated) {
+    this[x] = generated[x];
+  }
 };

package/compiler/codeGen.js

@@ -189,7 +189,11 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
             if (!inst) throw new Error(`inline asm: inst ${asm[0]} not found`);
 
             if (!Array.isArray(inst)) inst = [ inst ];
-            const immediates = asm.slice(1).map(x => parseInt(x) || scope.locals[x]?.idx);
+            const immediates = asm.slice(1).map(x => {
+              const int = parseInt(x);
+              if (Number.isNaN(int)) return scope.locals[x]?.idx;
+              return int;
+            });
 
             out.push([ ...inst, ...immediates ]);
           }
@@ -220,11 +224,12 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
 
       for (let i = 0; i < expressions.length; i++) {
         const e = expressions[i];
-        str += lookupName(scope, e.name)[0];
-
+        str += lookupName(scope, e.name)[0].idx;
         str += quasis[i + 1].value.raw;
       }
 
+      console.log(str);
+
       return funcs[name](str);
     }
 
@@ -657,11 +662,12 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
     ...(!intIn && intOut ? [ Opcodes.i32_to_u ] : [])
   ];
 
-  const tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const useTmp = knownType(scope, type) == null;
+  const tmp = !useTmp && localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
   const def = [
     // if value != 0
-    [ Opcodes.local_get, tmp ],
+    ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
 
     // ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
     ...(!intOut || (intIn && intOut) ? [] : [ Opcodes.i32_to_u ]),
@@ -673,7 +679,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
 
   return [
     ...wasm,
-    [ Opcodes.local_set, tmp ],
+    ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
 
     ...typeSwitch(scope, type, {
       // [TYPES.number]: def,
@@ -682,7 +688,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
         ...number(1, intOut ? Valtype.i32 : valtypeBinary)
       ],
       [TYPES.string]: [
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
         ...(intIn ? [] : [ Opcodes.i32_to_u ]),
 
         // get length
@@ -694,7 +700,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ],
       [TYPES._bytestring]: [ // duplicate of string
-        [ Opcodes.local_get, tmp ],
+      ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
         ...(intIn ? [] : [ Opcodes.i32_to_u ]),
 
         // get length
@@ -708,10 +714,12 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
 };
 
 const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
-  const tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const useTmp = knownType(scope, type) == null;
+  const tmp = !useTmp && localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+
   return [
     ...wasm,
-    [ Opcodes.local_set, tmp ],
+    ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
 
     ...typeSwitch(scope, type, {
       [TYPES._array]: [
@@ -719,7 +727,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
         ...number(0, intOut ? Valtype.i32 : valtypeBinary)
       ],
       [TYPES.string]: [
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
         ...(intIn ? [] : [ Opcodes.i32_to_u ]),
 
         // get length
@@ -730,7 +738,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ],
       [TYPES._bytestring]: [ // duplicate of string
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
         ...(intIn ? [] : [ Opcodes.i32_to_u ]),
 
         // get length
@@ -742,7 +750,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
       ],
       default: [
         // if value == 0
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
 
         ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
@@ -752,10 +760,12 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
 };
 
 const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
-  const tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const useTmp = knownType(scope, type) == null;
+  const tmp = !useTmp && localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+
   return [
     ...wasm,
-    [ Opcodes.local_set, tmp ],
+    ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
 
     ...typeSwitch(scope, type, {
       [TYPES.undefined]: [
@@ -764,7 +774,7 @@ const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
       ],
       [TYPES.object]: [
         // object, null if == 0
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
 
         ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
@@ -969,7 +979,7 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
   return out;
 };
 
-const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes = [], globalInits, returns, returnType, localNames = [], globalNames = [] }) => {
+const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes = [], globalInits, returns, returnType, localNames = [], globalNames = [], data: _data = [] }) => {
   const existing = funcs.find(x => x.name === name);
   if (existing) return existing;
 
@@ -981,6 +991,12 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
     locals[nameParam(i)] = { idx: i, type: allLocals[i] };
   }
 
+  for (const x of _data) {
+    const copy = { ...x };
+    copy.offset += pages.size * pageSize;
+    data.push(copy);
+  }
+
   if (typeof wasm === 'function') {
     const scope = {
       name,
@@ -990,7 +1006,18 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
       localInd: allLocals.length,
     };
 
-    wasm = wasm(scope, { TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString });
+    wasm = wasm(scope, {
+      TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage,
+      builtin: name => {
+        let idx = funcIndex[name] ?? importedFuncs[name];
+        if (idx === undefined && builtinFuncs[name]) {
+          includeBuiltin(scope, name);
+          idx = funcIndex[name];
+        }
+
+        return idx;
+      }
+    });
   }
 
   let baseGlobalIdx, i = 0;
@@ -1176,7 +1203,7 @@ const getNodeType = (scope, node) => {
         if (func.returnType) return func.returnType;
       }
 
-      if (builtinFuncs[name]) return TYPES[builtinFuncs[name].returnType ?? 'number'];
+      if (builtinFuncs[name] && !builtinFuncs[name].typedReturns) return TYPES[builtinFuncs[name].returnType ?? 'number'];
       if (internalConstrs[name]) return internalConstrs[name].type;
 
       // check if this is a prototype function
@@ -1191,6 +1218,11 @@ const getNodeType = (scope, node) => {
         if (protoFuncs.length === 1) return protoFuncs[0].returnType ?? TYPES.number;
       }
 
+      if (name.startsWith('__Porffor_wasm_')) {
+        // todo: return undefined for non-returning ops
+        return TYPES.number;
+      }
+
       if (scope.locals['#last_type']) return [ getLastType(scope) ];
 
       // presume
@@ -1665,6 +1697,44 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     idx = -1;
   }
 
+  if (idx === undefined && name.startsWith('__Porffor_wasm_')) {
+    const wasmOps = {
+      // pointer, align, offset
+      i32_load8_u: { imms: 2, args: 1 },
+      // pointer, value, align, offset
+      i32_store8: { imms: 2, args: 2 },
+      // pointer, align, offset
+      i64_load: { imms: 2, args: 1 },
+      // a, b
+      i64_shr_u: { imms: 0, args: 2 },
+      // x
+      i32_wrap_i64: { imms: 0, args: 1, },
+      // x
+      i64_extend_i32_u: { imms: 0, args: 1 },
+      // a, b
+      i64_and: { imms: 0, args: 2 },
+      // val (todo: support >255)
+      i64_const: { imms: 1, args: 0 },
+    };
+
+    const opName = name.slice('__Porffor_wasm_'.length);
+
+    if (wasmOps[opName]) {
+      const op = wasmOps[opName];
+
+      const argOut = [];
+      for (let i = 0; i < op.args; i++) argOut.push(...generate(scope, decl.arguments[i]));
+
+      // literals only
+      const imms = decl.arguments.slice(op.args).map(x => x.value);
+
+      return [
+        ...argOut,
+        [ Opcodes[opName], ...imms ]
+      ];
+    }
+  }
+
   if (idx === undefined) {
     if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`);
     return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`);
@@ -1691,8 +1761,14 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   if (func && func.throws) scope.throws = true;
 
   let out = [];
-  for (const arg of args) {
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
     out = out.concat(generate(scope, arg));
+
+    if (builtinFuncs[name] && builtinFuncs[name].params[i] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
+      out.push(Opcodes.i32_to);
+    }
+
     if (typedParams) out = out.concat(getNodeType(scope, arg));
   }
 
@@ -1710,6 +1786,10 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     // );
   } else out.push(setLastType(scope));
 
+  if (builtinFuncs[name] && builtinFuncs[name].returns[0] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
+    out.push(Opcodes.i32_from);
+  }
+
   return out;
 };
 
@@ -1913,6 +1993,7 @@ const typeAnnoToPorfType = x => {
 
   switch (x) {
     case 'i32':
+    case 'i64':
       return TYPES.number;
   }
 
@@ -2707,7 +2788,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
   const valtype = itemTypeToValtype[itemType];
   const length = elements.length;
 
-  if (firstAssign && useRawElements) {
+  if (firstAssign && useRawElements && !Prefs.noData) {
     // if length is 0 memory/data will just be 0000... anyway
     if (length !== 0) {
       let bytes = compileBytes(length, 'i32');
@@ -2993,6 +3074,8 @@ const generateFunc = (scope, decl) => {
   };
   funcIndex[name] = func.index;
 
+  if (name === 'main') func.gotLastType = true;
+
   // quick hack fixes
   for (const inst of wasm) {
     if (inst[0] === Opcodes.call && inst[1] === -1) {

package/compiler/generated_builtins.js

@@ -1,3 +1,15 @@
+// autogenerated by compiler/precompile.js
+import { number } from './embedding.js';
 
 export const BuiltinFuncs = function() {
+  this.btoa = {
+    wasm: (scope, { allocPage, builtin }) => [...number(allocPage(scope, 'bytestring: keyStr', 'i8') * pageSize, 127),[34,2],[16, builtin('__Porffor_i32_ptrUnsafe')],[33,3],[32,0],[null],[40,1,0],[null],[33,4],...number(allocPage(scope, 'bytestring: output', 'i8') * pageSize, 127),[33,5],[65,0],[65,4],[32,4],[65,3],[109],[32,4],[65,3],[111],[69],[null],[69],[null],[106],[108],[34,6],[null],[54,1,128,128,4],[32,0],[16, builtin('__Porffor_i32_ptrUnsafe')],[33,8],[32,5],[16, builtin('__Porffor_i32_ptrUnsafe')],[33,9],[32,8],[32,4],[106],[33,10],[65,0],[33,11],[3,64],[32,8],[32,10],[72],[null],[4,64],[32,8],[32,8],[65,1],[106],[33,8],[45,0,4],[33,12],[32,8],[32,10],[72],[null],[4,127],[32,8],[32,8],[65,1],[106],[33,8],[45,0,4],[65,0],[33,14],[5],[65,127],[65,0],[33,14],[11],[33,13],[32,8],[32,10],[72],[null],[4,127],[32,8],[32,8],[65,1],[106],[33,8],[45,0,4],[65,0],[33,14],[5],[65,127],[65,0],[33,14],[11],[33,15],[32,12],[65,2],[117],[33,16],[32,12],[65,3],[113],[65,4],[116],[32,13],[65,127],[70],[null],[4,127],[65,0],[65,0],[33,14],[5],[32,13],[65,4],[117],[65,0],[33,14],[11],[114],[33,17],[32,13],[65,15],[113],[65,2],[116],[32,15],[65,127],[70],[null],[4,127],[65,0],[65,0],[33,14],[5],[32,15],[65,6],[117],[65,0],[33,14],[11],[114],[33,18],[32,15],[65,63],[113],[33,19],[32,13],[65,127],[70],[null],[4,64],[65,192,0],[33,18],[65,192,0],[33,19],[5],[32,15],[65,127],[70],[null],[4,64],[65,192,0],[33,19],[11],[11],[32,9],[32,9],[65,1],[106],[33,9],[32,3],[32,16],[106],[45,0,4],[58,0,4],[32,9],[32,9],[65,1],[106],[33,9],[32,3],[32,17],[106],[45,0,4],[58,0,4],[32,9],[32,9],[65,1],[106],[33,9],[32,3],[32,18],[106],[45,0,4],[58,0,4],[32,9],[32,9],[65,1],[106],[33,9],[32,3],[32,19],[106],[45,0,4],[58,0,4],[12,1],[11],[11],[32,5],[65,18],[15]],
+    params: [127,127],
+    typedParams: true,
+    returns: [127,127],
+    typedReturns: true,
+    locals: [127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127],
+    localNames: ["input","input#type","keyStr","keyStrPtr","len","output","__length_setter_tmp","$logicinner_tmp","i","j","endPtr","endPtr#type","chr1","chr2","#last_type","chr3","enc1","enc2","enc3","enc4"],
+    data: [{"offset":0,"bytes":[65,0,0,0,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,48,49,50,51,52,53,54,55,56,57,43,47,61]}],
+  };
 };

package/compiler/precompile.js

@@ -6,6 +6,22 @@ import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
+const TYPES = {
+  number: 0x00,
+  boolean: 0x01,
+  string: 0x02,
+  undefined: 0x03,
+  object: 0x04,
+  function: 0x05,
+  symbol: 0x06,
+  bigint: 0x07,
+
+  // these are not "typeof" types but tracked internally
+  _array: 0x10,
+  _regexp: 0x11,
+  _bytestring: 0x12
+};
+
 // import porfParse from './parse.js';
 // import porfCodegen from './codeGen.js';
 
@@ -31,6 +47,8 @@ const compile = async (file, [ _funcs, _globals ]) => {
 
   let { funcs, globals, data, exceptions } = porfCompile(source, ['module']);
 
+  const allocated = new Set();
+
   const exports = funcs.filter(x => x.export);
   for (const x of exports) {
     if (x.data) x.data = x.data.map(x => data[x]);
@@ -40,15 +58,33 @@ const compile = async (file, [ _funcs, _globals ]) => {
       return obj;
     }).filter(x => x);
 
-    for (const y of x.wasm) {
+    const locals = Object.keys(x.locals).reduce((acc, y) => {
+      acc[x.locals[y].idx] = { ...x.locals[y], name: y };
+      return acc;
+    }, {});
+
+    for (let i = 0; i < x.wasm.length; i++) {
+      const y = x.wasm[i];
+      const n = x.wasm[i + 1];
       if (y[0] === Opcodes.call) {
         const f = funcs.find(x => x.index === y[1]);
         if (!f) continue;
 
-        if (!f.internal) throw 'todo';
+        y[1] = f.name;
+      }
+
+      if (y[0] === Opcodes.const && (n[0] === Opcodes.local_set || n[0] === Opcodes.local_tee)) {
+        const l = locals[n[1]];
+        if (!l) continue;
+        if (![TYPES.string, TYPES._array, TYPES._bytestring].includes(l.metadata?.type)) continue;
+        if (!x.pages) continue;
 
-        x.used ??= [];
-        x.used.push(f.name);
+        const pageName = [...x.pages.keys()].find(z => z.endsWith(l.name));
+        if (!pageName || allocated.has(pageName)) continue;
+        allocated.add(pageName);
+
+        y.splice(0, 10, 'alloc', pageName, x.pages.get(pageName).type);
+        // y.push(x.pages.get(pageName));
       }
     }
   }
@@ -66,24 +102,28 @@ const precompile = async () => {
     await compile(join(dir, file), [ funcs, globals ]);
   }
 
-  // todo: globals, exceptions, pages per func
+  // ${x.pages && x.pages.size > 0 ? `    pages: ${JSON.stringify(Object.fromEntries(x.pages.entries()))},` : ''}
+  // ${x.used && x.used.length > 0 ? `    used: ${JSON.stringify(x.used)},` : ''}
 
   return `// autogenerated by compiler/precompile.js
+import { number } from './embedding.js';
 
 export const BuiltinFuncs = function() {
 ${funcs.map(x => `  this.${x.name} = {
-    wasm: ${JSON.stringify(x.wasm)},
+    wasm: (scope, { allocPage, builtin }) => ${JSON.stringify(x.wasm.filter(x => x.length)).replace(/\["alloc","(.*?)","(.*?)"\]/g, (_, reason, type) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtypeBinary})`).replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`)},
     params: ${JSON.stringify(x.params)},
     typedParams: true,
     returns: ${JSON.stringify(x.returns)},
     typedReturns: true,
-    locals: ${JSON.stringify(Object.values(x.locals).slice(x.params.length * 2).map(x => x.type))},
-${x.pages && x.pages.size > 0 ? `    pages: ${JSON.stringify(Object.fromEntries(x.pages.entries()))},` : ''}
+    locals: ${JSON.stringify(Object.values(x.locals).slice(x.params.length).map(x => x.type))},
+    localNames: ${JSON.stringify(Object.keys(x.locals))},
 ${x.data && x.data.length > 0 ? `    data: ${JSON.stringify(x.data)},` : ''}
 ${x.exceptions && x.exceptions.length > 0 ? `    exceptions: ${JSON.stringify(x.exceptions)},` : ''}
-${x.used && x.used.length > 0 ? `    used: ${JSON.stringify(x.used)},` : ''}
   };`.replaceAll('\n\n', '\n')).join('\n')}
-}`;
+};`;
 };
 
-console.log(await precompile());
+const code = await precompile();
+// console.log(code);
+
+fs.writeFileSync(join(__dirname, 'generated_builtins.js'), code);

package/compiler/prefs.js

@@ -1,3 +1,5 @@
+const onByDefault = [ 'bytestring' ];
+
 const cache = {};
 const obj = new Proxy({}, {
   get(_, p) {
@@ -8,10 +10,12 @@ const obj = new Proxy({}, {
       // fooBar -> foo-bar
       const name = p[0] === '_' ? p : p.replace(/[A-Z]/g, c => `-${c.toLowerCase()}`);
       if (process.argv.includes('-' + name)) return true;
+      if (process.argv.includes('-no-' + name)) return false;
 
       const valArg = process.argv.find(x => x.startsWith(`-${name}=`));
       if (valArg) return valArg.slice(name.length + 2);
 
+      if (onByDefault.includes(p)) return true;
       return undefined;
     })();
   }

package/compiler/prototype.js

@@ -385,7 +385,7 @@ export const PrototypeFuncs = function() {
 
           ...(noUnlikelyChecks ? [] : [ [ Opcodes.i32_or ] ]),
           [ Opcodes.if, Blocktype.void ],
-          ...number(NaN),
+          ...number(valtype === 'i32' ? -1 : NaN),
           [ Opcodes.br, 1 ],
           [ Opcodes.end ],
 
@@ -598,7 +598,7 @@ export const PrototypeFuncs = function() {
 
             ...(noUnlikelyChecks ? [] : [ [ Opcodes.i32_or ] ]),
             [ Opcodes.if, Blocktype.void ],
-            ...number(NaN),
+            ...number(valtype === 'i32' ? -1 : NaN),
             [ Opcodes.br, 1 ],
             [ Opcodes.end ],
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.2.0-181627c",
+  "version": "0.2.0-2265539",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {