porffor 0.59.2 → 0.59.3

package/compiler/codegen.js

@@ -879,7 +879,7 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
   return [
     ...left,
     [ Opcodes.local_tee, localTmp(scope, 'logictmp') ],
-    ...checks[op](scope, [], leftType, false, true),
+    ...checks[op](scope, [], leftType),
     [ Opcodes.if, valtypeBinary ],
     ...right,
     // note type
@@ -935,25 +935,29 @@ const compareStrings = (scope, left, right, leftType, rightType, noConv = false)
   ];
 };
 
-const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode = undefined) => {
-  const truthyMode = forceTruthyMode ?? Prefs.truthy ?? 'full';
+const truthy = (scope, wasm, type, nonbinary = true, intIn = false) => {
+  if (valtypeBinary === Valtype.i32) intIn = true;
+
+  // nonbinary = true: int output, 0 or non-0
+  // nonbinary = false: float output, 0 or 1
+
+  const truthyMode = nonbinary ? (Prefs.truthy ?? 'full') : 'full';
   if (isIntToFloatOp(wasm[wasm.length - 1])) return [
     ...wasm,
     ...(truthyMode === 'full' ? [
       [ Opcodes.f64_const, 0 ],
       [ Opcodes.f64_ne ],
-      ...(!intOut ? [ Opcodes.i32_from_u ] : [])
-    ] : [
-      ...(!intIn && intOut ? [ Opcodes.i32_to_u ] : [])
-    ])
+      ...(!nonbinary ? [ Opcodes.i32_from_u ] : [])
+    ] : (!intIn && nonbinary ? [ Opcodes.i32_to_u ] : []))
   ];
+
   if (isIntOp(wasm[wasm.length - 1])) return [
     ...wasm,
     ...(truthyMode === 'full' ? [
       [ Opcodes.i32_eqz ],
       [ Opcodes.i32_eqz ]
     ] : []),
-    ...(intOut ? [] : [ Opcodes.i32_from ]),
+    ...(nonbinary ? [] : [ Opcodes.i32_from ])
   ];
 
   // todo/perf: use knownType and custom bytecode here instead of typeSwitch
@@ -973,21 +977,21 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMod
         [ Opcodes.f64_gt ]
       ]),
 
-      ...(intOut ? [] : [ Opcodes.i32_from ]),
+      ...(nonbinary ? [] : [ Opcodes.i32_from ]),
     ];
 
     if (truthyMode === 'no_negative') return [
       // if value != 0 or NaN, non-binary output. negative numbers not truthy :/
       ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
       ...(intIn ? [] : [ Opcodes.i32_to ]),
-      ...(intOut ? [] : [ Opcodes.i32_from ])
+      ...(nonbinary ? [] : [ Opcodes.i32_from ])
     ];
 
     if (truthyMode === 'no_nan_negative') return [
       // simpler and faster but makes NaN truthy and negative numbers not truthy,
       // plus non-binary output
       ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
-      ...(!intOut || (intIn && intOut) ? [] : [ Opcodes.i32_to_u ])
+      ...(!nonbinary || (intIn && nonbinary) ? [] : [ Opcodes.i32_to_u ])
     ];
   })();
 
@@ -1004,27 +1008,32 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMod
         [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
 
         // if length != 0
-        /* [ Opcodes.i32_eqz ],
-        [ Opcodes.i32_eqz ], */
-        ...(intOut ? [] : [ Opcodes.i32_from_u ])
+        ...(nonbinary ? [] : [
+          [ Opcodes.i32_eqz ],
+          [ Opcodes.i32_eqz ],
+          Opcodes.i32_from_u
+        ])
       ] ],
 
       ...(truthyMode === 'full' ? [ [ [ TYPES.booleanobject, TYPES.numberobject ], [
         // always truthy :))
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-        number(1, intOut ? Valtype.i32 : valtypeBinary)
+        number(1, nonbinary ? Valtype.i32 : valtypeBinary)
       ] ] ] : []),
 
       [ 'default', def ]
-    ], intOut ? Valtype.i32 : valtypeBinary)
+    ], nonbinary ? Valtype.i32 : valtypeBinary)
   ];
 };
 
-const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode = undefined) => {
+const falsy = (scope, wasm, type, nonbinary = true, intIn = false) => {
+  // nonbinary = true: int output, 0 or non-0
+  // nonbinary = false: float output, 0 or 1
+
   const useTmp = knownType(scope, type) == null;
   const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
-  const truthyMode = forceTruthyMode ?? Prefs.truthy ?? 'full';
+  const truthyMode = Prefs.truthy ?? 'full';
   const def = (() => {
     if (truthyMode === 'full') return [
       // if value == 0 or NaN
@@ -1038,7 +1047,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
         [ Opcodes.i32_eqz ]
       ]),
 
-      ...(intOut ? [] : [ Opcodes.i32_from ]),
+      ...(nonbinary ? [] : [ Opcodes.i32_from ]),
     ];
 
     if (truthyMode === 'no_negative') return [
@@ -1046,15 +1055,15 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
       ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
       ...(intIn ? [] : [ Opcodes.i32_to ]),
       [ Opcodes.i32_eqz ],
-      ...(intOut ? [] : [ Opcodes.i32_from ])
+      ...(nonbinary ? [] : [ Opcodes.i32_from ])
     ];
 
     if (truthyMode === 'no_nan_negative') return [
       // simpler and faster but makes NaN truthy and negative numbers not truthy,
       // plus non-binary output
       ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
-      ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
-      ...(intOut ? [] : [ Opcodes.i32_from_u ])
+      ...(intIn ? [ [ Opcodes.i32_eqz ] ] : Opcodes.eqz),
+      ...(nonbinary ? [] : [ Opcodes.i32_from_u ])
     ];
   })();
 
@@ -1072,21 +1081,24 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
 
         // if length == 0
         [ Opcodes.i32_eqz ],
-        ...(intOut ? [] : [ Opcodes.i32_from_u ])
+        ...(nonbinary ? [] : [ Opcodes.i32_from_u ])
       ] ],
 
       ...(truthyMode === 'full' ? [ [ [ TYPES.booleanobject, TYPES.numberobject ], [
         // always truthy :))
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-        number(0, intOut ? Valtype.i32 : valtypeBinary)
+        number(0, nonbinary ? Valtype.i32 : valtypeBinary)
       ] ] ] : []),
 
       [ 'default', def ]
-    ], intOut ? Valtype.i32 : valtypeBinary)
+    ], nonbinary ? Valtype.i32 : valtypeBinary)
   ];
 };
 
-const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
+const nullish = (scope, wasm, type, nonbinary = true, intIn = false) => {
+  // nonbinary = true: int output, 0 or non-0
+  // nonbinary = false: float output, 0 or 1
+
   const useTmp = knownType(scope, type) == null;
   const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
@@ -1098,21 +1110,21 @@ const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
       [ TYPES.undefined, [
         // empty
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-        number(1, intOut ? Valtype.i32 : valtypeBinary)
+        number(1, nonbinary ? Valtype.i32 : valtypeBinary)
       ] ],
       [ TYPES.object, [
         // object, null if == 0
         ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
 
-        ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
-        ...(intOut ? [] : [ Opcodes.i32_from_u ])
+        ...(intIn ? [ [ Opcodes.i32_eqz ] ] : Opcodes.eqz),
+        ...(nonbinary ? [] : [ Opcodes.i32_from_u ])
       ] ],
       [ 'default', [
         // not
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-        number(0, intOut ? Valtype.i32 : valtypeBinary)
+        number(0, nonbinary ? Valtype.i32 : valtypeBinary)
       ] ]
-    ], intOut ? Valtype.i32 : valtypeBinary)
+    ], nonbinary ? Valtype.i32 : valtypeBinary)
   ];
 };
 
@@ -1348,14 +1360,14 @@ const generateBinaryExp = (scope, decl) => {
   // opt: == null|undefined -> nullish
   if (decl.operator === '==' || decl.operator === '!=') {
     if (knownNullish(decl.right)) {
-      const out = nullish(scope, generate(scope, decl.left), getNodeType(scope, decl.left), false, true);
+      const out = nullish(scope, generate(scope, decl.left), getNodeType(scope, decl.left));
       if (decl.operator === '!=') out.push([ Opcodes.i32_eqz ]);
       out.push(Opcodes.i32_from_u);
       return out;
     }
 
     if (knownNullish(decl.left)) {
-      const out = nullish(scope, generate(scope, decl.right), getNodeType(scope, decl.right), false, true);
+      const out = nullish(scope, generate(scope, decl.right), getNodeType(scope, decl.right));
       if (decl.operator === '!=') out.push([ Opcodes.i32_eqz ]);
       out.push(Opcodes.i32_from_u);
       return out;
@@ -1450,7 +1462,9 @@ const asmFuncToAsm = (scope, func, extra) => func(scope, {
   }
 }, extra);
 
-const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTypes = [], globalInits = {}, returns = [], returnType, localNames = [], globalNames = [], table = false, constr = false, hasRestArgument = false, usesTag = false, usesImports = false, returnTypes } = {}) => {
+const asmFunc = (name, func) => {
+  func = { ...func };
+  let { wasm, params, locals: localTypes, localNames = [], table, usesTag, returnTypes, returnType } = func;
   if (wasm == null) { // called with no built-in
     log.warning('codegen', `${name} has no built-in!`);
     wasm = [];
@@ -1465,19 +1479,11 @@ const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTy
     locals[localNames[i] ?? `l${i}`] = { idx: i, type: allLocals[i] };
   }
 
-  const func = {
-    name,
-    params,
-    typedParams,
-    locals,
-    localInd: allLocals.length,
-    returns,
-    returnType,
-    internal: true,
-    index: currentFuncIndex++,
-    globalInits,
-    constr, table, usesImports, hasRestArgument
-  };
+  func.internal = true;
+  func.name = name;
+  func.locals = locals;
+  func.localInd = allLocals.length;
+  func.index = currentFuncIndex++;
 
   funcs.push(func);
   funcIndex[name] = func.index;
@@ -1505,8 +1511,9 @@ const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTy
     typeUsed(func, returnType);
   }
 
-  func.jsLength = countLength(func);
+  if (func.jsLength == null) func.jsLength = countLength(func);
   func.wasm = wasm;
+
   return func;
 };
 
@@ -2483,14 +2490,13 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       out = out.concat(generate(scope, arg), valtypeBinary === Valtype.i32 && scope.locals[arg.name]?.type !== Valtype.f64 ? [ [ Opcodes.f64_convert_i32_s ] ] : [], getNodeType(scope, arg));
     }
 
-    let knownThis = undefined, getCallee = undefined;
-
     const tmpName = '#indirect' + uniqId() + '_';
     const calleeLocal = localTmp(scope, tmpName + 'callee');
+    let callee = decl.callee, callAsNew = decl._new, sup = false, knownThis = undefined;
 
     // hack: this should be more thorough, Function.bind, etc
-    if (!decl._new && (decl.callee.type === 'MemberExpression' || decl.callee.type === 'ChainExpression')) {
-      const { property, object, computed, optional } = decl.callee.expression ?? decl.callee;
+    if (!callAsNew && (callee.type === 'MemberExpression' || callee.type === 'ChainExpression')) {
+      const { property, object, computed, optional } = callee.expression ?? callee;
       if (object && property) {
         const thisLocal = localTmp(scope, tmpName + 'caller');
         const thisLocalType = localTmp(scope, tmpName + 'caller#type', Valtype.i32);
@@ -2499,7 +2505,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           [ Opcodes.local_get, thisLocal ],
           [ Opcodes.local_get, thisLocalType ]
         ];
-        getCallee = generate(scope, {
+        callee = {
           type: 'MemberExpression',
           object: {
             type: 'Wasm',
@@ -2516,11 +2522,10 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           property,
           computed,
           optional
-        });
+        };
       }
     }
 
-    let callee = decl.callee, callAsNew = decl._new, sup = false;
     if (callee.type === 'Super') {
       // call super constructor with direct super() call
       callee = getObjProp(callee, 'constructor');
@@ -2538,7 +2543,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     const thisWasm = decl._thisWasm ?? knownThis ?? createThisArg(scope, decl);
 
     out = [
-      ...(getCallee ? getCallee : generate(scope, callee)),
+      ...generate(scope, callee),
       [ Opcodes.local_set, calleeLocal ],
 
       ...typeSwitch(scope, getNodeType(scope, callee), {
@@ -4244,11 +4249,11 @@ const generateUnary = (scope, decl) => {
       const arg = decl.argument;
       if (arg.type === 'UnaryExpression' && arg.operator === '!') {
         // opt: !!x -> is x truthy
-        return truthy(scope, generate(scope, arg.argument), getNodeType(scope, arg.argument), false, false, 'full');
+        return truthy(scope, generate(scope, arg.argument), getNodeType(scope, arg.argument), false);
       }
 
       // !=
-      return falsy(scope, generate(scope, arg), getNodeType(scope, arg), false, false);
+      return falsy(scope, generate(scope, arg), getNodeType(scope, arg), false);
 
     case 'void': {
       // drop current expression value after running, give undefined
@@ -4449,7 +4454,7 @@ const generateIf = (scope, decl) => {
     ];
   }
 
-  const out = truthy(scope, generate(scope, decl.test), getNodeType(scope, decl.test), false, true);
+  const out = truthy(scope, generate(scope, decl.test), getNodeType(scope, decl.test));
   out.push([ Opcodes.if, Blocktype.void ]);
   depth.push('if');
   inferBranchStart(scope, decl.consequent);
@@ -4480,7 +4485,7 @@ const generateIf = (scope, decl) => {
 };
 
 const generateConditional = (scope, decl) => {
-  const out = truthy(scope, generate(scope, decl.test), getNodeType(scope, decl.test), false, true);
+  const out = truthy(scope, generate(scope, decl.test), getNodeType(scope, decl.test));
 
   out.push([ Opcodes.if, valtypeBinary ]);
   depth.push('if');
@@ -5630,6 +5635,7 @@ const generateArray = (scope, decl, global = false, name = '$undeclared', static
     Opcodes.i32_from_u
   );
 
+  typeUsed(scope, TYPES.array);
   return out;
 };
 
@@ -5755,37 +5761,14 @@ const countParams = (func, name = undefined) => {
   let params = func.params.length;
   if (func.constr) params -= 4;
   if (func.method) params -= 2;
-  if (!func.internal || builtinFuncs[name]?.typedParams) params = Math.floor(params / 2);
+  if (!func.internal || func.typedParams) params = Math.floor(params / 2);
 
   return func.argc = params;
 };
 
 const countLength = (func, name = undefined) => {
   if (func && func.jsLength != null) return func.jsLength;
-
-  name ??= func.name;
-
-  let count = countParams(func, name);
-  if (builtinFuncs[name] && name.includes('_prototype_')) count--;
-  if (func.hasRestArgument) count--;
-
-  if (func.internal) {
-    // some js built-ins have an old non-standard length
-    const override = ({
-      Array: 1,
-      String: 1,
-      __Object_assign: 2,
-      __String_fromCharCode: 1,
-      __String_fromCodePoint: 1,
-      __Array_prototype_concat: 1,
-      __Array_prototype_push: 1,
-      __Array_prototype_unshift: 1,
-      __String_prototype_concat: 1,
-      __ByteString_prototype_concat: 1
-    })[name];
-    if (override != null) return override;
-  }
-  return count;
+  return countParams(func, name ?? func.name);
 };
 
 const generateMember = (scope, decl, _global, _name) => {
@@ -6157,7 +6140,7 @@ const generateMember = (scope, decl, _global, _name) => {
       ...generate(scope, object),
       [ Opcodes.local_tee, objectTmp ],
 
-      ...nullish(scope, [], type, false, true),
+      ...nullish(scope, [], type),
       [ Opcodes.if, Blocktype.void ],
         ...setLastType(scope, TYPES.undefined),
         number(0),
@@ -7061,6 +7044,25 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
     args.push({ name, def, destr, type: typedInput && x.typeAnnotation });
   }
 
+  // custom built-in length changes
+  if (globalThis.precompile) {
+    if (name.includes('_prototype_')) jsLength--;
+    jsLength = ({
+      Array: 1,
+      String: 1,
+      __Object_assign: 2,
+      __String_fromCharCode: 1,
+      __String_fromCodePoint: 1,
+      __Array_prototype_concat: 1,
+      __Array_prototype_push: 1,
+      __Array_prototype_unshift: 1,
+      __String_prototype_concat: 1,
+      __ByteString_prototype_concat: 1,
+      __Atomics_wait: 4,
+      __Atomics_notify: 3
+    })[name] ?? jsLength;
+  }
+
   func.params = new Array((params.length + (func.constr ? 2 : (func.method ? 1 : 0))) * 2).fill(0).map((_, i) => i % 2 ? Valtype.i32 : valtypeBinary);
   func.jsLength = jsLength;
 

package/compiler/index.js

@@ -75,9 +75,6 @@ export default (code, module = Prefs.module) => {
   let outFile = Prefs.o;
   const logProgress = Prefs.profileCompiler || (outFile && !Prefs.native);
 
-  globalThis.valtype = Prefs.valtype ?? 'f64';
-  globalThis.valtypeBinary = Valtype[valtype];
-
   // use smaller page sizes internally (65536 / 4 = 16384)
   globalThis.pageSize = Prefs.pageSize ?? (PageSize / 4);
 

package/compiler/precompile.js

@@ -280,7 +280,7 @@ ${funcs.map(x => {
   const returnTypes = [...(x.returnTypes ?? [])].filter(x => ![ TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ].includes(x));
   return `this${name} = {
 wasm:${rewriteWasm(x.wasm)},
-params:${JSON.stringify(x.params)},typedParams:1,returns:${JSON.stringify(x.returns)},${x.returnType != null ? `returnType:${JSON.stringify(x.returnType)},` : ''}${returnTypes.length > 0 ? `returnTypes:${JSON.stringify(returnTypes)},` : ''}
+params:${JSON.stringify(x.params)},typedParams:1,returns:${JSON.stringify(x.returns)},${x.returnType != null ? `returnType:${JSON.stringify(x.returnType)},` : ''}${returnTypes.length > 0 ? `returnTypes:${JSON.stringify(returnTypes)},` : ''}jsLength:${x.jsLength},
 locals:${JSON.stringify(locals.slice(x.params.length).map(x => x[1].type))},localNames:${JSON.stringify(locals.map(x => x[0]))},
 ${x.globalInits ? `globalInits:{${Object.keys(x.globalInits).map(y => `${y}:${rewriteWasm(x.globalInits[y])}`).join(',')}},` : ''}${x.data && Object.keys(x.data).length > 0 ? `data:${JSON.stringify(x.data)},` : ''}
 ${x.table ? `table:1,` : ''}${x.constr ? `constr:1,` : ''}${x.hasRestArgument ? `hasRestArgument:1,` : ''}${x.usesTag ? `usesTag:1,` : ''}${x.usesImports ? `usesImports:1,` : ''}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.59.2",
+  "version": "0.59.3",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/runtime/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.59.2';
+globalThis.version = '0.59.3';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/AGENT.md

@@ -1,22 +0,0 @@
-you are an assistant coder for Porffor - an early javascript and typescript to webassembly and native ahead-of-time compiler. the codebase is written in js and ts.
-
-IMPORTANT:
-- built-ins apis (Date, String.prototype, etc) are written in ts inside `compiler/builtins`
-- once you update a file inside that directory, you MUST run `./porf precompile` to compile to make your changes effective
-
-Test your work using the test262 tools available, iterate independently but do not get stuck on one chain of thought or approach. Paths for test262 tools should be relative to the 'test262/test' directory (e.g., 'built-ins/RegExp' NOT 'test262/test/built-ins/RegExp').
-
-You can also do the following via bash/shell commands:
-- To get an overview of the most failing directories, use the command: `node test262/fails.cjs`
-- To just evaluate code in the engine, use the command: `./porf -p "..."`
-
-## Code Style
-- After finishing, check if your work/diff could be simplified
-- Always use single quotes (unless double is required)
-- 2-space indentation, LF line endings, no trailing whitespace
-- Built-in APIs in `compiler/builtins/` written in TypeScript
-- Inline code in built-ins, avoid helper functions
-- Use semicolons
-- Do not use trailing commas
-- Use const/let, avoid var
-- Follow existing naming: camelCase for variables, PascalCase for types