porffor 0.18.12 → 0.18.13

package/compiler/builtins/date.ts

@@ -694,6 +694,25 @@ export const __Date_parse = (string: bytestring): number => {
 };
 
 
+// dark wasm magic for a basic allocator, sorry.
+export const __Porffor_date_allocate = (): Date => {
+  const hack: bytestring = '';
+
+  if (hack.length == 0) {
+    hack.length = Porffor.wasm`
+i32.const 1
+memory.grow 0
+i32.const 65536
+i32.mul
+i32.from_u`;
+  }
+
+  const ptr: number = hack.length;
+  hack.length = ptr + 8;
+
+  return ptr;
+};
+
 export const __Porffor_date_read = (ptr: Date): number => Porffor.wasm.f64.load(ptr, 0, 0);
 export const __Porffor_date_write = (ptr: Date, val: number) => {
   Porffor.wasm.f64.store(ptr, val, 0, 0);
@@ -2011,7 +2030,7 @@ export const Date = function (v0: unknown, v1: unknown, v2: unknown, v3: unknown
   }
 
   // 6. Let O be ? OrdinaryCreateFromConstructor(NewTarget, "%Date.prototype%", « [[DateValue]] »).
-  const O: Date = Porffor.allocateBytes(8);
+  const O: Date = __Porffor_date_allocate();
 
   // 7. Set O.[[DateValue]] to dv.
   __Porffor_date_write(O, dv);

package/compiler/generated_builtins.js

@@ -796,6 +796,15 @@ export const BuiltinFuncs = function() {
     locals: [124,127],
     localNames: ["string","string#type","chr","#last_type"],
   };
+  this.__Porffor_date_allocate = {
+    wasm: (scope, {allocPage,}) => [...number(allocPage(scope, 'bytestring: __Porffor_date_allocate/hack', 'i8') * pageSize, 124),[34,0],[252,3],[40,1,0],[184],[68,0,0,0,0,0,0,0,0],[97],[4,64],[32,0],[252,3],[65,1],[64,0],[65,128,128,4],[108],[184],[34,1],[252,3],[54,1,0],[11],[32,0],[252,3],[40,1,0],[184],[33,2],[32,0],[252,3],[32,2],[68,0,0,0,0,0,0,32,64],[160],[34,1],[252,3],[54,1,0],[32,2],[65,0],[15]],
+    params: [],
+    typedParams: true,
+    returns: [124,127],
+    typedReturns: true,
+    locals: [124,124,124],
+    localNames: ["hack","__length_setter_tmp","ptr"],
+  };
   this.__Porffor_date_read = {
     wasm: (scope, {}) => [[32,0],[252,2],[43,0,0],[65,0],[15]],
     params: [124,127],
@@ -1275,7 +1284,7 @@ export const BuiltinFuncs = function() {
     localNames: ["_this","_this#type","#last_type"],
   };
   this.Date = {
-    wasm: (scope, {builtin,}) => [[32,-1],[184],[65,1],[33,14],[33,15],[32,14],[33,16],[2,124],[32,16],[65,194,0],[70],[4,64,"TYPESWITCH|undefined"],[32,15],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,16],[65,210,0],[70],[4,64,"TYPESWITCH|ByteString"],[32,15],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,15],[68,0,0,0,0,0,0,0,0],[97],[184],[11,"TYPESWITCH_end"],[252,3],[4,64],[16, builtin('__Date_now')],[34,14],[16, builtin('__ecma262_ToDateString')],[34,14],[15],[11],[32,0],[32,1],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[32,2],[32,3],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,4],[32,5],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,6],[32,7],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,8],[32,9],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,10],[32,11],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,12],[32,13],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[33,17],[68,0,0,0,0,0,0,0,0],[33,18],[32,17],[68,0,0,0,0,0,0,0,0],[97],[4,64],[16, builtin('__Date_now')],[33,14],[33,18],[5],[32,17],[68,0,0,0,0,0,0,240,63],[97],[4,64],[32,0],[33,19],[32,1],[33,20],[32,0],[32,1],[16, builtin('__Porffor_rawType')],[33,21],[68,0,0,0,0,0,0,0,0],[33,22],[32,21],[68,0,0,0,0,0,0,51,64],[97],[4,64],[32,19],[32,20],[16, builtin('__Porffor_date_read')],[33,14],[33,22],[5],[32,21],[68,0,0,0,0,0,128,80,64],[97],[32,21],[68,0,0,0,0,0,128,84,64],[97],[114],[4,64],[32,19],[32,20],[16, builtin('__Date_parse')],[33,14],[33,22],[5],[65,0],[32,19],[16, builtin('Number')],[33,22],[11],[11],[32,22],[65,0],[16, builtin('__ecma262_TimeClip')],[33,14],[33,18],[5],[65,0],[32,0],[16, builtin('Number')],[33,23],[65,0],[32,2],[16, builtin('Number')],[33,24],[68,0,0,0,0,0,0,240,63],[33,25],[32,17],[68,0,0,0,0,0,0,0,64],[100],[4,64],[65,0],[32,4],[16, builtin('Number')],[33,25],[11],[68,0,0,0,0,0,0,0,0],[33,26],[32,17],[68,0,0,0,0,0,0,8,64],[100],[4,64],[65,0],[32,6],[16, builtin('Number')],[33,26],[11],[68,0,0,0,0,0,0,0,0],[33,27],[32,17],[68,0,0,0,0,0,0,16,64],[100],[4,64],[65,0],[32,8],[16, builtin('Number')],[33,27],[11],[68,0,0,0,0,0,0,0,0],[33,28],[32,17],[68,0,0,0,0,0,0,20,64],[100],[4,64],[65,0],[32,10],[16, builtin('Number')],[33,28],[11],[68,0,0,0,0,0,0,0,0],[33,29],[32,17],[68,0,0,0,0,0,0,24,64],[100],[4,64],[65,0],[32,12],[16, builtin('Number')],[33,29],[11],[32,23],[65,0],[16, builtin('__ecma262_MakeFullYear')],[33,14],[34,30],[65,0],[32,24],[65,0],[32,25],[65,0],[16, builtin('__ecma262_MakeDay')],[34,14],[32,26],[65,0],[32,27],[65,0],[32,28],[65,0],[32,29],[65,0],[16, builtin('__ecma262_MakeTime')],[34,14],[16, builtin('__ecma262_MakeDate')],[33,14],[34,31],[65,0],[16, builtin('__ecma262_UTC')],[34,14],[16, builtin('__ecma262_TimeClip')],[33,14],[33,18],[11],[11],[65,8],[16, builtin('__Porffor_allocateBytes')],[183],[34,32],[65,19],[32,18],[65,0],[16, builtin('__Porffor_date_write')],[33,14],[26],[32,32],[65,19],[15]],
+    wasm: (scope, {builtin,}) => [[32,-1],[184],[65,1],[33,14],[33,15],[32,14],[33,16],[2,124],[32,16],[65,194,0],[70],[4,64,"TYPESWITCH|undefined"],[32,15],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,16],[65,210,0],[70],[4,64,"TYPESWITCH|ByteString"],[32,15],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,15],[68,0,0,0,0,0,0,0,0],[97],[184],[11,"TYPESWITCH_end"],[252,3],[4,64],[16, builtin('__Date_now')],[34,14],[16, builtin('__ecma262_ToDateString')],[34,14],[15],[11],[32,0],[32,1],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[32,2],[32,3],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,4],[32,5],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,6],[32,7],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,8],[32,9],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,10],[32,11],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[32,12],[32,13],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[98],[184],[160],[33,17],[68,0,0,0,0,0,0,0,0],[33,18],[32,17],[68,0,0,0,0,0,0,0,0],[97],[4,64],[16, builtin('__Date_now')],[33,14],[33,18],[5],[32,17],[68,0,0,0,0,0,0,240,63],[97],[4,64],[32,0],[33,19],[32,1],[33,20],[32,0],[32,1],[16, builtin('__Porffor_rawType')],[33,21],[68,0,0,0,0,0,0,0,0],[33,22],[32,21],[68,0,0,0,0,0,0,51,64],[97],[4,64],[32,19],[32,20],[16, builtin('__Porffor_date_read')],[33,14],[33,22],[5],[32,21],[68,0,0,0,0,0,128,80,64],[97],[32,21],[68,0,0,0,0,0,128,84,64],[97],[114],[4,64],[32,19],[32,20],[16, builtin('__Date_parse')],[33,14],[33,22],[5],[65,0],[32,19],[16, builtin('Number')],[33,22],[11],[11],[32,22],[65,0],[16, builtin('__ecma262_TimeClip')],[33,14],[33,18],[5],[65,0],[32,0],[16, builtin('Number')],[33,23],[65,0],[32,2],[16, builtin('Number')],[33,24],[68,0,0,0,0,0,0,240,63],[33,25],[32,17],[68,0,0,0,0,0,0,0,64],[100],[4,64],[65,0],[32,4],[16, builtin('Number')],[33,25],[11],[68,0,0,0,0,0,0,0,0],[33,26],[32,17],[68,0,0,0,0,0,0,8,64],[100],[4,64],[65,0],[32,6],[16, builtin('Number')],[33,26],[11],[68,0,0,0,0,0,0,0,0],[33,27],[32,17],[68,0,0,0,0,0,0,16,64],[100],[4,64],[65,0],[32,8],[16, builtin('Number')],[33,27],[11],[68,0,0,0,0,0,0,0,0],[33,28],[32,17],[68,0,0,0,0,0,0,20,64],[100],[4,64],[65,0],[32,10],[16, builtin('Number')],[33,28],[11],[68,0,0,0,0,0,0,0,0],[33,29],[32,17],[68,0,0,0,0,0,0,24,64],[100],[4,64],[65,0],[32,12],[16, builtin('Number')],[33,29],[11],[32,23],[65,0],[16, builtin('__ecma262_MakeFullYear')],[33,14],[34,30],[65,0],[32,24],[65,0],[32,25],[65,0],[16, builtin('__ecma262_MakeDay')],[34,14],[32,26],[65,0],[32,27],[65,0],[32,28],[65,0],[32,29],[65,0],[16, builtin('__ecma262_MakeTime')],[34,14],[16, builtin('__ecma262_MakeDate')],[33,14],[34,31],[65,0],[16, builtin('__ecma262_UTC')],[34,14],[16, builtin('__ecma262_TimeClip')],[33,14],[33,18],[11],[11],[16, builtin('__Porffor_date_allocate')],[33,14],[34,32],[65,19],[32,18],[65,0],[16, builtin('__Porffor_date_write')],[33,14],[26],[32,32],[65,19],[15]],
     params: [124,127,124,127,124,127,124,127,124,127,124,127,124,127],
     typedParams: true,
     returns: [124,127],

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;
   };

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.13+5501d0132",
   "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.13+5501d0132';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {