porffor 0.14.0-7bef6473d → 0.14.0-a24ac8cf2

package/compiler/assemble.js

@@ -65,6 +65,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
     importFuncs = [...imports.values()];
 
     // fix call indexes for non-imports
+    // also fix call_indirect types
     const delta = importedFuncs.length - importFuncs.length;
     for (const f of funcs) {
       f.originalIndex = f.index;
@@ -74,6 +75,16 @@ export default (funcs, globals, tags, pages, data, flags) => {
         if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
           inst[1] -= delta;
         }
+
+        if (inst[0] === Opcodes.call_indirect) {
+          const params = [];
+          for (let i = 0; i < inst[1]; i++) {
+            params.push(valtypeBinary, Valtype.i32);
+          }
+
+          const returns = [ valtypeBinary, Valtype.i32 ];
+          inst[1] = getType(params, returns);
+        }
       }
     }
   }
@@ -101,7 +112,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
     encodeVector([ [
       0x00,
       Opcodes.i32_const, 0, Opcodes.end,
-      encodeVector(funcs.map(x => x.index))
+      ...encodeVector(funcs.map(x => x.index))
     ] ])
   );
 

package/compiler/codegen.js

@@ -58,10 +58,11 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
 
     case 'ArrowFunctionExpression':
     case 'FunctionDeclaration':
+    case 'FunctionExpression':
       const func = generateFunc(scope, decl);
 
       if (decl.type.endsWith('Expression')) {
-        return number(func.index);
+        return number(func.index - importedFuncs.length);
       }
 
       return [];
@@ -187,7 +188,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
             if (!Array.isArray(inst)) inst = [ inst ];
             const immediates = asm.slice(1).map(x => {
               const int = parseInt(x);
-              if (Number.isNaN(int)) return scope.locals[x]?.idx;
+              if (Number.isNaN(int)) return scope.locals[x]?.idx ?? globals[x].idx;
               return int;
             });
 
@@ -313,10 +314,10 @@ const generateIdent = (scope, decl) => {
 
     if (local?.idx === undefined) {
       // no local var with name
-      if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name]);
-      if (Object.hasOwn(funcIndex, name)) return number(funcIndex[name]);
-
       if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
+
+      if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name] - importedFuncs.length);
+      if (Object.hasOwn(funcIndex, name)) return number(funcIndex[name] - importedFuncs.length);
     }
 
     if (local?.idx === undefined && rawName.startsWith('__')) {
@@ -350,9 +351,7 @@ const generateReturn = (scope, decl) => {
 
   return [
     ...generate(scope, decl.argument),
-    ...(scope.returnType != null ? [] : [
-      ...getNodeType(scope, decl.argument)
-    ]),
+    ...(scope.returnType != null ? [] : getNodeType(scope, decl.argument)),
     [ Opcodes.return ]
   ];
 };
@@ -1450,6 +1449,10 @@ const countLeftover = wasm => {
             } else count--;
             if (func) count += func.returns.length;
           }
+        } else if (inst[0] === Opcodes.call_indirect) {
+          count--; // funcidx
+          count -= inst[1] * 2; // params * 2 (typed)
+          count += 2; // fixed return (value, type)
         } else count--;
 
     // console.log(count, decompile([ inst ]).slice(0, -1));
@@ -1831,7 +1834,45 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   }
 
   if (idx === undefined) {
-    if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
+    if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) {
+      const [ local, global ] = lookupName(scope, name);
+      if (!Prefs.indirectCalls || local == null) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
+
+      // todo: only works when:
+      //   1. arg count matches arg count of function
+      //   2. function uses typedParams and typedReturns
+
+      funcs.table = true;
+
+      let args = decl.arguments;
+      let argWasm = [];
+
+      for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        argWasm = argWasm.concat(generate(scope, arg));
+
+        if (valtypeBinary !== Valtype.i32 && (
+          (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32) ||
+          (importedFuncs[name] && name.startsWith('profile'))
+        )) {
+          argWasm.push(Opcodes.i32_to);
+        }
+
+        argWasm = argWasm.concat(getNodeType(scope, arg));
+      }
+
+      return typeSwitch(scope, getNodeType(scope, decl.callee), {
+        [TYPES.function]: [
+          ...argWasm,
+          [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
+          Opcodes.i32_to_u,
+          [ Opcodes.call_indirect, args.length, 0 ],
+          ...setLastType(scope)
+        ],
+        default: internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true)
+      });
+    }
+
     return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
   }
 
@@ -1860,11 +1901,10 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     const arg = args[i];
     out = out.concat(generate(scope, arg));
 
-    if (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
-      out.push(Opcodes.i32_to);
-    }
-
-    if (importedFuncs[name] && name.startsWith('profile')) {
+    if (valtypeBinary !== Valtype.i32 && (
+      (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32) ||
+      (importedFuncs[name] && name.startsWith('profile'))
+    )) {
       out.push(Opcodes.i32_to);
     }
 
@@ -2174,6 +2214,22 @@ const generateVar = (scope, decl) => {
     }
 
     if (x.init) {
+      // if (isFuncType(x.init.type)) {
+      //   // let a = function () { ... }
+      //   x.init.id = { name };
+
+      //   const func = generateFunc(scope, x.init);
+
+      //   out.push(
+      //     ...number(func.index - importedFuncs.length),
+      //     [ global ? Opcodes.global_set : Opcodes.local_set, idx ],
+
+      //     ...setType(scope, name, TYPES.function)
+      //   );
+
+      //   continue;
+      // }
+
       const generated = generate(scope, x.init, global, name);
       if (scope.arrays?.get(name) != null) {
         // hack to set local as pointer before
@@ -2185,6 +2241,7 @@ const generateVar = (scope, decl) => {
         out = out.concat(generated);
         out.push([ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
       }
+
       out.push(...setType(scope, name, getNodeType(scope, x.init)));
     }
 
@@ -2198,6 +2255,7 @@ const generateVar = (scope, decl) => {
 // todo: optimize this func for valueUnused
 const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   const { type, name } = decl.left;
+  const [ local, isGlobal ] = lookupName(scope, name);
 
   if (type === 'ObjectPattern') {
     // hack: ignore object parts of `var a = {} = 2`
@@ -2207,8 +2265,18 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   if (isFuncType(decl.right.type)) {
     // hack for a = function () { ... }
     decl.right.id = { name };
-    generateFunc(scope, decl.right);
-    return [];
+
+    const func = generateFunc(scope, decl.right);
+
+    return [
+      ...number(func.index - importedFuncs.length),
+      ...(local != null ? [
+        [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
+        [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
+
+        ...setType(scope, name, TYPES.function)
+      ] : [])
+    ];
   }
 
   const op = decl.operator.slice(0, -1) || '=';
@@ -2307,8 +2375,6 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
 
   if (!name) return todo(scope, 'destructuring is not supported yet', true);
 
-  const [ local, isGlobal ] = lookupName(scope, name);
-
   if (local === undefined) {
     // todo: this should be a sloppy mode only thing
 
@@ -3368,7 +3434,7 @@ const generateFunc = (scope, decl) => {
 
   if (typedInput && decl.returnType) {
     const { type } = extractTypeAnnotation(decl.returnType);
-    if (type != null) {
+    if (type != null && !Prefs.indirectCalls) {
       innerScope.returnType = type;
       innerScope.returns = [ valtypeBinary ];
     }
@@ -3586,8 +3652,10 @@ const internalConstrs = {
           }),
 
           // print space
-          ...number(32),
-          [ Opcodes.call, importedFuncs.printChar ]
+          ...(i !== decl.arguments.length - 1 ? [
+            ...number(32),
+            [ Opcodes.call, importedFuncs.printChar ]
+          ] : [])
         );
       }
 
@@ -3597,6 +3665,8 @@ const internalConstrs = {
         [ Opcodes.call, importedFuncs.printChar ]
       );
 
+      out.push(...number(UNDEFINED));
+
       return out;
     },
     type: TYPES.undefined,

package/compiler/index.js

@@ -12,14 +12,7 @@ globalThis.decompile = decompile;
 const logFuncs = (funcs, globals, exceptions) => {
   console.log('\n' + underline(bold('funcs')));
 
-  const startIndex = funcs.sort((a, b) => a.index - b.index)[0].index;
   for (const f of funcs) {
-    console.log(`${underline(f.name)} (${f.index - startIndex})`);
-
-    console.log(`params: ${f.params.map((_, i) => Object.keys(f.locals)[Object.values(f.locals).indexOf(Object.values(f.locals).find(x => x.idx === i))]).join(', ')}`);
-    console.log(`returns: ${f.returns.length > 0 ? true : false}`);
-    console.log(`locals: ${Object.keys(f.locals).sort((a, b) => f.locals[a].idx - f.locals[b].idx).map(x => `${x} (${f.locals[x].idx})`).join(', ')}`);
-    console.log();
     console.log(decompile(f.wasm, f.name, f.index, f.locals, f.params, f.returns, funcs, globals, exceptions));
   }
 
@@ -44,12 +37,14 @@ export default (code, flags) => {
   opt(funcs, globals, pages, tags, exceptions);
   if (Prefs.profileCompiler) console.log(`3. optimized in ${(performance.now() - t2).toFixed(2)}ms`);
 
-  if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
+  // if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
 
   const t3 = performance.now();
   const wasm = assemble(funcs, globals, tags, pages, data, flags);
   if (Prefs.profileCompiler) console.log(`4. assembled in ${(performance.now() - t3).toFixed(2)}ms`);
 
+  if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
+
   if (Prefs.allocLog) {
     const wasmPages = Math.ceil((pages.size * pageSize) / 65536);
     const bytes = wasmPages * 65536;

package/compiler/precompile.js

@@ -18,7 +18,7 @@ const compile = async (file, [ _funcs, _globals ]) => {
     first = source.slice(0, source.indexOf('\n'));
   }
 
-  let args = ['--bytestring', '--todo-time=compile', '--no-aot-pointer-opt', '--no-treeshake-wasm-imports', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--parse-types', '--opt-types'];
+  let args = ['--bytestring', '--todo-time=compile', '--no-aot-pointer-opt', '--no-indirect-calls', '--no-treeshake-wasm-imports', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--parse-types', '--opt-types'];
   if (first.startsWith('// @porf')) {
     args = args.concat(first.slice('// @porf '.length).split(' '));
   }

package/compiler/prefs.js

@@ -1,4 +1,4 @@
-const onByDefault = [ 'bytestring', 'aotPointerOpt', 'treeshakeWasmImports', 'alwaysMemory' ];
+const onByDefault = [ 'bytestring', 'aotPointerOpt', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls' ];
 
 let cache = {};
 const obj = new Proxy({}, {

package/compiler/wrap.js

@@ -1,6 +1,7 @@
+import { encodeVector, encodeLocal } from './encoding.js';
+import { importedFuncs } from './builtins.js';
 import compile from './index.js';
 import decompile from './decompile.js';
-import { encodeVector, encodeLocal } from './encoding.js';
 import { TYPES } from './types.js';
 import { log } from './log.js';
 import Prefs from './prefs.js';
@@ -14,9 +15,13 @@ const porfToJSValue = (memory, funcs, value, type) => {
     case TYPES.object: return value === 0 ? null : {};
 
     case TYPES.function: {
-      // wasm func index, including all imports
-      const func = funcs.find(x => (x.originalIndex ?? x.index) === value);
-      // if (!func) return value;
+      let func;
+      if (value < 0) {
+        func = importedFuncs[value + importedFuncs.length];
+      } else {
+        func = funcs.find(x => ((x.originalIndex ?? x.index) - importedFuncs.length) === value);
+      }
+
       if (!func) return function () {};
 
       // make fake empty func for repl/etc
@@ -216,7 +221,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
 
         if (ret == null) return undefined;
 
-        return porfToJSValue(memory, funcs, ret[0], ret[1])
+        return porfToJSValue(memory, funcs, ret[0], ret[1]);
       } catch (e) {
         if (e.is && e.is(exceptTag)) {
           const exceptId = e.getArg(exceptTag, 0);

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.14.0-7bef6473d",
+  "version": "0.14.0-a24ac8cf2",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {