porffor 0.55.23 → 0.55.25

package/compiler/codegen.js

@@ -848,13 +848,6 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMod
       ] ] ] : []),
 
       [ 'default', def ]
-
-      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
-      // [ 'default', [
-      //   // other types are always truthy
-      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-      //   number(1, intOut ? Valtype.i32 : valtypeBinary)
-      // ] ]
     ], intOut ? Valtype.i32 : valtypeBinary)
   ];
 };
@@ -921,13 +914,6 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
       ] ] ] : []),
 
       [ 'default', def ]
-
-      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
-      // [ 'default', [
-      //   // other types are always truthy
-      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-      //   number(0, intOut ? Valtype.i32 : valtypeBinary)
-      // ] ]
     ], intOut ? Valtype.i32 : valtypeBinary)
   ];
 };
@@ -1723,7 +1709,6 @@ const getNodeType = (scope, node) => {
   if (guess != null) out.guess = typeof guess === 'number' ? [ number(guess, Valtype.i32) ] : guess;
 
   typeUsed(scope, knownType(scope, out));
-
   return out;
 };
 
@@ -1891,8 +1876,6 @@ const aliasPrimObjsBC = bc => {
   const add = (x, y) => {
     if (bc[x] == null) return;
 
-    // bc[`${x},${y}`] = original;
-
     // intentionally duplicate to avoid extra bc for prim objs as rarely used
     bc[y] = bc[x];
   };
@@ -3124,8 +3107,6 @@ const extractTypeAnnotation = decl => {
   const typeName = type;
   type = typeAnnoToPorfType(type);
 
-  // if (decl.name) console.log(decl.name, { type, elementType });
-
   return { type, typeName, elementType };
 };
 
@@ -3551,6 +3532,8 @@ const memberTmpNames = scope => {
 
 // COCTC: cross-object compile-time cache
 const coctcOffset = prop => {
+  if (!Prefs.coctc) return 0;
+
   if (typeof prop === 'object') {
     if (
       prop.computed || prop.optional ||
@@ -3562,7 +3545,7 @@ const coctcOffset = prop => {
 
   let offset = coctc.get(prop);
   if (offset == null) {
-    offset = (coctc.lastOffset ?? 60000) - 9;
+    offset = (coctc.lastOffset ?? Prefs.coctcOffset ?? 16300) - 9;
     if (offset < 0) return 0;
 
     coctc.lastOffset = offset;
@@ -3691,7 +3674,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     // todo/perf: use i32 object (and prop?) locals
     const { objectTmp, propertyTmp, objectGet, propertyGet } = memberTmpNames(scope);
 
-    const useCoctc = Prefs.coctc && coctcOffset(decl.left) > 0;
+    const useCoctc = coctcOffset(decl.left) > 0;
     if (useCoctc) valueUnused = false;
 
     // opt: do not mark prototype funcs as referenced to optimize this in them
@@ -4137,7 +4120,7 @@ const generateUnary = (scope, decl) => {
         const property = getProperty(decl.argument);
         if (property.value === 'length' || property.value === 'name') scope.noFastFuncMembers = true;
 
-        const useCoctc = Prefs.coctc && coctcOffset(decl.argument) > 0;
+        const useCoctc = coctcOffset(decl.argument) > 0;
         const objectTmp = useCoctc && localTmp(scope, '#coctc_object', Valtype.i32);
 
         const out = [
@@ -5658,7 +5641,7 @@ const generateMember = (scope, decl, _global, _name) => {
 
     const out = [
       ...generate(scope, object),
-      Opcodes.i32_to_u,
+      Opcodes.i32_to_u
     ];
 
     if (Prefs.fastLength) {
@@ -5685,7 +5668,7 @@ const generateMember = (scope, decl, _global, _name) => {
       ...out,
       [ Opcodes.local_set, tmp ],
 
-      ...getNodeType(scope, object),
+      ...type,
       number(TYPE_FLAGS.length, Valtype.i32),
       [ Opcodes.i32_and ],
       [ Opcodes.if, valtypeBinary ],
@@ -5707,6 +5690,8 @@ const generateMember = (scope, decl, _global, _name) => {
 
   // todo/perf: use i32 object (and prop?) locals
   const { objectTmp, propertyTmp, objectGet, propertyGet } = memberTmpNames(scope);
+  const type = getNodeType(scope, object);
+  const known = knownType(scope, type);
 
   // todo: generate this array procedurally during builtinFuncs creation
   if (['size', 'description', 'byteLength', 'byteOffset', 'buffer', 'detached', 'resizable', 'growable', 'maxByteLength'].includes(decl.property.name)) {
@@ -5714,7 +5699,6 @@ const generateMember = (scope, decl, _global, _name) => {
     const bc = {};
     const cands = Object.keys(builtinFuncs).filter(x => x.startsWith('__') && x.endsWith('_prototype_' + decl.property.name + '$get'));
 
-    const known = knownType(scope, getNodeType(scope, object));
     if (cands.length > 0) {
       for (const x of cands) {
         const type = TYPES[x.split('_prototype_')[0].slice(2).toLowerCase()];
@@ -5750,10 +5734,10 @@ const generateMember = (scope, decl, _global, _name) => {
     if (known == null) extraBC = bc;
   }
 
-  const useCoctc = Prefs.coctc && coctcOffset(decl) > 0;
+  const useCoctc = coctcOffset(decl) > 0;
   const coctcObjTmp = useCoctc && localTmp(scope, '#coctc_obj' + uniqId(), Valtype.i32);
 
-  const out = typeSwitch(scope, getNodeType(scope, object), {
+  const out = typeSwitch(scope, type, {
     ...(decl.computed ? {
       [TYPES.array]: () => [
         propertyGet,
@@ -5921,20 +5905,15 @@ const generateMember = (scope, decl, _global, _name) => {
 
     [TYPES.undefined]: internalThrow(scope, 'TypeError', `Cannot read property of undefined`, true),
 
-    // default: internalThrow(scope, 'TypeError', 'Unsupported member expression object', true)
     default: () => [
-      // ...(useCoctc ? [
-      //   [ Opcodes.local_get, coctcObjTmp ],
-      //   number(TYPES.object, Valtype.i32)
-      // ] : [
-      //   objectGet,
-      //   Opcodes.i32_to,
-      //   ...getNodeType(scope, object)
-      // ]),
-
-      objectGet,
-      Opcodes.i32_to,
-      ...getNodeType(scope, object),
+      ...(useCoctc && known === TYPES.object ? [
+        [ Opcodes.local_get, coctcObjTmp ],
+        number(TYPES.object, Valtype.i32)
+      ] : [
+        objectGet,
+        Opcodes.i32_to,
+        ...type
+      ]),
 
       ...toPropertyKey(scope, [ propertyGet ], getNodeType(scope, property), decl.computed, true),
 
@@ -5954,7 +5933,7 @@ const generateMember = (scope, decl, _global, _name) => {
       ...generate(scope, object),
       [ Opcodes.local_tee, objectTmp ],
 
-      ...nullish(scope, [], getNodeType(scope, object), false, true),
+      ...nullish(scope, [], type, false, true),
       [ Opcodes.if, Blocktype.void ],
         ...setLastType(scope, TYPES.undefined),
         number(0),
@@ -6959,39 +6938,6 @@ export default program => {
     f.wasm = f.returns.map(x => number(0, x));
   }
 
-  // // remove never generated functions
-  // let indexDelta = 0;
-  // const funcRemap = new Map();
-  // for (let i = 0; i < funcs.length; i++) {
-  //   const f = funcs[i];
-  //   if (f.internal || f.wasm) {
-  //     if (indexDelta) {
-  //       funcRemap.set(f.index, f.index - indexDelta);
-  //       f.index -= indexDelta;
-  //     }
-  //     continue;
-  //   }
-
-  //   funcs.splice(i--, 1);
-  //   indexDelta++;
-  // }
-
-  // // remap call ops
-  // if (indexDelta) for (let i = 0; i < funcs.length; i++) {
-  //   const wasm = funcs[i].wasm;
-  //   for (let j = 0; j < wasm.length; j++) {
-  //     const op = wasm[j];
-  //     if (op[0] === Opcodes.call) {
-  //       let idx = op[1];
-  //       wasm[j] = [ Opcodes.call, funcRemap.get(idx) ?? idx ];
-  //     }
-
-  //     if (op[0] === Opcodes.const && op[2] === 'funcref') {
-  //       wasm[j] = [ Opcodes.const, funcRemap.get(op[1] + importedFuncs.length) - importedFuncs.length ];
-  //     }
-  //   }
-  // }
-
   // add indirect funcs to end of funcs
   for (let i = 0; i < indirectFuncs.length; i++) {
     const f = indirectFuncs[i];

package/compiler/index.js

@@ -73,7 +73,8 @@ export default (code, module = undefined) => {
   globalThis.valtype = Prefs.valtype ?? 'f64';
   globalThis.valtypeBinary = Valtype[valtype];
 
-  globalThis.pageSize = (parseInt(Prefs.valtype) * 1024) || PageSize;
+  // use smaller page sizes internally (65536 / 4 = 16384)
+  globalThis.pageSize = Prefs.pageSize ?? (PageSize / 4);
 
   // change some prefs by default for c/native
   if (target !== 'wasm') {

package/package.json

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

package/r.cjs

@@ -1,8 +1,9 @@
-// let { 1n: a } = { "1": "foo" };
-// console.log(a);
-let obj = { "1": "foo" };
-console.log(obj, obj[1], obj[1n]);
+let a = { b: { } };
+a.b.foo = () => {};
+a.b.bar = function () {};
+a.b.baz = function baz() {};
 
+console.log(a.b);
 // let x = {};
 // x.__proto__ = { wow() { console.log(0); } };
 // Object.defineProperty(x, '__proto__', { value: { wow() { console.log(1); } } });

package/runner/flamegraph.js

@@ -55,7 +55,7 @@ const render = () => {
   text += `${' '.repeat(32 - text.length)}┃ render: ${lastRenderTime.toFixed(2)}ms`;
 
   if (end != null || Prefs.live) {
-    const btHeight = 20;
+    const btHeight = 40;
     const fgBottom = termHeight - btHeight - 10;
 
     let lastEnds = [];
@@ -115,11 +115,11 @@ const render = () => {
     (() => {
       const perTime = 18;
       let text = '  ' + 'name';
-      text += `${' '.repeat(40 - text.length)}┃ total`;
-      text += `${' '.repeat(40 + 5 + perTime - text.length)}┃ min`;
-      text += `${' '.repeat(40 + 5 + (perTime * 2) - text.length)}┃ avg`;
-      text += `${' '.repeat(40 + 5 + (perTime * 3) - text.length)}┃ max`;
-      text += `${' '.repeat(40 + 5 + (perTime * 4) - text.length)}┃ count`;
+      text += `${' '.repeat(60 - text.length)}┃ total`;
+      text += `${' '.repeat(60 + 5 + perTime - text.length)}┃ min`;
+      text += `${' '.repeat(60 + 5 + (perTime * 2) - text.length)}┃ avg`;
+      text += `${' '.repeat(60 + 5 + (perTime * 3) - text.length)}┃ max`;
+      text += `${' '.repeat(60 + 5 + (perTime * 4) - text.length)}┃ count`;
       process.stdout.write(`\x1b[0m\x1b[2m${text.replaceAll('┃', '\x1b[0m\x1b[90m┃\x1b[0m\x1b[2m')}${' '.repeat(termWidth - text.length)}\x1b[0m`);
     })();
 
@@ -134,13 +134,13 @@ const render = () => {
 
       const perTime = 18;
       let text = '  \x1b[1m' + func.name + '\x1b[22m';
-      text += `${' '.repeat(49 - text.length)}┃ ${total.toFixed(2)}ms`;
-      text += `${' '.repeat(49 + perTime - text.length)}${((total / _total) * 100).toFixed(0)}%`;
-      text += `${' '.repeat(49 + 5 + perTime - text.length)}┃ ${min.toFixed(2)}ms`;
-      text += `${' '.repeat(49 + 5 + (perTime * 2) - text.length)}┃ ${avg.toFixed(2)}ms`;
-      text += `${' '.repeat(49 + 5 + (perTime * 3) - text.length)}┃ ${max.toFixed(2)}ms`;
-      text += `${' '.repeat(49 + 5 + (perTime * 4) - text.length)}┃ ${count}`;
-      process.stdout.write(`\x1b[${termHeight - btHeight + 2 + i};1H\x1b[0m${text.replaceAll('┃', '\x1b[90m┃\x1b[0m').replaceAll('ms', '\x1b[2mms\x1b[22m').replaceAll('%', '\x1b[2m%\x1b[22m')}${' '.repeat(termWidth - noAnsi(text).length)}`);
+      text += `${' '.repeat(69 - text.length)}┃ ${total.toFixed(2)}ms`;
+      text += `${' '.repeat(69 + perTime - text.length)}${((total / _total) * 100).toFixed(0)}%`;
+      text += `${' '.repeat(69 + 5 + perTime - text.length)}┃ ${min.toFixed(2)}ms`;
+      text += `${' '.repeat(69 + 5 + (perTime * 2) - text.length)}┃ ${avg.toFixed(2)}ms`;
+      text += `${' '.repeat(69 + 5 + (perTime * 3) - text.length)}┃ ${max.toFixed(2)}ms`;
+      text += `${' '.repeat(69 + 5 + (perTime * 4) - text.length)}┃ ${count}`;
+      process.stdout.write(`\x1b[${termHeight - btHeight + 2 + i};1H\x1b[0m${text.replaceAll('┃', '\x1b[90m┃\x1b[0m').replaceAll(/(\.[0-9][0-9])ms/g, '\x1b[2m$1ms\x1b[22m').replaceAll('%', '\x1b[2m%\x1b[22m')}${' '.repeat(termWidth - noAnsi(text).length)}`);
     }
   }
 

package/runner/index.js

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

package/runner/repl.js

@@ -34,10 +34,9 @@ console.log(`Welcome to \x1B[1m\x1B[35mPorffor\x1B[0m \x1B[2m(${globalThis.versi
 console.log();
 
 let lastMemory, lastPages;
-const PageSize = 65536;
 const memoryToString = mem => {
   let out = '';
-  const wasmPages = mem.buffer.byteLength / PageSize;
+  const wasmPages = mem.buffer.byteLength / 65536;
 
   out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KiB\x1B[0m (using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'})\n\n`;