porffor 0.14.0-f67c123a1 → 0.16.0-08983b6b1

package/compiler/wrap.js

@@ -6,9 +6,26 @@ import { TYPES } from './types.js';
 import { log } from './log.js';
 import Prefs from './prefs.js';
 
+const fs = (typeof process?.version !== 'undefined' ? (await import('node:fs')) : undefined);
+
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
-const porfToJSValue = (memory, funcs, value, type) => {
+export const readByteStr = (memory, ptr) => {
+  const length = (new Int32Array(memory.buffer, ptr, 1))[0];
+  return Array.from(new Uint8Array(memory.buffer, ptr + 4, length)).map(x => String.fromCharCode(x)).join('');
+};
+
+export const writeByteStr = (memory, ptr, str) => {
+  const length = str.length;
+  (new Int32Array(memory.buffer, ptr, 1))[0] = length;
+
+  const arr = new Uint8Array(memory.buffer, ptr + 4, length);
+  for (let i = 0; i < length; i++) {
+    arr[i] = str.charCodeAt(i);
+  }
+};
+
+const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
   switch (type) {
     case TYPES.boolean: return Boolean(value);
     case TYPES.undefined: return undefined;
@@ -41,9 +58,22 @@ const porfToJSValue = (memory, funcs, value, type) => {
     case TYPES.array: {
       const length = (new Int32Array(memory.buffer, value, 1))[0];
 
-      // have to slice because of memory alignment (?)
-      const buf = memory.buffer.slice(value + 4, value + 4 + 8 * length);
-      return Array.from(new Float64Array(buf, 0, length));
+      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: {
@@ -66,66 +96,54 @@ const porfToJSValue = (memory, funcs, value, type) => {
         // 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, v, t));
+        out.add(porfToJSValue({ memory, funcs, pages }, v, t));
       }
 
       return out;
     }
 
+    case TYPES.symbol: {
+      const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
+      if (!descStore) return Symbol();
+
+      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)) => {
+export default (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
   const times = [];
 
   const t1 = performance.now();
-  const { wasm, funcs, globals, tags, exceptions, pages, c } = compile(source, flags);
+  const { wasm, funcs, globals, tags, exceptions, pages, c } = typeof source === 'object' ? source : compile(source, flags);
 
   globalThis.porfDebugInfo = { funcs, globals };
 
-  if (source.includes('export function')) flags.push('module');
+  if (source.includes?.('export ')) flags.push('module');
 
-  // (await import('node:fs')).writeFileSync('out.wasm', Buffer.from(wasm));
+  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
   times.push(performance.now() - t1);
   if (Prefs.profileCompiler) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
 
-  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]);
-
-    if (!funcInd) throw e;
+  const backtrace = (funcInd, blobOffset) => {
+    if (funcInd == null || blobOffset == null ||
+        Number.isNaN(funcInd) || Number.isNaN(blobOffset)) 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);
+    if (!func) return false;
+
     const locals = Object.values(func.locals).sort((a, b) => a.idx - b.idx).slice(func.params.length).sort((a, b) => a.idx - b.idx);
 
     let localDecl = [], typeCount = 0, lastType;
@@ -142,7 +160,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++) {
@@ -157,7 +175,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;
 
@@ -168,7 +186,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;
 
@@ -193,6 +211,59 @@ 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, {
+    const module = new WebAssembly.Module(wasm);
+    instance = new WebAssembly.Instance(module, {
+      '': {
+        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: () => {},
+        w: (ind, outPtr) => { // readArgv
+          const args = process.argv.slice(2).filter(x => !x.startsWith('-'));
+          const str = args[ind];
+          if (!str) return -1;
+
+          writeByteStr(memory, outPtr, str);
+          return str.length;
+        },
+        q: (pathPtr, outPtr) => { // readFile
+          try {
+            const path = readByteStr(memory, pathPtr);
+            const contents = fs.readFileSync(path, 'utf8');
+            writeByteStr(memory, outPtr, contents);
+            return contents.length;
+          } catch {
+            return -1;
+          }
+        },
+        ...customImports
+      }
+    });
+  } catch (e) {
+    // only backtrace for runner, not test262/etc
+    if (!process.argv[1].includes('/runner')) throw e;
+    if (!(e instanceof WebAssembly.CompileError)) throw e;
+
+    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)?.[1]);
+    const blobOffset = parseInt(e.message.split('@')?.[1]);
+
+    backtrace(funcInd, blobOffset);
     throw e;
   }
 
@@ -200,6 +271,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
   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) {
@@ -218,10 +290,11 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
     exports[func.name] = function() {
       try {
         const ret = exp.apply(this, arguments);
-
         if (ret == null) return undefined;
 
-        return porfToJSValue(memory, funcs, ret[0], ret[1]);
+        if (rawValues) return { value: ret[0], type: ret[1], js: porfToJSValue({ memory, funcs, pages }, ret[0], ret[1]) };
+
+        return porfToJSValue({ memory, funcs, pages }, ret[0], ret[1]);
       } catch (e) {
         if (e.is && e.is(exceptTag)) {
           const exceptId = e.getArg(exceptTag, 0);
@@ -236,6 +309,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,12 +1,10 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.14.0-f67c123a1",
+  "version": "0.16.0-08983b6b1",
   "author": "CanadaHonk",
   "license": "MIT",
-  "scripts": {
-    "precompile": "node ./compiler/precompile.js"
-  },
+  "scripts": {},
   "dependencies": {
     "acorn": "^8.11.3",
     "node-repl-polyfill": "^0.1.1"
@@ -28,5 +26,5 @@
   "bugs": {
     "url": "https://github.com/CanadaHonk/porffor/issues"
   },
-  "homepage": "https://porffor.goose.icu"
+  "homepage": "https://porffor.dev"
 }

package/runner/index.js

@@ -1,8 +1,11 @@
 #!/usr/bin/env node
-
-import compile from '../compiler/wrap.js';
 import fs from 'node:fs';
 
+// deno compat
+if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
+  globalThis.process = await import('node:process');
+}
+
 const start = performance.now();
 
 if (process.argv.includes('--compile-hints')) {
@@ -25,7 +28,7 @@ if (process.argv.includes('--help')) {
   console.log(`Usage: \x1B[1mporf [command] path/to/script.js [...prefs] [...args]\x1B[0m`);
 
   // commands
-  console.log(`\n\u001b[4mCommands\x1B[0m`);
+  console.log(`\n\x1B[1mCommands:\x1B[0m`);
   for (const [ cmd, [ color, desc ] ] of Object.entries({
     run: [ 34, 'Run a JS file' ],
     wasm: [ 34, 'Compile a JS file to a Wasm binary\n' ],
@@ -59,10 +62,22 @@ if (process.argv.includes('--help')) {
 }
 
 let file = process.argv.slice(2).find(x => x[0] !== '-');
-if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
+if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
+  // remove this arg
+  process.argv.splice(process.argv.indexOf(file), 1);
+
+  if (file === 'precompile') {
+    await import('../compiler/precompile.js');
+    await new Promise(() => {}); // do nothing for the rest of this file
+  }
+
   if (file === 'profile') {
-    process.argv.splice(process.argv.indexOf(file), 1);
-    await import('./profiler.js');
+    await import('./profile.js');
+    await new Promise(() => {}); // do nothing for the rest of this file
+  }
+
+  if (file === 'debug') {
+    await import('./debug.js');
     await new Promise(() => {}); // do nothing for the rest of this file
   }
 
@@ -74,13 +89,7 @@ if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(fi
     process.argv.push('--asur', '--wasm-debug');
   }
 
-  if (file === 'debug') {
-    process.argv.splice(process.argv.indexOf(file), 1);
-    await import('./debug.js');
-    await new Promise(() => {}); // do nothing for the rest of this file
-  }
-
-  file = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
+  file = process.argv.slice(2).find(x => x[0] !== '-');
 
   const nonOptOutFile = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
   if (nonOptOutFile) {
@@ -88,6 +97,8 @@ if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(fi
   }
 }
 
+globalThis.file = file;
+
 if (!file) {
   if (process.argv.includes('-v') || process.argv.includes('--version')) {
     // just print version
@@ -102,6 +113,8 @@ if (!file) {
 
 const source = fs.readFileSync(file, 'utf8');
 
+const compile = (await import('../compiler/wrap.js')).default;
+
 let cache = '';
 const print = str => {
   /* cache += str;
@@ -114,17 +127,20 @@ const print = str => {
   process.stdout.write(str);
 };
 
+let runStart;
 try {
   if (process.argv.includes('-b')) {
     const { wasm, exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
+    runStart = performance.now();
     if (!process.argv.includes('--no-run')) exports.main();
 
     console.log(`\n\nwasm size: ${wasm.byteLength} bytes`);
   } else {
     const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
-    if (!process.argv.includes('-no-run')) exports.main();
+    runStart = performance.now();
+    if (!process.argv.includes('--no-run')) exports.main();
   }
   // if (cache) process.stdout.write(cache);
 } catch (e) {
@@ -132,4 +148,4 @@ try {
   console.error(process.argv.includes('-i') ? e : `${e.constructor.name}: ${e.message}`);
 }
 
-if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms`);
+if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms\nexecution time: ${(performance.now() - runStart).toFixed(2)}ms`);

package/runner/repl.js

@@ -1,6 +1,11 @@
+import { TYPE_NAMES } from '../compiler/types.js';
 import compile from '../compiler/wrap.js';
 import version from './version.js';
 
+import util from 'node:util';
+
+process.argv.push('--no-opt-unused');
+
 let repl;
 try {
   // try importing node:repl
@@ -86,10 +91,21 @@ const run = async (source, _context, _filename, callback, run = true) => {
     lastPages = [...pages.keys()];
   }
 
-  const ret = run ? exports.main() : undefined;
-  callback(null, ret);
+  let ret = run ? exports.main() : undefined;
+  let value, type;
+  if (ret?.type != null) {
+    value = ret.value;
+    type = ret.type;
+    ret = ret.js;
+  }
+
+  console.log(util.inspect(ret, false, 2, true), (value != null ? `\x1B[34m\x1B[3m(value: ${value}, type: ${TYPE_NAMES[type]})\x1B[0m` : ''));
+
+  // callback(null, ret);
 
   prev = prev + ';\n' + source.trim();
+
+  callback();
 };
 
 const replServer = repl.start({ prompt: '> ', eval: run });