porffor 0.18.2 → 0.18.3

package/README.md

@@ -175,16 +175,15 @@ These include some early (stage 1/0) and/or dead (last commit years ago) proposa
 ### Custom
 
 - Supports i32, i64, and f64 for valtypes
-- Start of a SIMD api (docs needed)
 - Intrinsic functions (see below)
 - Inlining wasm via ``asm`...``\` "macro"
 
 ## Versioning
-Porffor uses a unique versioning system, here's an example: `0.14.0-15cb49f07`. Let's break it down:
+Porffor uses a unique versioning system, here's an example: `0.18.2+2aa3f0589`. Let's break it down:
 1. `0` - major, always `0` as Porffor is not ready yet
-2. `14` - minor, total Test262 pass percentage (floored to nearest int)
-3. `0` - micro, always `0` as unused
-4. `15cb49f07` - commit hash
+2. `18` - minor, total Test262 pass percentage (floored to nearest int)
+3. `2` - micro, build number for that minor (incremented each publish/git push)
+4. `2aa3f0589` - commit hash
 
 ## Performance
 *For the features it supports most of the time*, Porffor is *blazingly fast* compared to most interpreters and common engines running without JIT. For those with JIT, it is usually slower by default, but can catch up with compiler arguments and typed input, even more so when compiling to native binaries.

package/compiler/2c.js

@@ -171,9 +171,6 @@ const removeBrackets = str => {
 };
 
 export default ({ funcs, globals, tags, data, exceptions, pages }) => {
-  // fix declaring order for c
-  funcs.reverse();
-
   const invOperatorOpcode = Object.values(operatorOpcode).reduce((acc, x) => {
     for (const k in x) {
       acc[x[k]] = k;
@@ -201,7 +198,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
   includes.set('stdint.h', true);
 
-  let out = ``;
+  globalThis.out = ``;
 
   for (const x in globals) {
     const g = globals[x];
@@ -231,15 +228,12 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
   if (out) out += '\n';
 
-  let depth = 1;
-  let brDepth = 0;
-  const line = (str, semi = true) => out += `${' '.repeat((depth + brDepth) * 2)}${str}${semi ? ';' : ''}\n`;
+  const line = (str, semi = true) => out += `${str}${semi ? ';' : ''}\n`;
   const lines = lines => {
     for (const x of lines) {
-      out += `${' '.repeat((depth + brDepth) * 2)}${x}\n`;
+      out += x + '\n';
     }
   };
-
   const platformSpecific = (win, unix, add = true) => {
     let tmp = '';
 
@@ -268,11 +262,46 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
   let brId = 0;
 
-  for (const f of funcs) {
-    depth = 1;
-    brDepth = 0;
+  const cified = new Set();
+  const cify = f => {
+    let out = '';
+
+    let depth = 1;
+    let brDepth = 0;
+    const line = (str, semi = true) => out += `${' '.repeat((depth + brDepth) * 2)}${str}${semi ? ';' : ''}\n`;
+    const lines = lines => {
+      for (const x of lines) {
+        out += `${' '.repeat((depth + brDepth) * 2)}${x}\n`;
+      }
+    };
+    const platformSpecific = (win, unix, add = true) => {
+      let tmp = '';
+
+      if (win) {
+        if (add) out += '#ifdef _WIN32\n';
+          else tmp += '#ifdef _WIN32\n';
+
+        if (add) lines(win.split('\n'));
+          else tmp += win + (win.endsWith('\n') ? '' : '\n');
+      }
+
+      if (unix) {
+        if (add) out += (win ? '#else' : '#ifndef _WIN32') + '\n';
+          else tmp += (win ? '#else' : '#ifndef _WIN32') + '\n';
+
+        if (add) lines(unix.split('\n'));
+          else tmp += unix + (unix.endsWith('\n') ? '' : '\n');
+      }
+
+      if (win || unix)
+        if (add) out += '#endif\n';
+          else tmp += '#endif\n';
+
+      return tmp;
+    };
 
     let retTmpId = 0;
+    let tmpId = 0;
 
     const invLocals = inv(f.locals, x => x.idx);
 
@@ -598,6 +627,11 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             break;
           }
 
+          if (!cified.has(func.name) && func.name !== f.name) {
+            cify(func);
+            cified.add(func.name);
+          }
+
           let args = [];
           for (let j = 0; j < func.params.length; j++) args.unshift(removeBrackets(vals.pop()));
 
@@ -663,6 +697,53 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           break;
         }
 
+        case Opcodes.f64_abs: {
+          break;
+        }
+        case Opcodes.f64_neg: {
+          break;
+        }
+
+        case Opcodes.f64_ceil: {
+          break;
+        }
+        case Opcodes.f64_floor: {
+          break;
+        }
+        case Opcodes.f64_trunc: {
+          break;
+        }
+        case Opcodes.f64_nearest: {
+          break;
+        }
+
+        case Opcodes.f64_sqrt: {
+          break;
+        }
+        case Opcodes.f64_min: {
+          const b = vals.pop();
+          const a = vals.pop();
+
+          const id = tmpId++;
+          line(`const f64 _tmp${id}a = ${a}`);
+          line(`const f64 _tmp${id}b = ${b}`);
+          vals.push(`(_tmp${id}a > _tmp${id}b ? _tmp${id}b : _tmp${id}a)`);
+          break;
+        }
+        case Opcodes.f64_max: {
+          const b = vals.pop();
+          const a = vals.pop();
+
+          const id = tmpId++;
+          line(`const f64 _tmp${id}a = ${a}`);
+          line(`const f64 _tmp${id}b = ${b}`);
+          vals.push(`(_tmp${id}a > _tmp${id}b ? _tmp${id}a : _tmp${id}b)`);
+          break;
+        }
+        case Opcodes.f64_copysign: {
+          break;
+        }
+
         default:
           if (CMemFuncs[i[0]]) {
             const name = invOpcodes[i[0]];
@@ -698,9 +779,11 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
     }
 
     out += '}\n\n';
-  }
 
-  depth = 0;
+    globalThis.out = globalThis.out + out;
+  };
+
+  cify(funcs.find(x => x.name === 'main'));
 
   const makeIncludes = includes => [...includes.keys()].map(x => `#include <${x}>\n`).join('');
   out = platformSpecific(makeIncludes(winIncludes), makeIncludes(unixIncludes), false) + '\n' + makeIncludes(includes) + '\n' + alwaysPreface + [...prepend.values()].join('\n') + '\n\n' + out;

package/compiler/codegen.js

@@ -2092,7 +2092,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   if (func && func.hasRestArgument) {
     if (args.length < paramCount) {
       args = args.concat(new Array(paramCount - 1 - args.length).fill(DEFAULT_VALUE));
-    } 
+    }
     const restArgs = args.slice(paramCount - 1);
     args = args.slice(0, paramCount - 1);
     args.push({
@@ -4402,7 +4402,7 @@ const generateFunc = (scope, decl) => {
         defaultValues[name] = x.right;
         break;
       }
-      
+
       case 'RestElement': {
         name = x.argument.name;
         func.hasRestArgument = true;

package/compiler/cyclone.js

@@ -66,6 +66,42 @@ export default wasm => {
     };
 
     switch (opcode) {
+      case Opcodes.if: {
+        if (stack.length < 1) { empty(); break; }
+        const cond = bool(pop());
+
+        // find else split and end
+        let j = i + 1;
+        let depth = 0, elseStart = 0;
+        for (; j < wasm.length; j++) {
+          const op = wasm[j][0];
+          if (op === Opcodes.if || op === Opcodes.block || op === Opcodes.loop || op === Opcodes.try) depth++;
+          if (op === Opcodes.else && depth === 0) elseStart = j;
+          if (op === Opcodes.end) {
+            depth--;
+            if (depth < 0) break;
+          }
+          if (op === Opcodes.br || op === Opcodes.br_if) wasm[j][1] -= 1;
+        }
+
+        if (cond) {
+          // remove else if it exists, or just remove end
+          if (elseStart) wasm.splice(elseStart, j - elseStart + 1);
+            else wasm.splice(j, 1);
+        } else {
+          // remove truthy conseq and keep else if it exists, or just remove entire thing
+          if (elseStart) {
+            wasm.splice(j, 1); // remove end
+            wasm.splice(i + 1, elseStart - i + 1); // remove truthy conseq
+          } else wasm.splice(i + 1, j - i + 0); // no else, remove entire if
+        }
+
+        // remove this if op
+        wasm.splice(i, 1);
+
+        break;
+      }
+
       case Opcodes.i32_const: {
         const n = read_signedLEB128(op.slice(1));
         push(n);

package/compiler/decompile.js

@@ -70,7 +70,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
     } else if (inst[0] === Opcodes.i32_load || inst[0] === Opcodes.i64_load || inst[0] === Opcodes.f64_load || inst[0] === Opcodes.i32_store || inst[0] === Opcodes.i64_store || inst[0] === Opcodes.f64_store || inst[0] === Opcodes.i32_store16 || inst[0] === Opcodes.i32_load16_u) {
       out += ` ${inst[1]} ${read_unsignedLEB128(inst.slice(2))}`;
     } else for (const operand of inst.slice(1)) {
-      if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block) {
+      if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block || inst[0] === Opcodes.try) {
         if (operand === Blocktype.void) continue;
         out += ` ${invValtype[operand]}`;
       } else {
@@ -80,7 +80,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
 
     if (comments.length > 0) out += ` ;; ${comments.join(' ')}`;
 
-    if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block || inst[0] === Opcodes.else) {
+    if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block || inst[0] === Opcodes.else || inst[0] === Opcodes.try || inst[0] === Opcodes.catch_all) {
       out += ` ;; label @${depth}`;
     }
 

package/compiler/index.js

@@ -89,6 +89,7 @@ export default (code, flags) => {
 
         console.log(`${x.name}: ${preOps} -> ${x.wasm.length} ops`);
       }
+      opt(funcs, globals, pages, tags, exceptions);
 
       console.log(`cyclone total time: ${(performance.now() - t).toFixed(2)}ms`);
 

package/compiler/opt.js

@@ -114,8 +114,6 @@ export default (funcs, globals, pages, tags, exceptions) => {
     while (runs > 0) {
       runs--;
 
-      let depth = [];
-
       let getCount = {}, setCount = {};
       for (const x in f.locals) {
         getCount[f.locals[x].idx] = 0;
@@ -128,9 +126,6 @@ export default (funcs, globals, pages, tags, exceptions) => {
         inst = [ ...inst ];
         wasm[i] = inst;
 
-        if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block) depth.push(inst[0]);
-        if (inst[0] === Opcodes.end) depth.pop();
-
         if (inst[0] === Opcodes.local_get) getCount[inst[1]]++;
         if (inst[0] === Opcodes.local_set || inst[0] === Opcodes.local_tee) setCount[inst[1]]++;
 

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.18.2+2aa3f0589",
+  "version": "0.18.3+945765df9",
   "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.18.2+2aa3f0589';
+globalThis.version = '0.18.3+945765df9';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {