porffor 0.25.2 → 0.25.3

package/compiler/codegen.js

@@ -845,6 +845,11 @@ const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
     ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
 
     ...typeSwitch(scope, type, {
+      [TYPES.empty]: [
+        // empty
+        ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+        ...number(1, intOut ? Valtype.i32 : valtypeBinary)
+      ],
       [TYPES.undefined]: [
         // undefined
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),

package/compiler/decompile.js

@@ -11,17 +11,26 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
   const invLocals = inv(locals, x => x.idx);
   const invGlobals = inv(globals, x => x.idx);
 
-  const makeSignature = (params, returns) => `(${params.map(x => invValtype[x]).join(', ')}) -> (${returns.map(x => invValtype[x]).join(', ')})`;
+  const makeSignature = (params, returns, locals) => {
+    if (locals) {
+      const localNames = inv(locals, x => x.idx);
+      return `(${params.map((x, i) => `${localNames[i]}(${i}): ${invValtype[x]}`).join(', ')}) -> (${returns.map(x => invValtype[x]).join(', ')})`;
+    }
+
+    return `(${params.map((x, i) => invValtype[x]).join(', ')}) -> (${returns.map(x => invValtype[x]).join(', ')})`;
+  }
 
-  let out = '', depth = name ? 1 : 0;
-  if (name) out += `${makeSignature(params, returns)} ;; $${name} (${ind})\n`;
+  let out = '', depth = 0;
+  if (name) out += `${name}(${ind}) ${makeSignature(params, returns, locals)}\n`;
 
   const justLocals = Object.values(locals).sort((a, b) => a.idx - b.idx).slice(params.length);
-  if (name && justLocals.length > 0) out += `  local ${justLocals.map(x => invValtype[x.type]).join(' ')}\n`;
+  for (const x of justLocals) {
+    out += `;; local ${invLocals[x.idx]}(${x.idx}): ${invValtype[x.type]}\n`
+  }
 
   let i = -1, lastInst;
   let byte = 0;
-  for (let inst of wasm.concat(name ? [ [ Opcodes.end ] ] : [])) {
+  for (let inst of wasm) {
     i++;
     if (inst[0] === null) continue;
 
@@ -102,6 +111,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
       const name = invLocals[inst[1]];
       const type = invValtype[locals[name]?.type];
       if (name) out += ` ;; $${name}${type !== valtype ? ` (${type})` : ''}`;
+        else out += ` ;; unknown local`
     }
 
     if (inst[0] === Opcodes.global_get || inst[0] === Opcodes.global_set) {
@@ -130,4 +140,4 @@ export const highlightAsm = asm => asm
   .replace(/(block|loop|if|end|else|try|catch_all|catch|delegate)/g, _ => `\x1B[95m${_}\x1B[0m`)
   .replace(/unreachable/g, _ => `\x1B[91m${_}\x1B[0m`)
   .replace(/ \-?[0-9\.]+/g, _ => ` \x1B[33m${_.slice(1)}\x1B[0m`)
-  .replace(/ ;;.*$/gm, _ => `\x1B[90m${_.replaceAll(/\x1B\[[0-9]+m/g, '')}\x1B[0m`);
+  .replace(/;;.*$/gm, _ => `\x1B[90m${_.replaceAll(/\x1B\[[0-9]+m/g, '')}\x1B[0m`);

package/compiler/wrap.js

@@ -280,10 +280,6 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
   const printDecomp = (middleIndex, func, funcs, globals, exceptions) => {
     console.log(`\x1B[35m\x1B[1mporffor backtrace\u001b[0m`);
 
-    const strParams = func.params.map(v => invValtype[v]);
-    const strReturns = func.returns.map(v => invValtype[v]);
-    console.log(`\x1B[1m${func.name}\x1B[0m \x1B[90m(${strParams.join(', ')}) -> (${strReturns.join(', ')})\x1B[0m`);
-
     const surrounding = Prefs.backtraceSurrounding ?? 5;
     let min = middleIndex - surrounding;
     let max = middleIndex + surrounding + 1;
@@ -292,7 +288,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
       max = func.wasm.length;
     }
 
-    const decomp = decompile(func.wasm.slice(min, max), '', 0, func.locals, func.params, func.returns, funcs, globals, exceptions).slice(0, -1).split('\n');
+    const decomp = decompile(func.wasm.slice(min, max), func.name, 0, func.locals, func.params, func.returns, funcs, globals, exceptions).slice(0, -1).split('\n');
 
     const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
     let longest = 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.25.2+bd0735a02",
+  "version": "0.25.3+8f4d9af84",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.25.2+bd0735a02';
+globalThis.version = '0.25.3+8f4d9af84';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
@@ -108,7 +108,33 @@ if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm
 
 globalThis.file = file;
 
-if (!file) {
+let source = '', printOutput = false;
+if (process.argv.length >= 4) {
+  let evalIndex = process.argv.indexOf('-e');
+  if (evalIndex === -1) evalIndex = process.argv.indexOf('--eval');
+  if (evalIndex !== -1) {
+    source = process.argv[evalIndex + 1];
+    if (source) {
+      if (source.startsWith('"') || source.startsWith("'")) source = source.slice(1, -1);
+      process.argv.splice(evalIndex, 2); // remove flag and value
+    }
+  }
+
+  let printIndex = process.argv.indexOf('-p');
+  if (printIndex === -1) printIndex = process.argv.indexOf('--print');
+  if (printIndex !== -1) {
+    process.argv.push('--no-opt-unused');
+    source = process.argv[printIndex + 1];
+    if (source) {
+      if (source.startsWith('"') || source.startsWith("'")) source = source.slice(1, -1);
+      process.argv.splice(printIndex, 2); // remove flag and value
+    }
+
+    printOutput = true;
+  }
+}
+
+if (!file && !source) {
   if (process.argv.includes('-v') || process.argv.includes('--version')) {
     // just print version
     console.log(globalThis.version);
@@ -120,7 +146,7 @@ if (!file) {
   await done();
 }
 
-const source = fs.readFileSync(file, 'utf8');
+source ||= fs.readFileSync(file, 'utf8');
 
 const compile = (await import('../compiler/wrap.js')).default;
 
@@ -137,19 +163,20 @@ const print = str => {
 };
 
 let runStart;
+let ret;
 try {
   if (process.argv.includes('-b')) {
     const { wasm, exports } = compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
     runStart = performance.now();
-    if (!process.argv.includes('--no-run')) exports.main();
+    if (!process.argv.includes('--no-run')) ret = exports.main();
 
     console.log(`\n\nwasm size: ${wasm.byteLength} bytes`);
   } else {
     const { exports } = compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
     runStart = performance.now();
-    if (!process.argv.includes('--no-run')) exports.main();
+    if (!process.argv.includes('--no-run')) ret = exports.main();
   }
   // if (cache) process.stdout.write(cache);
 } catch (e) {
@@ -159,4 +186,12 @@ try {
   console.error(out);
 }
 
-if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms\nexecution time: ${(performance.now() - runStart).toFixed(2)}ms`);
+if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms\nexecution time: ${(performance.now() - runStart).toFixed(2)}ms`);
+
+if (printOutput) {
+  if (process.argv.includes('-d') && ret?.type != null) {
+    ret = ret.js;
+  }
+
+  console.log(ret);
+}