porffor 0.18.12 → 0.18.14

package/compiler/types.js

@@ -9,6 +9,16 @@ export const TYPES = {
   bigint: 0x07
 };
 
+// flags
+export const TYPE_FLAGS = {
+  // iterable:  0b10000000,
+  parity:    0b10000000,
+  length:    0b01000000,
+};
+
+// TYPES.string |= TYPE_FLAGS.iterable;
+TYPES.string |= TYPE_FLAGS.length;
+
 export const TYPE_NAMES = {
   [TYPES.number]: 'Number',
   [TYPES.boolean]: 'Boolean',
@@ -20,23 +30,14 @@ export const TYPE_NAMES = {
   [TYPES.bigint]: 'BigInt'
 };
 
-// flags
-export const TYPE_FLAGS = {
-  // iterable:  0b10000000,
-  length:    0b01000000,
-};
-
-// TYPES.string |= TYPE_FLAGS.iterable;
-TYPES.string |= TYPE_FLAGS.length;
-
 export const typeHasFlag = (type, flag) => (type & flag) !== 0;
 
 export const INTERNAL_TYPE_BASE = 0x10;
 let internalTypeIndex = INTERNAL_TYPE_BASE;
-const registerInternalType = (name, flags = []) => {
-  let n = internalTypeIndex++;
+const registerInternalType = (name, flags = [], overrideType = undefined) => {
+  let n = overrideType ?? internalTypeIndex++;
 
-  for (const x of flags) {
+  if (!overrideType) for (const x of flags) {
     if (TYPE_FLAGS[x]) n |= TYPE_FLAGS[x];
   }
 
@@ -49,7 +50,7 @@ const registerInternalType = (name, flags = []) => {
 
 registerInternalType('Array', ['iterable', 'length']);
 registerInternalType('RegExp');
-registerInternalType('ByteString', ['iterable', 'length']);
+registerInternalType('ByteString', ['iterable', 'length'], TYPES.string | TYPE_FLAGS.parity);
 registerInternalType('Date');
 registerInternalType('Set', ['iterable']);
 

package/compiler/wrap.js

@@ -147,6 +147,36 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
   times.push(performance.now() - t1);
   if (Prefs.profileCompiler) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
 
+  const printDecomp = (middleIndex, func, funcs, globals, exceptions) => {
+    console.log(`\x1B[35m\x1B[1mporffor backtrace\u001b[0m`);
+    console.log('\x1B[4m' + func.name + '\x1B[0m');
+
+    const surrounding = Prefs.backtraceSurrounding ?? 5;
+    let min = middleIndex - surrounding;
+    let max = middleIndex + surrounding + 1;
+    if (Prefs.backtraceEntireFunc || middleIndex == -1) {
+      min = 0;
+      max = func.wasm.length;
+    }
+
+    const decomp = decompile(func.wasm.slice(min, max), '', 0, func.locals, func.params, func.returns, funcs, globals, exceptions).slice(0, -1).split('\n');
+
+    const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
+    let longest = 0;
+    for (let j = 0; j < decomp.length; j++) {
+      longest = Math.max(longest, noAnsi(decomp[j]).length);
+    }
+
+    if (middleIndex != -1) {
+      const middle = Math.floor(decomp.length / 2);
+      decomp[middle] = `\x1B[47m\x1B[30m${noAnsi(decomp[middle])}${'\u00a0'.repeat(longest - noAnsi(decomp[middle]).length)}\x1B[0m`;
+    }
+
+    if (min != 0) console.log('\x1B[90m...\x1B[0m');
+    console.log(decomp.join('\n'));
+    if (max > func.wasm.length) console.log('\x1B[90m...\x1B[0m\n');
+  }
+
   const backtrace = (funcInd, blobOffset) => {
     if (funcInd == null || blobOffset == null ||
         Number.isNaN(funcInd) || Number.isNaN(blobOffset)) return false;
@@ -188,7 +218,10 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
       if (!mismatch) break;
     }
 
-    if (i === wasm.length) return false;
+    if (i === wasm.length) {
+      printDecomp(-1, func, funcs, globals, exceptions);
+      return false;
+    }
 
     const offset = (blobOffset - i) + encodeVector(localDecl).length;
 
@@ -199,30 +232,14 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
       if (cumLen === offset) break;
     }
 
-    if (cumLen !== offset) return false;
-
-    i -= 1;
-
-    console.log(`\x1B[35m\x1B[1mporffor backtrace\u001b[0m`);
-
-    console.log('\x1B[4m' + func.name + '\x1B[0m');
-
-    const surrounding = 6;
-
-    const decomp = decompile(func.wasm.slice(i - surrounding, i + surrounding + 1), '', 0, func.locals, func.params, func.returns, funcs, globals, exceptions).slice(0, -1).split('\n');
-
-    const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
-    let longest = 0;
-    for (let j = 0; j < decomp.length; j++) {
-      longest = Math.max(longest, noAnsi(decomp[j]).length);
+    if (cumLen !== offset)  {
+      printDecomp(-1, func, funcs, globals, exceptions);
+      return false;
     }
 
-    const middle = Math.floor(decomp.length / 2);
-    decomp[middle] = `\x1B[47m\x1B[30m${noAnsi(decomp[middle])}${'\u00a0'.repeat(longest - noAnsi(decomp[middle]).length)}\x1B[0m`;
+    i -= 1;
 
-    console.log('\x1B[90m...\x1B[0m');
-    console.log(decomp.join('\n'));
-    console.log('\x1B[90m...\x1B[0m\n');
+    printDecomp(i, func, funcs, globals, exceptions);
 
     return true;
   };
@@ -271,8 +288,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
       }
     });
   } catch (e) {
-    // only backtrace for runner, not test262/etc
-    if (!process.argv[1].includes('/runner')) throw e;
+    if (!process.argv.includes('-i')) throw e;
     if (!(e instanceof WebAssembly.CompileError)) throw e;
 
     const funcInd = parseInt(e.message.match(/function #([0-9]+) /)?.[1]);
@@ -367,8 +383,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
         }
 
         if (e instanceof WebAssembly.RuntimeError) {
-          // only backtrace for runner, not test262/etc
-          if (!process.argv[1].includes('/runner')) throw e;
+          if (!process.argv.includes('-i')) throw e;
 
           const match = e.stack.match(/wasm-function\[([0-9]+)\]:([0-9a-z]+)/) ?? [];
           const funcInd = parseInt(match[1]);

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.18.12+a6989c4b7",
+  "version": "0.18.14+d7ef62736",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.18.12+a6989c4b7';
+globalThis.version = '0.18.14+d7ef62736';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {