porffor 0.14.0-4e46400a9 → 0.14.0-7bef6473d

package/compiler/codegen.js

@@ -58,11 +58,10 @@ 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 - importedFuncs.length);
+        return number(func.index);
       }
 
       return [];
@@ -188,7 +187,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 ?? globals[x].idx;
+              if (Number.isNaN(int)) return scope.locals[x]?.idx;
               return int;
             });
 
@@ -314,10 +313,10 @@ const generateIdent = (scope, decl) => {
 
     if (local?.idx === undefined) {
       // no local var with name
-      if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
+      if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name]);
+      if (Object.hasOwn(funcIndex, name)) return number(funcIndex[name]);
 
-      if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name] - importedFuncs.length);
-      if (Object.hasOwn(funcIndex, name)) return number(funcIndex[name] - importedFuncs.length);
+      if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
     }
 
     if (local?.idx === undefined && rawName.startsWith('__')) {
@@ -1832,23 +1831,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   }
 
   if (idx === undefined) {
-    if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) {
-      if (!Prefs.indirectCalls) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
-
-      const [ local, global ] = lookupName(scope, name);
-      funcs.table = true;
-
-      // todo: only works when:
-      //   1. arg count matches arg count of function
-      //   2. function uses typedParams and typedReturns
-      return typeSwitch(scope, getNodeType(decl.callee), {
-        [TYPES.function]: [
-          [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
-          [ Opcodes.call_indirect ]
-        ],
-        default: internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true)
-      });
-    }
+    if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
     return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
   }
 
@@ -1877,10 +1860,11 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     const arg = args[i];
     out = out.concat(generate(scope, arg));
 
-    if (valtypeBinary !== Valtype.i32 && (
-      (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32) ||
-      (importedFuncs[name] && name.startsWith('profile'))
-    )) {
+    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')) {
       out.push(Opcodes.i32_to);
     }
 
@@ -2190,22 +2174,6 @@ 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
@@ -2217,7 +2185,6 @@ 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)));
     }
 
@@ -2231,7 +2198,6 @@ 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`
@@ -2241,18 +2207,8 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   if (isFuncType(decl.right.type)) {
     // hack for a = function () { ... }
     decl.right.id = { name };
-
-    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)
-      ] : [])
-    ];
+    generateFunc(scope, decl.right);
+    return [];
   }
 
   const op = decl.operator.slice(0, -1) || '=';
@@ -2351,6 +2307,8 @@ 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
 
@@ -3410,7 +3368,7 @@ const generateFunc = (scope, decl) => {
 
   if (typedInput && decl.returnType) {
     const { type } = extractTypeAnnotation(decl.returnType);
-    if (type != null && !Prefs.indirectCalls) {
+    if (type != null) {
       innerScope.returnType = type;
       innerScope.returns = [ valtypeBinary ];
     }

package/compiler/wrap.js

@@ -1,7 +1,6 @@
-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';
@@ -15,13 +14,9 @@ const porfToJSValue = (memory, funcs, value, type) => {
     case TYPES.object: return value === 0 ? null : {};
 
     case TYPES.function: {
-      let func;
-      if (value < 0) {
-        func = importedFuncs[value + importedFuncs.length];
-      } else {
-        func = funcs.find(x => ((x.originalIndex ?? x.index) - importedFuncs.length) === value);
-      }
-
+      // wasm func index, including all imports
+      const func = funcs.find(x => (x.originalIndex ?? x.index) === value);
+      // if (!func) return value;
       if (!func) return function () {};
 
       // make fake empty func for repl/etc
@@ -221,7 +216,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-4e46400a9",
+  "version": "0.14.0-7bef6473d",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {