porffor 0.30.10 → 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/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

@@ -326,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;
@@ -342,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++) {
@@ -390,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.10+1ed8b1535",
+  "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.10+1ed8b1535';
+globalThis.version = '0.30.11+5ee60c5c3';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {