porffor 0.42.4 → 0.42.5

package/compiler/assemble.js

@@ -121,20 +121,19 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
 
   const nameSection = Prefs.d ? customSection('name', encodeNames(funcs)) : [];
 
-  const directFuncs = funcs.filter(x => !x.indirect);
+  const indirectFuncs = funcs.filter(x => x.indirect);
   const tableSection = !funcs.table ? [] : createSection(
     Section.table,
-    encodeVector([ [ Reftype.funcref, 0x00, ...unsignedLEB128(directFuncs.length) ] ])
+    encodeVector([ [ Reftype.funcref, 0x00, ...unsignedLEB128(indirectFuncs.length) ] ])
   );
   time('table section');
 
-  const emptyWrapperFunc = funcs.find(x => x.name === '#indirect#empty');
   const elementSection = !funcs.table ? [] : createSection(
     Section.element,
     encodeVector([ [
       0x00,
       Opcodes.i32_const, 0, Opcodes.end,
-      ...encodeVector(directFuncs.map(x => unsignedLEB128((x.wrapperFunc ?? emptyWrapperFunc ?? x).asmIndex)))
+      ...encodeVector(indirectFuncs.map(x => unsignedLEB128(x.asmIndex)))
     ] ])
   );
   time('element section');
@@ -147,8 +146,8 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
 
     // generate func lut data
     const bytes = [];
-    for (let i = 0; i < directFuncs.length; i++) {
-      const func = directFuncs[i];
+    for (let i = 0; i < indirectFuncs.length; i++) {
+      const func = indirectFuncs[i].wrapperOf;
       let name = func.name;
 
       // userland exposed .length

package/compiler/builtins_objects.js

@@ -18,14 +18,14 @@ export default function({ builtinFuncs }, Prefs) {
       locals: [],
       returns: [ Valtype.i32 ],
       returnType: TYPES.object,
-      wasm: (scope, { allocPage, makeString, generate, getNodeType, builtin, glbl }) => {
+      wasm: (scope, { allocPage, makeString, generate, getNodeType, builtin, funcRef, glbl }) => {
         if (globalThis.precompile) return [ [ 'get object', name ] ];
 
         // todo/perf: precompute bytes here instead of calling real funcs if we really care about perf later
 
         let ptr;
         if (existingFunc) {
-          ptr = builtin(name, true);
+          ptr = funcRef(name)[0][1];
         } else {
           ptr = allocPage(scope, `builtin object: ${name}`);
         }
@@ -86,20 +86,11 @@ export default function({ builtinFuncs }, Prefs) {
       }
     };
 
-    if (existingFunc) {
-      this[name] = (scope, { builtin, funcRef }) => [
-        [ Opcodes.call, builtin('#get_' + name) ],
-        [ Opcodes.drop ],
-        ...funcRef(name)
-      ];
-      this[name].type = TYPES.function;
-    } else {
-      this[name] = (scope, { builtin }) => [
-        [ Opcodes.call, builtin('#get_' + name) ],
-        Opcodes.i32_from_u
-      ];
-      this[name].type = TYPES.object;
-    }
+    this[name] = (scope, { builtin }) => [
+      [ Opcodes.call, builtin('#get_' + name) ],
+      Opcodes.i32_from_u
+    ];
+    this[name].type = existingFunc ? TYPES.function : TYPES.object;
 
     for (const x in props) {
       const d = props[x];

package/compiler/codegen.js

@@ -79,7 +79,12 @@ const funcRef = func => {
         ],
         constr: true,
         internal: true,
-        indirect: true
+        indirect: true,
+        wrapperOf: {
+          name: '',
+          jsLength: 0
+        },
+        indirectIndex: indirectFuncs.length
       };
 
       // check not being constructed
@@ -91,6 +96,8 @@ const funcRef = func => {
         [ Opcodes.end ]
       );
 
+      // have empty func as indirect funcs 0 and 1
+      indirectFuncs.push(emptyFunc);
       indirectFuncs.push(emptyFunc);
     }
 
@@ -142,7 +149,9 @@ const funcRef = func => {
       wasm,
       constr: true,
       internal: true,
-      indirect: true
+      indirect: true,
+      wrapperOf: func,
+      indirectIndex: indirectFuncs.length
     };
 
     indirectFuncs.push(wrapperFunc);
@@ -163,7 +172,7 @@ const funcRef = func => {
   }
 
   return [
-    [ Opcodes.const, func.index - importedFuncs.length ]
+    [ Opcodes.const, func.wrapperFunc.indirectIndex ]
   ];
 };
 

package/compiler/wrap.js

@@ -132,8 +132,7 @@ ${flags & 0b0001 ? `    get func idx: ${get}
       if (value < 0) {
         func = importedFuncs[value + importedFuncs.length];
       } else {
-        value += importedFuncs.length;
-        func = funcs.find(x => x.index === value);
+        func = funcs.find(x => x.wrapperFunc?.indirectIndex === value);
       }
 
       if (!func) return function () {};

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.42.4+82c4bc5cf",
+  "version": "0.42.5+a3af054f9",
   "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.42.4+82c4bc5cf';
+globalThis.version = '0.42.5+a3af054f9';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {