porffor 0.16.0-97bb4f33b → 0.16.0-a7bc359af

package/CONTRIBUTING.md

@@ -26,7 +26,7 @@ You can also swap out `node` in the alias to use another runtime like Deno (`den
 
 ### Precompile
 
-**If you update any file inside `compiler/builtins` you will need to do this for it to update inside Porffor otherwise your changes will have no effect.** Run `node compiler/precompile.js` to precompile. It may error during this, if so, you might have an error in your code or there could be a compiler error with Porffor (feel free to ask for help as soon as you encounter any errors with it).
+**If you update any file inside `compiler/builtins` you will need to do this for it to update inside Porffor otherwise your changes will have no effect.** Run `./porf precompile` to precompile. It may error during this, if so, you might have an error in your code or there could be a compiler error with Porffor (feel free to ask for help as soon as you encounter any errors with it).
 
 <br>
 

package/compiler/codegen.js

@@ -2115,7 +2115,6 @@ const brTable = (input, bc, returns) => {
   }
 
   for (let i = 0; i < count; i++) {
-    // if (i === 0) out.push([ Opcodes.block, returns, 'br table start' ]);
     if (i === 0) out.push([ Opcodes.block, returns ]);
       else out.push([ Opcodes.block, Blocktype.void ]);
   }
@@ -2149,10 +2148,8 @@ const brTable = (input, bc, returns) => {
     [ Opcodes.br_table, ...encodeVector(table), 0 ]
   );
 
-  // if you can guess why we sort the wrong way and then reverse
-  // (instead of just sorting the correct way)
-  // dm me and if you are correct and the first person
-  // I will somehow shout you out or something
+  // sort the wrong way and then reverse
+  // so strings ('default') are at the start before any numbers
   const orderedBc = keys.sort((a, b) => b - a).reverse();
 
   br = count - 1;
@@ -2178,7 +2175,7 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
     return bc[known] ?? bc.default;
   }
 
-  if (Prefs.typeswitchUseBrtable)
+  if (Prefs.typeswitchBrtable)
     return brTable(type, bc, returns);
 
   const tmp = localTmp(scope, '#typeswitch_tmp' + (Prefs.typeswitchUniqueTmp ? randId() : ''), Valtype.i32);
@@ -3270,7 +3267,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     firstAssign = true;
 
     // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
-    const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
+    const uniqueName = name === '$undeclared' ? name + randId() : name;
 
     let page;
     if (Prefs.scopedPageNames) page = allocPage(scope, `${getAllocType(itemType)}: ${scope.name}/${uniqueName}`, itemType);
@@ -3658,7 +3655,7 @@ const generateMember = (scope, decl, _global, _name) => {
   });
 };
 
-const randId = () => Math.random().toString(16).slice(0, -4);
+const randId = () => Math.random().toString(16).slice(1, -2).padEnd(12, '0');
 
 const objectHack = node => {
   if (!node) return node;
@@ -3710,7 +3707,7 @@ const generateFunc = (scope, decl) => {
   if (decl.async) return todo(scope, 'async functions are not supported');
   if (decl.generator) return todo(scope, 'generator functions are not supported');
 
-  const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
+  const name = decl.id ? decl.id.name : `anonymous${randId()}`;
   const params = decl.params ?? [];
 
   // TODO: share scope/locals between !!!

package/compiler/cyclone.js

@@ -1,4 +1,4 @@
-// cyclone: wasm partial constant evaluator
+// cyclone: wasm partial constant evaluator (it is fast and dangerous hence "cyclone")
 import { signedLEB128, ieee754_binary64, read_ieee754_binary64, read_signedLEB128 } from './encoding.js';
 import { Opcodes, Valtype } from './wasmSpec.js';
 
@@ -246,7 +246,7 @@ export default wasm => {
         const [ b, a ] = pop2();
         const v = bool(a === b);
 
-        replaceVal(v, Valtype.f64);
+        replaceVal(v, Valtype.i32);
         push(v);
         break;
       }
@@ -255,7 +255,7 @@ export default wasm => {
         const [ b, a ] = pop2();
         const v = bool(a !== b);
 
-        replaceVal(v, Valtype.f64);
+        replaceVal(v, Valtype.i32);
         push(v);
         break;
       }
@@ -264,7 +264,7 @@ export default wasm => {
         const [ b, a ] = pop2();
         const v = bool(a < b);
 
-        replaceVal(v, Valtype.f64);
+        replaceVal(v, Valtype.i32);
         push(v);
         break;
       }
@@ -273,7 +273,7 @@ export default wasm => {
         const [ b, a ] = pop2();
         const v = bool(a <= b);
 
-        replaceVal(v, Valtype.f64);
+        replaceVal(v, Valtype.i32);
         push(v);
         break;
       }
@@ -282,7 +282,7 @@ export default wasm => {
         const [ b, a ] = pop2();
         const v = bool(a > b);
 
-        replaceVal(v, Valtype.f64);
+        replaceVal(v, Valtype.i32);
         push(v);
         break;
       }
@@ -291,7 +291,7 @@ export default wasm => {
         const [ b, a ] = pop2();
         const v = bool(a >= b);
 
-        replaceVal(v, Valtype.f64);
+        replaceVal(v, Valtype.i32);
         push(v);
         break;
       }
@@ -404,7 +404,7 @@ export default wasm => {
       case Opcodes.f64_max: {
         if (stack.length < 2) { empty(); break; };
         const [ b, a ] = pop2();
-        const v = a + b;
+        const v = Math.max(a, b);
 
         replaceVal(v, Valtype.f64);
         push(v);
@@ -467,9 +467,9 @@ export default wasm => {
     // i32.const 1
     // i32.add
     // local.set 7 ;; $i (i32)
-    if (
-      (opcode >= 0xa0 && opcode <= 0xa3) || // main f64 math op
-      (opcode >= 0x61 && opcode <= 0x66) // main f64 eq op
+    if (i >= 2 &&
+      ((opcode >= 0xa0 && opcode <= 0xa3) || // main f64 math op
+      (opcode >= 0x61 && opcode <= 0x66)) // main f64 eq op
     ) {
       const o2 = wasm[i - 1][0];
       if (o2 === Opcodes.f64_const) { // f64.const
@@ -500,7 +500,7 @@ export default wasm => {
       }
     }
 
-    if ((opcode === 0xfc02 || opcode === 0xfc03) && i > 3) { // i32.trunc_sat_f64_s/u
+    if ((opcode === 0xfc02 || opcode === 0xfc03) && i >= 3) { // i32.trunc_sat_f64_s/u
       const o2 = wasm[i - 1][0];
       if (
         (o2 >= 0xa0 && o2 <= 0xa3) || // main f64 math op

package/compiler/havoc.js

@@ -1,4 +1,4 @@
-// havoc: wasm rewrite library
+// havoc: wasm rewrite library (it wreaks havoc upon wasm bytecode hence "havoc")
 import { Opcodes, Valtype } from './wasmSpec.js';
 
 export const localsToConsts = (func, targets, consts, { localKeys }) => {

package/compiler/index.js

@@ -27,7 +27,10 @@ const fs = (typeof process?.version !== 'undefined' ? (await import('node:fs'))
 const execSync = (typeof process?.version !== 'undefined' ? (await import('node:child_process')).execSync : undefined);
 
 export default (code, flags) => {
-  const target = Prefs.target ?? 'wasm';
+  let target = Prefs.target ?? 'wasm';
+  if (Prefs.native) target = 'native';
+
+  let outFile = Prefs.o;
 
   globalThis.valtype = 'f64';
   const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
@@ -113,8 +116,6 @@ export default (code, flags) => {
 
   const out = { wasm, funcs, globals, tags, exceptions, pages, data };
 
-  const outFile = Prefs.o;
-
   if (target === 'wasm' && outFile) {
     fs.writeFileSync(outFile, Buffer.from(wasm));
 
@@ -135,6 +136,8 @@ export default (code, flags) => {
   }
 
   if (target === 'native') {
+    outFile ??= Prefs.native ? './porffor_tmp' : file.split('/').at(-1).split('.').at(0, -1).join('.');
+
     let compiler = Prefs.compiler ?? 'clang';
     const cO = Prefs._cO ?? 'Ofast';
 
@@ -153,7 +156,29 @@ export default (code, flags) => {
 
     fs.unlinkSync(tmpfile);
 
-    if (process.version) process.exit();
+    if (process.version) {
+      if (Prefs.native) {
+        const cleanup = () => {
+          try {
+            fs.unlinkSync(outFile);
+          } catch {}
+        };
+
+        process.on('exit', cleanup);
+        process.on('beforeExit', cleanup);
+        process.on('SIGINT', () => {
+          cleanup();
+          process.exit();
+        });
+
+        const runArgs = process.argv.slice(2).filter(x => !x.startsWith('-'));
+        try {
+          execSync([ outFile, ...runArgs.slice(1) ].join(' '), { stdio: 'inherit' });
+        } catch {}
+      }
+
+      process.exit();
+    }
   }
 
   return out;

package/compiler/parse.js

@@ -43,7 +43,7 @@ export default (input, flags) => {
       webcompat: true,
 
       // babel
-      plugins: types ? ['estree', 'typescript'] : ['estree'],
+      plugins: types || flags.includes('typed') ? ['estree', 'typescript'] : ['estree'],
 
       // multiple
       sourceType: flags.includes('module') ? 'module' : 'script',

package/compiler/pgo.js

@@ -11,7 +11,7 @@ export const setup = () => {
 
   // enable these prefs by default for pgo
   Prefs.typeswitchUniqueTmp = Prefs.typeswitchUniqueTmp === false ? false : true;
-  Prefs.cyclone = Prefs.cyclone === false ? false : true;;
+  Prefs.cyclone = Prefs.cyclone === false ? false : true;
 };
 
 export const run = obj => {
@@ -87,9 +87,10 @@ export const run = obj => {
         localData[activeFunc][i].push(n);
       },
       w: (ind, outPtr) => { // readArgv
-        const args = process.argv.slice(process.argv.indexOf('--pgo')).filter(x => !x.startsWith('-'));
+        const pgoInd = process.argv.indexOf('--pgo');
+        const args = process.argv.slice(pgoInd).filter(x => !x.startsWith('-'));
         const str = args[ind - 1];
-        if (!str) {
+        if (pgoInd === -1 || !str) {
           if (Prefs.pgoLog) console.log('\nPGO warning: script was expecting arguments, please specify args to use for PGO after --pgo arg');
           return -1;
         }
@@ -130,16 +131,18 @@ export const run = obj => {
     func.localValues = localValues;
 
     let counts = new Array(10).fill(0);
-    const consistents = localData[i].map(x => {
-      if (x.length === 0 || !x.every((y, i) => i < 1 ? true : y === x[i - 1])) return false;
+    const consistents = localData[i].map((x, j) => {
+      if (j < func.params.length) return false; // param
+      if (x.length === 0 || !x.every((y, i) => i < 1 ? true : y === x[i - 1])) return false; // not consistent
 
       counts[0]++;
       return x[0];
     });
 
     const integerOnlyF64s = localData[i].map((x, j) => {
+      if (j < func.params.length) return false; // param
       if (localValues[j].type === Valtype.i32) return false; // already i32
-      if (x.length === 0 || !x.every(y => Number.isInteger(y))) return false;
+      if (x.length === 0 || !x.every(y => Number.isInteger(y))) return false; // not all integer values
 
       counts[1]++;
       return true;
@@ -150,14 +153,14 @@ export const run = obj => {
 
     log += `  ${func.name}: identified ${counts[0]}/${total} locals as consistent${Prefs.verbosePgo ? ':' : ''}\n`;
     if (Prefs.verbosePgo) {
-      for (let j = 0; j < localData[i].length; j++) {
+      for (let j = func.params.length; j < localData[i].length; j++) {
         log += `    ${consistents[j] !== false ? '\u001b[92m' : '\u001b[91m'}${localKeys[j]}\u001b[0m: ${new Set(localData[i][j]).size} unique values set\n`;
       }
     }
 
     log += `  ${func.name}: identified ${counts[1]}/${localValues.reduce((acc, x) => acc + (x.type === Valtype.f64 ? 1 : 0), 0)} f64 locals as integer usage only${Prefs.verbosePgo ? ':' : ''}\n`;
     if (Prefs.verbosePgo) {
-      for (let j = 0; j < localData[i].length; j++) {
+      for (let j = func.params.length; j < localData[i].length; j++) {
         if (localValues[j].type !== Valtype.f64) continue;
         log += `    ${integerOnlyF64s[j] ? '\u001b[92m' : '\u001b[91m'}${localKeys[j]}\u001b[0m\n`;
       }
@@ -177,7 +180,6 @@ export const run = obj => {
     for (let i = 0; i < x.integerOnlyF64s.length; i++) {
       const c = x.integerOnlyF64s[i];
       if (c === false) continue;
-      if (i < x.params.length) continue;
 
       targets.push(i);
     }
@@ -190,7 +192,6 @@ export const run = obj => {
     for (let i = 0; i < x.consistents.length; i++) {
       const c = x.consistents[i];
       if (c === false) continue;
-      if (i < x.params.length) continue;
 
       targets.push(i);
 

package/compiler/precompile.js

@@ -26,7 +26,7 @@ const compile = async (file, [ _funcs, _globals ]) => {
 
   const porfCompile = (await import(`./index.js?_=${Date.now()}`)).default;
 
-  let { funcs, globals, data, exceptions } = porfCompile(source, ['module']);
+  let { funcs, globals, data, exceptions } = porfCompile(source, ['module', 'typed']);
 
   const allocated = new Set();
 
@@ -87,6 +87,8 @@ const compile = async (file, [ _funcs, _globals ]) => {
 };
 
 const precompile = async () => {
+  if (globalThis._porf_loadParser) await globalThis._porf_loadParser('@babel/parser');
+
   const dir = join(__dirname, 'builtins');
 
   let funcs = [], globals = [];

package/compiler/wrap.js

@@ -128,7 +128,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
 
   if (source.includes?.('export ')) flags.push('module');
 
-  fs.writeFileSync('out.wasm', Buffer.from(wasm));
+  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
   times.push(performance.now() - t1);
   if (Prefs.profileCompiler) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.16.0-97bb4f33b",
+  "version": "0.16.0-a7bc359af",
   "author": "CanadaHonk",
   "license": "MIT",
-  "scripts": {
-    "precompile": "node ./compiler/precompile.js"
-  },
+  "scripts": {},
   "dependencies": {
     "acorn": "^8.11.3",
     "node-repl-polyfill": "^0.1.1"
@@ -28,5 +26,5 @@
   "bugs": {
     "url": "https://github.com/CanadaHonk/porffor/issues"
   },
-  "homepage": "https://porffor.goose.icu"
+  "homepage": "https://porffor.dev"
 }

package/runner/index.js

@@ -1,6 +1,4 @@
 #!/usr/bin/env node
-
-import compile from '../compiler/wrap.js';
 import fs from 'node:fs';
 
 const start = performance.now();
@@ -59,10 +57,15 @@ if (process.argv.includes('--help')) {
 }
 
 let file = process.argv.slice(2).find(x => x[0] !== '-');
-if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
+if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
   // remove this arg
   process.argv.splice(process.argv.indexOf(file), 1);
 
+  if (file === 'precompile') {
+    await import('../compiler/precompile.js');
+    await new Promise(() => {}); // do nothing for the rest of this file
+  }
+
   if (file === 'profile') {
     await import('./profile.js');
     await new Promise(() => {}); // do nothing for the rest of this file
@@ -89,6 +92,8 @@ if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(fi
   }
 }
 
+globalThis.file = file;
+
 if (!file) {
   if (process.argv.includes('-v') || process.argv.includes('--version')) {
     // just print version
@@ -103,6 +108,8 @@ if (!file) {
 
 const source = fs.readFileSync(file, 'utf8');
 
+const compile = (await import('../compiler/wrap.js')).default;
+
 let cache = '';
 const print = str => {
   /* cache += str;