porffor 0.2.0-fde989a → 0.14.0-032e4ad08

package/compiler/wasmSpec.js

@@ -1,4 +1,13 @@
-import { enumify } from "../util/enum.js";
+const enumify = (...args) => {
+  const obj = {};
+
+  for (let i = 0; i < args.length; i++) {
+    obj[i] = args[i];
+    obj[args[i]] = i;
+  }
+
+  return obj;
+};
 
 export const Section = enumify('custom', 'type', 'import', 'func', 'table', 'memory', 'global', 'export', 'start', 'element', 'code', 'data', 'data_count', 'tag');
 export const ExportDesc = enumify('func', 'table', 'mem', 'global', 'tag');
@@ -12,6 +21,11 @@ export const Valtype = {
   v128: 0x7b
 };
 
+export const Reftype = {
+  funcref: 0x70,
+  externref: 0x6f
+};
+
 export const Blocktype = {
   void: 0x40,
 };
@@ -32,17 +46,16 @@ export const Opcodes = {
   throw: 0x08,
   rethrow: 0x09,
 
-  call: 0x10,
-  call_indirect: 0x11,
-  return_call: 0x12,
-  return_call_indirect: 0x13,
-
   end: 0x0b,
   br: 0x0c,
   br_if: 0x0d,
   br_table: 0x0e,
   return: 0x0f,
+
   call: 0x10,
+  call_indirect: 0x11,
+  return_call: 0x12,
+  return_call_indirect: 0x13,
 
   drop: 0x1a,
 
@@ -62,13 +75,22 @@ export const Opcodes = {
   i32_load16_s: 0x2e,
   i32_load16_u: 0x2f,
 
-  i32_store8: 0x3a,
-  i32_store16: 0x3b,
+  i64_load8_s: 0x30,
+  i64_load8_u: 0x31,
+  i64_load16_s: 0x32,
+  i64_load16_u: 0x33,
 
   i32_store: 0x36,
   i64_store: 0x37,
   f64_store: 0x39,
 
+  i32_store8: 0x3a,
+  i32_store16: 0x3b,
+
+  i64_store8: 0x3c,
+  i64_store16: 0x3d,
+
+  memory_size: 0x3f,
   memory_grow: 0x40,
 
   i32_const: 0x41,
@@ -100,6 +122,8 @@ export const Opcodes = {
   i32_shl: 0x74,
   i32_shr_s: 0x75,
   i32_shr_u: 0x76,
+  i32_rotl: 0x77,
+  i32_rotr: 0x78,
 
   i64_eqz: 0x50,
   i64_eq: 0x51,
@@ -123,6 +147,7 @@ export const Opcodes = {
   i64_shr_s: 0x87,
   i64_shr_u: 0x88,
   i64_rotl: 0x89,
+  i64_rotr: 0x8a,
 
   f64_eq: 0x61,
   f64_ne: 0x62,

package/compiler/wrap.js

@@ -1,26 +1,104 @@
+import { encodeVector, encodeLocal } from './encoding.js';
+import { importedFuncs } from './builtins.js';
 import compile from './index.js';
 import decompile from './decompile.js';
-import { encodeVector, encodeLocal } from './encoding.js';
-// import fs from 'node:fs';
+import { TYPES } from './types.js';
+import { log } from './log.js';
+import Prefs from './prefs.js';
 
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
-const typeBase = 0x00;
-const internalTypeBase = 0x10;
-const TYPES = {
-  [typeBase]: 'number',
-  [typeBase + 1]: 'boolean',
-  [typeBase + 2]: 'string',
-  [typeBase + 3]: 'undefined',
-  [typeBase + 4]: 'object',
-  [typeBase + 5]: 'function',
-  [typeBase + 6]: 'symbol',
-  [typeBase + 7]: 'bigint',
-
-  // internal
-  [internalTypeBase]: '_array',
-  [internalTypeBase + 1]: '_regexp',
-  [internalTypeBase + 2]: '_bytestring'
+const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
+  switch (type) {
+    case TYPES.boolean: return Boolean(value);
+    case TYPES.undefined: return undefined;
+    case TYPES.object: return value === 0 ? null : {};
+
+    case TYPES.function: {
+      let func;
+      if (value < 0) {
+        func = importedFuncs[value + importedFuncs.length];
+      } else {
+        func = funcs.find(x => ((x.originalIndex ?? x.index) - importedFuncs.length) === value);
+      }
+
+      if (!func) return function () {};
+
+      // make fake empty func for repl/etc
+      return {[func.name]() {}}[func.name];
+    }
+
+    case TYPES.string: {
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
+      return Array.from(new Uint16Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
+    }
+
+    case TYPES.bytestring: {
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
+      return Array.from(new Uint8Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
+    }
+
+    case TYPES.array: {
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
+
+      const out = [];
+      for (let i = 0; i < length; i++) {
+        const offset = value + 4 + (i * 9);
+
+        // have to slice because of memory alignment (?)
+        const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
+        const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+
+        // console.log(`reading value at index ${i}...`)
+        // console.log('  memory:', Array.from(new Uint8Array(memory.buffer, offset, 9)).map(x => x.toString(16).padStart(2, '0')).join(' '));
+        // console.log('  read:', { value: v, type: t }, '\n');
+
+        out.push(porfToJSValue({ memory, funcs, pages }, v, t));
+      }
+
+      return out;
+    }
+
+    case TYPES.date: {
+      const t = (new Float64Array(memory.buffer, value, 1))[0];
+      return new Date(t);
+    }
+
+    case TYPES.set: {
+      const size = (new Int32Array(memory.buffer, value, 1))[0];
+
+      const out = new Set();
+      for (let i = 0; i < size; i++) {
+        const offset = value + 4 + (i * 9);
+
+        // have to slice because of memory alignment (?)
+        const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
+        const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+
+        // console.log(`reading value at index ${i}...`)
+        // console.log('  memory:', Array.from(new Uint8Array(memory.buffer, offset, 9)).map(x => x.toString(16).padStart(2, '0')).join(' '));
+        // console.log('  read:', { value: v, type: t }, '\n');
+
+        out.add(porfToJSValue({ memory, funcs, pages }, v, t));
+      }
+
+      return out;
+    }
+
+    case TYPES.symbol: {
+      const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
+      const offset = descStore + 4 + ((value - 1) * 9);
+
+      const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
+      const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+
+      const desc = porfToJSValue({ memory, funcs, pages }, v, t);
+
+      return Symbol(desc);
+    }
+
+    default: return value;
+  }
 };
 
 export default async (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
@@ -29,36 +107,21 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
   const t1 = performance.now();
   const { wasm, funcs, globals, tags, exceptions, pages, c } = compile(source, flags);
 
+  globalThis.porfDebugInfo = { funcs, globals };
+
   if (source.includes('export function')) flags.push('module');
 
-  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
+  // (await import('node:fs')).writeFileSync('out.wasm', Buffer.from(wasm));
 
   times.push(performance.now() - t1);
-  if (flags.includes('info')) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
-
-  const t2 = performance.now();
-
-  let instance;
-  try {
-    0, { instance } = await WebAssembly.instantiate(wasm, {
-      '': {
-        p: valtype === 'i64' ? i => print(Number(i).toString()) : i => print(i.toString()),
-        c: valtype === 'i64' ? i => print(String.fromCharCode(Number(i))) : i => print(String.fromCharCode(i)),
-        t: _ => performance.now(),
-        ...customImports
-      }
-    });
-  } catch (e) {
-    // only backtrace for runner, not test262/etc
-    if (!process.argv[1].includes('/runner')) throw e;
+  if (Prefs.profileCompiler) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
 
-    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)[1]);
-    const blobOffset = parseInt(e.message.split('@')[1]);
+  const backtrace = (funcInd, blobOffset) => {
+    if (funcInd == null || blobOffset == null) return false;
 
     // convert blob offset -> function wasm offset.
     // this is not good code and is somewhat duplicated
     // I just want it to work for debugging, I don't care about perf/yes
-
     const func = funcs.find(x => x.index === funcInd);
     const locals = Object.values(func.locals).sort((a, b) => a.idx - b.idx).slice(func.params.length).sort((a, b) => a.idx - b.idx);
 
@@ -76,7 +139,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
 
     if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
 
-    const toFind = encodeVector(localDecl).concat(func.wasm.flat().filter(x => x != null && x <= 0xff).slice(0, 40));
+    const toFind = encodeVector(localDecl).concat(func.wasm.flat().filter(x => x != null && x <= 0xff).slice(0, 60));
 
     let i = 0;
     for (; i < wasm.length; i++) {
@@ -91,7 +154,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
       if (!mismatch) break;
     }
 
-    if (i === wasm.length) throw e;
+    if (i === wasm.length) return false;
 
     const offset = (blobOffset - i) + encodeVector(localDecl).length;
 
@@ -102,7 +165,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
       if (cumLen === offset) break;
     }
 
-    if (cumLen !== offset) throw e;
+    if (cumLen !== offset) return false;
 
     i -= 1;
 
@@ -127,13 +190,46 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
     console.log(decomp.join('\n'));
     console.log('\x1B[90m...\x1B[0m\n');
 
+    return true;
+  };
+
+  const t2 = performance.now();
+
+  let instance;
+  try {
+    let wasmEngine = WebAssembly;
+    if (Prefs.asur) {
+      log.warning('wrap', 'using our !experimental! asur wasm engine instead of host to run');
+      wasmEngine = await import('../asur/index.js');
+    }
+
+    0, { instance } = await wasmEngine.instantiate(wasm, {
+      '': {
+        p: valtype === 'i64' ? i => print(Number(i).toString()) : i => print(i.toString()),
+        c: valtype === 'i64' ? i => print(String.fromCharCode(Number(i))) : i => print(String.fromCharCode(i)),
+        t: () => performance.now(),
+        u: () => performance.timeOrigin,
+        y: () => {},
+        z: () => {},
+        ...customImports
+      }
+    });
+  } catch (e) {
+    // only backtrace for runner, not test262/etc
+    if (!process.argv[1].includes('/runner')) throw e;
+
+    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)?.[1]);
+    const blobOffset = parseInt(e.message.split('@')?.[1]);
+
+    backtrace(funcInd, blobOffset);
     throw e;
   }
 
   times.push(performance.now() - t2);
-  if (flags.includes('info')) console.log(`instantiated in ${times[1].toFixed(2)}ms`);
+  if (Prefs.profileCompiler) console.log(`instantiated in ${times[1].toFixed(2)}ms`);
 
   const exports = {};
+  const rawValues = process.argv.includes('-i');
 
   const exceptTag = instance.exports['0'], memory = instance.exports['$'];
   for (const x in instance.exports) {
@@ -151,54 +247,12 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
 
     exports[func.name] = function() {
       try {
-        const _ret = exp.apply(this, arguments);
-
-        if (_ret == null) return undefined;
-
-        const [ ret, type ] = _ret;
-
-        // if (ret >= typeBase && ret <= typeBase + 8) return ret > (typeBase + 7) ? 'object' : TYPES[ret];
-
-        switch (TYPES[type]) {
-          case 'boolean': return Boolean(ret);
-          case 'undefined': return undefined;
-          case 'object': return ret === 0 ? null : {};
-
-          case '_array': {
-            const pointer = ret;
-            const length = new Int32Array(memory.buffer, pointer, 1);
-
-            // have to slice because of memory alignment
-            const buf = memory.buffer.slice(pointer + 4, pointer + 4 + 8 * length);
-
-            return Array.from(new Float64Array(buf));
-          }
+        const ret = exp.apply(this, arguments);
+        if (ret == null) return undefined;
 
-          case 'string': {
-            const pointer = ret;
-            const length = new Int32Array(memory.buffer, pointer, 1);
+        if (rawValues) return { value: ret[0], type: ret[1], js: porfToJSValue({ memory, funcs, pages }, ret[0], ret[1]) };
 
-            return Array.from(new Uint16Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
-          }
-
-          case '_bytestring': {
-            const pointer = ret;
-            const length = new Int32Array(memory.buffer, pointer, 1);
-
-            return Array.from(new Uint8Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
-          }
-
-          case 'function': {
-            // wasm func index, including all imports
-            const func = funcs.find(x => (x.originalIndex ?? x.index) === ret);
-            if (!func) return ret;
-
-            // make fake empty func for repl/etc
-            return {[func.name]() {}}[func.name];
-          }
-
-          default: return ret;
-        }
+        return porfToJSValue({ memory, funcs, pages }, ret[0], ret[1]);
       } catch (e) {
         if (e.is && e.is(exceptTag)) {
           const exceptId = e.getArg(exceptTag, 0);
@@ -213,6 +267,17 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
           throw new constructor(exception.message);
         }
 
+        if (e instanceof WebAssembly.RuntimeError) {
+          // only backtrace for runner, not test262/etc
+          if (!process.argv[1].includes('/runner')) throw e;
+
+          const match = e.stack.match(/wasm-function\[([0-9]+)\]:([0-9a-z]+)/) ?? [];
+          const funcInd = parseInt(match[1]);
+          const blobOffset = parseInt(match[2]);
+
+          backtrace(funcInd, blobOffset);
+        }
+
         throw e;
       }
     };

package/package.json

@@ -1,21 +1,25 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.2.0-fde989a",
+  "version": "0.14.0-032e4ad08",
   "author": "CanadaHonk",
   "license": "MIT",
+  "scripts": {
+    "precompile": "node ./compiler/precompile.js"
+  },
   "dependencies": {
-    "acorn": "^8.9.0"
+    "acorn": "^8.11.3",
+    "node-repl-polyfill": "^0.1.1"
   },
   "optionalDependencies": {
-    "@babel/parser": "^7.23.6",
+    "@babel/parser": "^7.24.4",
     "hermes-parser": "^0.18.2",
     "meriyah": "^4.3.9"
   },
   "bin": {
     "porf": "./runner/index.js"
   },
-  "main": "./runner/index.js",
+  "main": "./compiler/wrap.js",
   "type": "module",
   "repository": {
     "type": "git",
@@ -25,4 +29,4 @@
     "url": "https://github.com/CanadaHonk/porffor/issues"
   },
   "homepage": "https://porffor.goose.icu"
-}
+}

package/porf

@@ -1,2 +1,4 @@
 #!/bin/sh
 node runner/index.js "$@"
+# deno run -A runner/index.js "$@"
+# bun runner/index.js "$@"

package/porffor_tmp.c

@@ -0,0 +1,202 @@
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+typedef uint8_t i8;
+typedef uint16_t i16;
+typedef int32_t i32;
+typedef uint32_t u32;
+typedef int64_t i64;
+typedef uint64_t u64;
+typedef float f32;
+typedef double f64;
+
+f64 NAN = 0e+0/0e+0;
+
+struct ReturnValue {
+  f64 value;
+  i32 type;
+};
+
+char _memory[131072];
+
+int _argc; char** _argv;
+i32 i32_load(i32 align, i32 offset, i32 pointer) {
+  i32 out;
+  memcpy(&out, _memory + offset + pointer, sizeof(out));
+  return out;
+}
+
+i32 i32_load8_u(i32 align, i32 offset, i32 pointer) {
+  i8 out;
+  memcpy(&out, _memory + offset + pointer, sizeof(out));
+  return out;
+}
+
+void i32_store(i32 align, i32 offset, i32 pointer, i32 value) {
+  memcpy(_memory + offset + pointer, &value, sizeof(value));
+}
+
+void __Porffor_readArgv(u32 index, u32 outPtr) {
+  if (index >= _argc) {
+    printf("expected %d arguments\n", index);
+    exit(1);
+  }
+
+  char* arg = _argv[index];
+
+  u32 read = 0;
+  char* out = _memory + outPtr + 4;
+  char ch;
+  while ((ch = *(arg++)) != 0) {
+    out[read++] = ch;
+  }
+
+  memcpy(_memory + outPtr, &read, sizeof(read));
+}
+void __Porffor_readFile(u32 pathPtr, u32 outPtr) {
+  char* path = _memory + pathPtr + 4;
+  FILE* fp = fopen(path, "r");
+  if (fp == NULL) {
+    printf("failed to open file: %s\n", path);
+    exit(1);
+  }
+
+  u32 read = 0;
+  char* out = _memory + outPtr + 4;
+  char ch;
+  while ((ch = fgetc(fp)) != EOF) {
+    out[read++] = ch;
+  }
+
+  fclose(fp);
+
+  memcpy(_memory + outPtr, &read, sizeof(read));
+}
+
+f64 out = 0;
+i32 outdtype = 0;
+
+void __Porffor_print(f64 x, i32 y) {
+  i32 a = 0;
+  i32 b = 0;
+  i32 dtypeswitch_tmp = 0;
+
+  dtypeswitch_tmp = y;
+  // block 
+    // if 
+      if (dtypeswitch_tmp == 0) {
+        printf("%g\n", x);
+        goto j0;
+      }
+    // end
+    j1:;
+    // if 
+      if (dtypeswitch_tmp == 1) {
+        // if 
+          if (((u32)x) != 0) {
+            printf("%c", (int)(1.16e+2));
+            printf("%c", (int)(1.14e+2));
+            printf("%c", (int)(1.17e+2));
+            printf("%c", (int)(1.01e+2));
+          } else {
+            printf("%c", (int)(1.02e+2));
+            printf("%c", (int)(9.7e+1));
+            printf("%c", (int)(1.08e+2));
+            printf("%c", (int)(1.15e+2));
+            printf("%c", (int)(1.01e+2));
+          }
+        // end
+        j3:;
+        goto j0;
+      }
+    // end
+    j2:;
+    // if 
+      if (dtypeswitch_tmp == 3) {
+        printf("%c", (int)(1.17e+2));
+        printf("%c", (int)(1.1e+2));
+        printf("%c", (int)(1e+2));
+        printf("%c", (int)(1.01e+2));
+        printf("%c", (int)(1.02e+2));
+        printf("%c", (int)(1.05e+2));
+        printf("%c", (int)(1.1e+2));
+        printf("%c", (int)(1.01e+2));
+        printf("%c", (int)(1e+2));
+        goto j0;
+      }
+    // end
+    j4:;
+    // if 
+      if (dtypeswitch_tmp == 4) {
+        // if 
+          if (((u32)x) != 0) {
+            printf("%c", (int)(1.23e+2));
+            printf("%c", (int)(1.25e+2));
+          } else {
+            printf("%c", (int)(1.1e+2));
+            printf("%c", (int)(1.17e+2));
+            printf("%c", (int)(1.08e+2));
+            printf("%c", (int)(1.08e+2));
+          }
+        // end
+        j6:;
+        goto j0;
+      }
+    // end
+    j5:;
+    // if 
+      if (dtypeswitch_tmp == 5) {
+        printf("%c", (int)(1.02e+2));
+        printf("%c", (int)(1.17e+2));
+        printf("%c", (int)(1.1e+2));
+        printf("%c", (int)(9.9e+1));
+        printf("%c", (int)(1.16e+2));
+        printf("%c", (int)(1.05e+2));
+        printf("%c", (int)(1.11e+2));
+        printf("%c", (int)(1.1e+2));
+        printf("%c", (int)(3.2e+1));
+        printf("%c", (int)(4e+1));
+        printf("%c", (int)(4.1e+1));
+        printf("%c", (int)(3.2e+1));
+        printf("%c", (int)(1.23e+2));
+        printf("%c", (int)(1.25e+2));
+        goto j0;
+      }
+    // end
+    j7:;
+    // if 
+      if (dtypeswitch_tmp == 18) {
+        a = (u32)x;
+        b = i32_load(1, 0, a) + a;
+        // loop 
+        j9:;
+          printf("%c", (int)((f64)(i32_load8_u(0, 4, a))));
+          a = a + 1;
+          if (a != b) {
+            goto j9;
+          }
+        // end
+        goto j0;
+      }
+    // end
+    j8:;
+    printf("%g\n", x);
+  // end
+  j0:;
+}
+
+int main(int argc, char* argv[]) {
+_argc = argc; _argv = argv;
+
+  out = 1e+0;
+  outdtype = 18;
+  i32_store(1, 0, 65536, 0);
+  __Porffor_readArgv((u32)(0e+0), (u32)(6.5536e+4));
+  __Porffor_readFile((u32)(undefined), (u32)(out));
+  __Porffor_print(out, outdtype);
+  printf("%c", (int)(1e+1));
+
+  return 0;
+}