porffor 0.30.9 → 0.30.11

package/compiler/assemble.js

@@ -309,7 +309,8 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
 
       // todo: move const, call transforms here too?
 
-      const wasm = [];
+      const makeAssembled = Prefs.d;
+      let wasm = [], wasmNonFlat = [];
       for (let i = 0; i < x.wasm.length; i++) {
         let o = x.wasm[i];
 
@@ -323,10 +324,20 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
           unsignedLEB128_into(n, o);
         }
 
-        wasm.push(...o);
+        for (let j = 0; j < o.length; j++) {
+          const x = o[j];
+          if (x == null || !(x <= 0xff)) continue;
+          wasm.push(x);
+        }
+
+        if (makeAssembled) wasmNonFlat.push(o);
+      }
+
+      if (makeAssembled) {
+        x.assembled = { localDecl, wasm, wasmNonFlat };
       }
 
-      return encodeVector([ ...encodeVector(localDecl), ...wasm.flat().filter(x => x != null && x <= 0xff), Opcodes.end ]);
+      return encodeVector([ ...encodeVector(localDecl), ...wasm, Opcodes.end ]);
     }))
   );
 

package/compiler/builtins/__internal_object.ts

@@ -4,7 +4,10 @@ export const __Porffor_object_getObject = (obj: any): any => {
     const funcI32: i32 = Porffor.wasm`local.get ${obj}`;
     let underlying: object = underlyingFuncObjs.get(funcI32);
     if (underlying == null) {
-      underlying = Porffor.allocate();
+      underlying = {};
+      underlying.prototype = {};
+      underlying.prototype.constructor = obj;
+
       underlyingFuncObjs.set(funcI32, underlying);
     }
 

package/compiler/builtins_precompiled.js

@@ -3,10 +3,10 @@ import { number } from './embedding.js';
 
 export const BuiltinFuncs = function() {
   this.__Porffor_object_getObject = {
-    wasm: (scope, {glbl,builtin}) => [[32,1],[184],[68,0,0,0,0,0,0,24,64],[97],[4,64],[32,0],[33,2],...glbl(35, 'underlyingFuncObjs', 124),[33,4],[65,20],[33,5],[32,4],[32,5],[32,2],[65,1],[16, builtin('__Map_prototype_get')],[26],[34,3],[68,0,0,0,0,0,0,0,0],[97],[4,64],[16, builtin('__Porffor_allocate')],[183],[33,3],...glbl(35, 'underlyingFuncObjs', 124),[33,4],[65,20],[33,5],[32,4],[32,5],[32,2],[65,1],[32,3],[65,7],[16, builtin('__Map_prototype_set')],[33,6],[26],[11],[32,3],[65,7],[15],[11],[32,0],[32,1],[15]],
+    wasm: (scope, {glbl,builtin,internalThrow}) => [[32,1],[184],[68,0,0,0,0,0,0,24,64],[97],[4,64],[32,0],[33,2],...glbl(35, 'underlyingFuncObjs', 124),[33,4],[65,20],[33,5],[32,4],[32,5],[32,2],[65,1],[16, builtin('__Map_prototype_get')],[26],[34,3],[68,0,0,0,0,0,0,0,0],[97],[4,64],[16, builtin('__Porffor_allocate')],[184],[34,3],[33,9],[16, builtin('__Porffor_allocate')],[34,11],[65,9],[54,1,0],[32,11],[65,240,0],[58,0,4],[32,11],[65,242,0],[58,0,5],[32,11],[65,239,0],[58,0,6],[32,11],[65,244,0],[58,0,7],[32,11],[65,239,0],[58,0,8],[32,11],[65,244,0],[58,0,9],[32,11],[65,249,0],[58,0,10],[32,11],[65,240,0],[58,0,11],[32,11],[65,229,0],[58,0,12],[32,11],[184],[33,10],[32,9],[252,3],[65,7],[32,10],[65,195,1],[16, builtin('__ecma262_ToPropertyKey')],[33,12],[252,3],[32,12],[16, builtin('__Porffor_allocate')],[184],[65,7],[16, builtin('__Porffor_object_set')],[26],[26],[32,3],[33,9],[65,128,128,4],[34,11],[65,9],[54,1,0],[32,11],[65,240,0],[58,0,4],[32,11],[65,242,0],[58,0,5],[32,11],[65,239,0],[58,0,6],[32,11],[65,244,0],[58,0,7],[32,11],[65,239,0],[58,0,8],[32,11],[65,244,0],[58,0,9],[32,11],[65,249,0],[58,0,10],[32,11],[65,240,0],[58,0,11],[32,11],[65,229,0],[58,0,12],[32,11],[184],[33,13],[32,9],[252,3],[65,7],[32,13],[65,195,1],[16, builtin('__ecma262_ToPropertyKey')],[33,12],[252,3],[32,12],[16, builtin('__Porffor_object_get')],[33,6],[33,9],[16, builtin('__Porffor_allocate')],[34,11],[65,11],[54,1,0],[32,11],[65,227,0],[58,0,4],[32,11],[65,239,0],[58,0,5],[32,11],[65,238,0],[58,0,6],[32,11],[65,243,0],[58,0,7],[32,11],[65,244,0],[58,0,8],[32,11],[65,242,0],[58,0,9],[32,11],[65,245,0],[58,0,10],[32,11],[65,227,0],[58,0,11],[32,11],[65,244,0],[58,0,12],[32,11],[65,239,0],[58,0,13],[32,11],[65,242,0],[58,0,14],[32,11],[184],[33,10],[32,6],[33,16],[2,124],[32,16],[65,6],[70],[4,64,"TYPESWITCH|Function"],[32,9],[252,3],[32,6],[32,10],[65,195,1],[16, builtin('__ecma262_ToPropertyKey')],[33,12],[252,3],[32,12],[32,0],[32,1],[16, builtin('__Porffor_object_set')],[26],[12,1],[11],[32,16],[65,7],[70],[4,64,"TYPESWITCH|Object"],[32,9],[252,3],[32,6],[32,10],[65,195,1],[16, builtin('__ecma262_ToPropertyKey')],[33,12],[252,3],[32,12],[32,0],[32,1],[16, builtin('__Porffor_object_set')],[26],[12,1],[11],[32,16],[65,208,0],[70],[4,64,"TYPESWITCH|Array"],[32,9],[252,3],[32,10],[252,3],[65,9],[108],[106],[34,8],[32,0],[34,7],[57,0,4],[32,8],[32,1],[58,0,12],[32,7],[12,1],[11],[32,16],[65,216,0],[70],[4,64,"TYPESWITCH|Uint8Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[106],[32,0],[34,7],[252,3],[58,0,4],[32,7],[12,1],[11],[32,16],[65,217,0],[70],[4,64,"TYPESWITCH|Int8Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[106],[32,0],[34,7],[252,2],[58,0,4],[32,7],[12,1],[11],[32,16],[65,218,0],[70],[4,64,"TYPESWITCH|Uint8ClampedArray"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[106],[32,0],[34,7],[68,0,0,0,0,0,0,0,0],[165],[68,0,0,0,0,0,224,111,64],[164],[252,3],[58,0,4],[32,7],[12,1],[11],[32,16],[65,219,0],[70],[4,64,"TYPESWITCH|Uint16Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,2],[108],[106],[32,0],[34,7],[252,3],[59,0,4],[32,7],[12,1],[11],[32,16],[65,220,0],[70],[4,64,"TYPESWITCH|Int16Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,2],[108],[106],[32,0],[34,7],[252,2],[59,0,4],[32,7],[12,1],[11],[32,16],[65,221,0],[70],[4,64,"TYPESWITCH|Uint32Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,4],[108],[106],[32,0],[34,7],[252,3],[54,0,4],[32,7],[12,1],[11],[32,16],[65,222,0],[70],[4,64,"TYPESWITCH|Int32Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,4],[108],[106],[32,0],[34,7],[252,2],[54,0,4],[32,7],[12,1],[11],[32,16],[65,223,0],[70],[4,64,"TYPESWITCH|Float32Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,4],[108],[106],[32,0],[34,7],[182],[56,0,4],[32,7],[12,1],[11],[32,16],[65,224,0],[70],[4,64,"TYPESWITCH|Float64Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,8],[108],[106],[32,0],[34,7],[57,0,4],[32,7],[12,1],[11],[32,16],[65,128,1],[70],[4,64,"TYPESWITCH|undefined"],...internalThrow(scope, 'TypeError', `Cannot set property of undefined`),[68,0,0,0,0,0,0,0,0],[12,1],[11],[32,0],[11,"TYPESWITCH_end"],[26],...glbl(35, 'underlyingFuncObjs', 124),[33,4],[65,20],[33,5],[32,4],[32,5],[32,2],[65,1],[32,3],[65,7],[16, builtin('__Map_prototype_set')],[33,6],[26],[11],[32,3],[65,7],[15],[11],[32,0],[32,1],[15]],
     params: [124,127], typedParams: 1,
     returns: [124,127], typedReturns: 1,
-    locals: [124,124,124,127,127], localNames: ["obj","obj#type","funcI32","underlying","#proto_target","#proto_target#type","#last_type"],
+    locals: [124,124,124,127,127,124,127,124,124,127,127,124,127,127,127], localNames: ["obj","obj#type","funcI32","underlying","#proto_target","#proto_target#type","#last_type","#member_setter_val_tmp","#member_setter_ptr_tmp","#member_obj","#member_prop_assign","#makearray_pointer_tmp","#swap","#member_prop","#loadArray_offset","#member_allocd","#typeswitch_tmp1"],
     globalInits: {underlyingFuncObjs: (scope, {glbl,builtin}) => [[68,0,0,0,0,0,0,240,63],[65,6],[16, builtin('__Porffor_allocate')],[184],[65,7],[68,0,0,0,0,0,0,0,0],[65,128,1],[16, builtin('Map')],[26],...glbl(36, 'underlyingFuncObjs', 124)]},
   };
   this.__Porffor_object_preventExtensions = {

package/compiler/prefs.js

@@ -1,35 +1,27 @@
 const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused', 'data', 'passiveData', 'rmUnusedTypes' ];
 
-let cache = {};
-const obj = new Proxy({}, {
-  get(_, p) {
-    if (cache[p] != null) return cache[p];
-
-    const ret = (() => {
-      // fooBar -> foo-bar
-      const name = p[0] === '_' ? p : p.replace(/[A-Z]/g, c => `-${c.toLowerCase()}`);
-      const prefix = name.length === 1 ? '-' : '--';
-      if (process.argv.includes(prefix + name)) return true;
-      if (process.argv.includes(prefix + 'no-' + name)) return false;
-
-      const valArg = process.argv.find(x => x.startsWith(`${prefix}${name}=`));
-      if (valArg) return valArg.slice(name.length + 1 + prefix.length);
-
-      if (onByDefault.includes(p)) return true;
-      return undefined;
-    })();
-
-    // do not cache in web demo as args are changed live
-    if (!globalThis.document) cache[p] = ret;
-    return ret;
-  },
-
-  set(_, p, v) {
-    cache[p] = v;
-    return true;
+const nameToKey = x => x.replace(/[a-z]\-[a-z]/g, y => `${y[0]}${y[2].toUpperCase()}`);
+
+let prefs = {};
+const getPrefs = () => {
+  prefs = {};
+  for (const x of onByDefault) prefs[x] = true;
+
+  for (const x of process.argv) {
+    if (x[0] !== '-') continue;
+
+    let flag = x.slice(x[1] === '-' ? 2 : 1);
+    if (flag.startsWith('no-')) {
+      prefs[nameToKey(flag.slice(3))] = false;
+    } else {
+      const [ name, value ] = flag.split('=');
+      prefs[nameToKey(name)] = value ?? true;
+    }
   }
-});
+};
+getPrefs();
 
-export const uncache = () => cache = {};
+export default prefs;
 
-export default obj;
+export const uncache = () => getPrefs();
+globalThis.argvChanged = uncache;

package/compiler/wrap.js

@@ -65,6 +65,8 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type, override = undefin
         const kValue = kRaw & 0x3fffffff;
         const k = porfToJSValue({ memory, funcs, pages }, kValue, kType);
 
+        if (k === '__proto__') continue;
+
         const tail = read(Uint16Array, memory, value + offset + 12, 1)[0];
 
         const vValue = read(Float64Array, memory, value + offset + 4, 1)[0];
@@ -324,7 +326,8 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
       max = func.wasm.length;
     }
 
-    const decomp = decompile(func.wasm.slice(min, max), func.name, 0, func.locals, func.params, func.returns, funcs, globals, exceptions).slice(0, -1).split('\n');
+    const decomp = decompile(func.wasm.slice(min, max), func.name, 0, func.locals, func.params, func.returns, funcs, globals, exceptions)
+      .slice(0, -1).split('\n').filter(x => !x.startsWith('\x1B[90m;;'));
 
     const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
     let longest = 0;
@@ -340,35 +343,18 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
     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;
 
-    // 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
+    // convert blob offset -> function wasm offset
     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;
-    for (let i = 0; i < locals.length; i++) {
-      const local = locals[i];
-      if (i !== 0 && local.type !== lastType) {
-        localDecl.push(encodeLocal(typeCount, lastType));
-        typeCount = 0;
-      }
-
-      typeCount++;
-      lastType = local.type;
-    }
-
-    if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
-
-    const toFind = encodeVector(localDecl).concat(func.wasm.flat().filter(x => x != null && x <= 0xff).slice(0, 60));
+    const { wasm: assembledWasmFlat, wasmNonFlat: assembledWasmOps, localDecl } = func.assembled;
+    const toFind = encodeVector(localDecl).concat(assembledWasmFlat.slice(0, 100));
 
     let i = 0;
     for (; i < wasm.length; i++) {
@@ -388,24 +374,21 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
       return false;
     }
 
-    const offset = (blobOffset - i) + encodeVector(localDecl).length;
+    const offset = (blobOffset - i) - encodeVector(localDecl).length;
 
     let cumLen = 0;
     i = 0;
-    for (; i < func.wasm.length; i++) {
-      cumLen += func.wasm[i].filter(x => x != null && x <= 0xff).length;
+    for (; i < assembledWasmOps.length; i++) {
+      cumLen += assembledWasmOps[i].filter(x => x != null && x <= 0xff).length;
       if (cumLen === offset) break;
     }
 
-    if (cumLen !== offset)  {
+    if (cumLen !== offset) {
       printDecomp(-1, func, funcs, globals, exceptions);
       return false;
     }
 
-    i -= 1;
-
-    printDecomp(i, func, funcs, globals, exceptions);
-
+    printDecomp(i + 1, 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.30.9+3fa3e04ac",
+  "version": "0.30.11+5ee60c5c3",
   "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.30.9+3fa3e04ac';
+globalThis.version = '0.30.11+5ee60c5c3';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {