porffor 0.19.13 → 0.19.14

package/compiler/opt.js

@@ -426,22 +426,6 @@ export default (funcs, globals, pages, tags, exceptions) => {
           i--;
           continue;
         }
-
-        if (i < 2) continue;
-        const lastLastInst = wasm[i - 2];
-
-        if (lastLastInst[1] === inst[1] && inst[0] === Opcodes.local_get && lastInst[0] === Opcodes.local_tee && lastLastInst[0] === Opcodes.local_set) {
-          // local.set x
-          // local.tee y
-          // local.get x
-          // -->
-          // <nothing>
-
-          wasm.splice(i - 2, 3); // remove this, last, 2nd last insts
-          if (Prefs.optLog) log('opt', `removed redundant inline param local handling`);
-          i -= 3;
-          continue;
-        }
       }
 
       if (optLevel < 2) continue;

package/compiler/precompile.js

@@ -1,6 +1,9 @@
 import { Opcodes } from './wasmSpec.js';
 import { TYPES } from './types.js';
 
+import process from 'node:process';
+globalThis.process = process;
+
 import fs from 'node:fs';
 import { join } from 'node:path';
 
@@ -32,6 +35,11 @@ const compile = async (file, _funcs) => {
 
   const allocated = new Set();
 
+  const invGlobals = Object.keys(globals).reduce((acc, y) => {
+    acc[globals[y].idx] = { ...globals[y], name: y };
+    return acc;
+  }, {});
+
   const main = funcs.find(x => x.name === 'main');
   const exports = funcs.filter(x => x.export && x.name !== 'main');
   for (const x of exports) {
@@ -50,12 +58,12 @@ const compile = async (file, _funcs) => {
       }).filter(x => x);
     }
 
-    const locals = Object.keys(x.locals).reduce((acc, y) => {
-      acc[x.locals[y].idx] = { ...x.locals[y], name: y };
-      return acc;
-    }, {});
-
     const rewriteWasm = (x, wasm, rewriteLocals = false) => {
+      const locals = Object.keys(x.locals).reduce((acc, y) => {
+        acc[x.locals[y].idx] = { ...x.locals[y], name: y };
+        return acc;
+      }, {});
+
       for (let i = 0; i < wasm.length; i++) {
         const y = wasm[i];
         const n = wasm[i + 1];
@@ -67,10 +75,8 @@ const compile = async (file, _funcs) => {
         }
 
         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);
+          const global = invGlobals[y[1]];
+          y.splice(0, 10, 'global', y[0], global.name, global.type);
 
           if (!x.globalInits) {
             if (!main.rewrittenGlobalInits) {
@@ -85,11 +91,9 @@ const compile = async (file, _funcs) => {
           }
         }
 
-        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 (rewriteLocals && typeof y[1] === 'number' && (y[0] === Opcodes.local_get || y[0] === Opcodes.local_set || y[0] === Opcodes.local_tee)) {
+          const local = locals[y[1]];
+          y.splice(1, 10, 'local', local.name, local.type);
         }
 
         if (y[0] === Opcodes.const && (n[0] === Opcodes.local_set || n[0] === Opcodes.local_tee)) {
@@ -105,6 +109,20 @@ const compile = async (file, _funcs) => {
           y.splice(0, 10, 'alloc', pageName, x.pages.get(pageName).type, valtypeBinary);
         }
 
+        if (y[0] === Opcodes.const && n[0] === Opcodes.global_set) {
+          const l = invGlobals[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);
@@ -126,18 +144,30 @@ const precompile = async () => {
 
   const dir = join(__dirname, 'builtins');
 
+  const t = performance.now();
+
   let funcs = [];
+  let fileCount = 0;
   for (const file of fs.readdirSync(dir)) {
     if (file.endsWith('.d.ts')) continue;
+    fileCount++;
 
-    console.log(`${' '.repeat(12)}${file}`);
+    globalThis.precompile = file;
 
     const t = performance.now();
-    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`);
+    try {
+      await compile(join(dir, file), funcs);
+    } catch (e) {
+      console.log(`\r${' '.repeat(100)}\r${' '.repeat(12)}${file}`);
+      throw e;
+    }
+
+    process.stdout.write(`\r${' '.repeat(100)}\r\u001b[90m${`[${(performance.now() - t).toFixed(2)}ms]`.padEnd(16, ' ')}\u001b[0m\u001b[92m${file}\u001b[0m`);
   }
 
+  console.log(`\r${' '.repeat(100)}\r\u001b[90m${`[${(performance.now() - t).toFixed(2)}ms]`.padEnd(16, ' ')}\u001b[0m\u001b[92mcompiled ${fileCount} files (${funcs.length} funcs)\u001b[0m`);
+
   return `// autogenerated by compiler/precompile.js
 import { number } from './embedding.js';
 
@@ -148,7 +178,7 @@ ${funcs.map(x => {
       .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(/\[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;

package/compiler/wrap.js

@@ -114,7 +114,7 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.symbol: {
-      const page = pages.get('bytestring: __Porffor_symbol_descStore/ptr');
+      const page = pages.get('array: symbol.ts/descStore');
       if (!page) return Symbol();
 
       const descStore = page.ind * pageSize;

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.13+800b4f2dc",
+  "version": "0.19.14+65794cc8d",
   "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.13+800b4f2dc';
+globalThis.version = '0.19.14+65794cc8d';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/compiler/builtins/annexb_string.ts

@@ -1,19 +0,0 @@
-// @porf --valtype=i32
-import type {} from './porffor.d.ts';
-
-export const __String_prototype_trimLeft = (_this: string) => {
-  return __String_prototype_trimStart(_this);
-};
-
-export const __ByteString_prototype_trimLeft = (_this: bytestring) => {
-  return __ByteString_prototype_trimStart(_this);
-};
-
-
-export const __String_prototype_trimRight = (_this: string) => {
-  return __String_prototype_trimEnd(_this);
-};
-
-export const __ByteString_prototype_trimRight = (_this: bytestring) => {
-  return __ByteString_prototype_trimEnd(_this);
-};