porffor 0.19.9 → 0.19.11

package/compiler/precompile.js

@@ -11,7 +11,7 @@ globalThis.precompile = true;
 
 const argv = process.argv.slice();
 
-const compile = async (file, [ _funcs, _globals ]) => {
+const compile = async (file, _funcs) => {
   let source = fs.readFileSync(file, 'utf8');
   let first = source.slice(0, source.indexOf('\n'));
 
@@ -32,6 +32,7 @@ const compile = async (file, [ _funcs, _globals ]) => {
 
   const allocated = new Set();
 
+  const main = funcs.find(x => x.name === 'main');
   const exports = funcs.filter(x => x.export && x.name !== 'main');
   for (const x of exports) {
     if (x.data) {
@@ -54,41 +55,65 @@ const compile = async (file, [ _funcs, _globals ]) => {
       return acc;
     }, {});
 
-    for (let i = 0; i < x.wasm.length; i++) {
-      const y = x.wasm[i];
-      const n = x.wasm[i + 1];
-      if (y[0] === Opcodes.call) {
-        const f = funcs.find(x => x.index === y[1]);
-        if (!f) continue;
-
-        y[1] = f.name;
-      }
-
-      if (y[0] === Opcodes.const && (n[0] === Opcodes.local_set || n[0] === Opcodes.local_tee)) {
-        const l = locals[n[1]];
-        if (!l) continue;
-        if (![TYPES.string, TYPES.array, TYPES.bytestring].includes(l.metadata?.type)) continue;
-        if (!x.pages) continue;
-
-        const pageName = [...x.pages.keys()].find(z => z.endsWith(l.name));
-        if (!pageName || allocated.has(pageName)) continue;
-        allocated.add(pageName);
-
-        y.splice(0, 10, 'alloc', pageName, x.pages.get(pageName).type, valtypeBinary);
+    const rewriteWasm = (x, wasm, rewriteLocals = false) => {
+      for (let i = 0; i < wasm.length; i++) {
+        const y = wasm[i];
+        const n = wasm[i + 1];
+        if (y[0] === Opcodes.call) {
+          const f = funcs.find(x => x.index === y[1]);
+          if (!f) continue;
+
+          y[1] = f.name;
+        }
+
+        if (y[0] === Opcodes.global_get || y[0] === Opcodes.global_set) {
+          const global = Object.values(globals).findIndex(x => x.idx === y[1]);
+          const name = Object.keys(globals)[global];
+          const type = globals[name].type;
+          y.splice(0, 10, 'global', y[0], name, type);
+
+          if (!x.globalInits) {
+            x.globalInits = { ...main.globalInits };
+            for (const z in x.globalInits) {
+              rewriteWasm(main, x.globalInits[z], true);
+            }
+          }
+        }
+
+        if (rewriteLocals && (y[0] === Opcodes.local_get || y[0] === Opcodes.local_set || y[0] === Opcodes.local_tee)) {
+          const local = Object.values(x.locals).findIndex(x => x.idx === y[1]);
+          const name = Object.keys(x.locals)[local];
+          const type = x.locals[name].type;
+          y.splice(1, 10, 'local', name, type);
+        }
+
+        if (y[0] === Opcodes.const && (n[0] === Opcodes.local_set || n[0] === Opcodes.local_tee)) {
+          const l = locals[n[1]];
+          if (!l) continue;
+          if (![TYPES.string, TYPES.array, TYPES.bytestring].includes(l.metadata?.type)) continue;
+          if (!x.pages) continue;
+
+          const pageName = [...x.pages.keys()].find(z => z.endsWith(l.name));
+          if (!pageName || allocated.has(pageName)) continue;
+          allocated.add(pageName);
+
+          y.splice(0, 10, 'alloc', pageName, x.pages.get(pageName).type, valtypeBinary);
+        }
+
+        if (y[0] === Opcodes.i32_const && n[0] === Opcodes.throw) {
+          const id = y[1];
+          y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
+
+          // remove throw inst
+          wasm.splice(i + 1, 1);
+        }
       }
+    };
 
-      if (y[0] === Opcodes.i32_const && n[0] === Opcodes.throw) {
-        const id = y[1];
-        y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
-
-        // remove throw inst
-        x.wasm.splice(i + 1, 1);
-      }
-    }
+    rewriteWasm(x, x.wasm);
   }
 
   _funcs.push(...exports);
-  _globals.push(...Object.values(globals));
 };
 
 const precompile = async () => {
@@ -96,14 +121,14 @@ const precompile = async () => {
 
   const dir = join(__dirname, 'builtins');
 
-  let funcs = [], globals = [];
+  let funcs = [];
   for (const file of fs.readdirSync(dir)) {
     if (file.endsWith('.d.ts')) continue;
 
     console.log(`${' '.repeat(12)}${file}`);
 
     const t = performance.now();
-    await compile(join(dir, file), [ funcs, globals ]);
+    await compile(join(dir, file), funcs);
 
     console.log(`\u001b[A${' '.repeat(100)}\r\u001b[90m${`[${(performance.now() - t).toFixed(2)}ms]`.padEnd(12, ' ')}\u001b[0m\u001b[92m${file}\u001b[0m`);
   }
@@ -113,13 +138,23 @@ import { number } from './embedding.js';
 
 export const BuiltinFuncs = function() {
 ${funcs.map(x => {
-  const wasm = JSON.stringify(x.wasm.filter(x => x.length && x[0] != null)).replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtype})`).replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`).replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(scope, '${constructor}', \`${message}\`)`);
+  const rewriteWasm = wasm => {
+    const str = JSON.stringify(wasm.filter(x => x.length && x[0] != null))
+      .replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtype})`)
+      .replace(/\["global",(.*?),"(.*?)",(.*?)\]/g, (_, opcode, name, valtype) => `...glbl(${opcode}, '${name}', ${valtype})`)
+      .replace(/\"local","(.*?)",(.*?)\]/g, (_, name, valtype) => `loc('${name}', ${valtype})]`)
+      .replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`)
+      .replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(scope, '${constructor}', \`${message}\`)`);
+
+    return `(scope, {${`${str.includes('allocPage(') ? 'allocPage,' : ''}${str.includes('glbl(') ? 'glbl,' : ''}${str.includes('loc(') ? 'loc,' : ''}${str.includes('builtin(') ? 'builtin,' : ''}${str.includes('internalThrow(') ? 'internalThrow,' : ''}`.slice(0, -1)}}) => ` + str;
+  };
+
   return `  this.${x.name} = {
-    wasm: (scope, {${`${wasm.includes('allocPage(') ? 'allocPage,' : ''}${wasm.includes('builtin(') ? 'builtin,' : ''}${wasm.includes('internalThrow(') ? 'internalThrow,' : ''}`.slice(0, -1)}}) => ${wasm},
+    wasm: ${rewriteWasm(x.wasm)},
     params: ${JSON.stringify(x.params)}, typedParams: 1,
     returns: ${JSON.stringify(x.returns)}, ${x.returnType != null ? `returnType: ${JSON.stringify(x.returnType)}` : 'typedReturns: 1'},
     locals: ${JSON.stringify(Object.values(x.locals).slice(x.params.length).map(x => x.type))}, localNames: ${JSON.stringify(Object.keys(x.locals))},
-${x.data && x.data.length > 0 ? `    data: [${x.data.map(x => `[${x.offset ?? 'null'},[${x.bytes.join(',')}]]`).join(',')}],` : ''}
+${x.globalInits ? `    globalInits: {${Object.keys(x.globalInits).map(y => `${y}: ${rewriteWasm(x.globalInits[y])}`).join(',')}},\n` : ''}${x.data && x.data.length > 0 ? `    data: [${x.data.map(x => `[${x.offset ?? 'null'},[${x.bytes.join(',')}]]`).join(',')}],` : ''}
 ${x.table ? `    table: 1,` : ''}${x.constr ? `    constr: 1,` : ''}${x.hasRestArgument ? `    hasRestArgument: 1,` : ''}
   };`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n');
 }).join('\n')}

package/compiler/wrap.js

@@ -114,9 +114,10 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.symbol: {
-      const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
-      if (!descStore) return Symbol();
+      const page = pages.get('bytestring: __Porffor_symbol_descStore/ptr');
+      if (!page) return Symbol();
 
+      const descStore = page.ind * pageSize;
       const offset = descStore + 4 + ((value - 1) * 9);
 
       const v = read(Float64Array, memory, offset, 1)[0];
@@ -233,12 +234,15 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
 
   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 strParams = func.params.map(v => invValtype[v]);
+    const strReturns = func.returns.map(v => invValtype[v]);
+    console.log(`\x1B[1m${func.name}\x1B[0m \x1B[90m(${strParams.join(', ')}) -> (${strReturns.join(', ')})\x1B[0m`);
 
     const surrounding = Prefs.backtraceSurrounding ?? 5;
     let min = middleIndex - surrounding;
     let max = middleIndex + surrounding + 1;
-    if (Prefs.backtraceEntireFunc || middleIndex == -1) {
+    if (Prefs.backtraceFunc || middleIndex == -1) {
       min = 0;
       max = func.wasm.length;
     }
@@ -378,7 +382,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
     if (!process.argv.includes('-i')) throw e;
     if (!(e instanceof WebAssembly.CompileError)) throw e;
 
-    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)?.[1]);
+    const funcInd = parseInt(e.message.match(/function #([0-9]+)/)?.[1]);
     const blobOffset = parseInt(e.message.split('@')?.[1]);
 
     backtrace(funcInd, blobOffset);

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.19.9+a07f4dac1",
+  "version": "0.19.11+0843169d5",
   "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.19.9+a07f4dac1';
+globalThis.version = '0.19.11+0843169d5';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {