porffor 0.17.0-f43ba190c → 0.18.3

package/README.md

@@ -148,41 +148,42 @@ These include some early (stage 1/0) and/or dead (last commit years ago) proposa
 - Array constructor (`Array(5)`, `new Array(1, 2, 3)`)
 - Labelled statements (`foo: while (...)`)
 - `do...while` loops
+- Optional parameters (`(foo = 'bar') => { ... }`)
 
 ### Built-ins
 
 - `NaN` and `Infinity`
 - `isNaN()` and `isFinite()`
 - Most of `Number` (`MAX_VALUE`, `MIN_VALUE`, `MAX_SAFE_INTEGER`, `MIN_SAFE_INTEGER`, `POSITIVE_INFINITY`, `NEGATIVE_INFINITY`, `EPSILON`, `NaN`, `isNaN`, `isFinite`, `isInteger`, `isSafeInteger`)
-- Some `Math` funcs (`sqrt`, `abs`, `floor`, `sign`, `round`, `trunc`, `clz32`, `fround`, `random`)
+- Most `Math` funcs (`sqrt`, `abs`, `floor`, `sign`, `round`, `trunc`, `clz32`, `fround`, `random`, `exp`, `log`, `log2`, `log10`, `pow`, `expm1`, `log1p`, `sqrt`, `cbrt`, `hypot`, `sin`, `cos`, `tan`, `sinh`, `cosh`, `tanh`, `asinh`, `acosh`, `atanh`, `asin`, `acos`, `atan`, `atan2`)
 - Basic `globalThis` support
 - Basic `Boolean` and `Number`
 - Basic `eval` for literals
 - `Math.random()` using self-made xorshift128+ PRNG
 - Some of `performance` (`now()`, `timeOrigin`)
-- Some of `Array.prototype` (`at`, `push`, `pop`, `shift`, `fill`, `slice`, `indexOf`, `lastIndexOf`, `includes`, `with`, `reverse`, `toReversed`)
-- Some of `Array` (`of`, `isArray`)
-- Most of `String.prototype` (`at`, `charAt`, `charCodeAt`, `toUpperCase`, `toLowerCase`, `startsWith`, `endsWith`, `indexOf`, `lastIndexOf`, `includes`, `padStart`, `padEnd`, `substring`, `substr`, `slice`, `trimStart`, `trimEnd`, `trim`, `toString`, `big`, `blink`, `bold`, `fixed`, `italics`, `small`, `strike`, `sub`, `sup`,  `trimLeft`, `trimRight`, )
+- Most of `Array.prototype` (`at`, `push`, `pop`, `shift`, `fill`, `slice`, `indexOf`, `lastIndexOf`, `includes`, `with`, `reverse`, `toReversed`, `forEach`, `filter`, `map`, `find`, `findLast`, `findIndex`, `findLastIndex`, `every`, `some`, `reduce`, `reduceRight`, `join`, `toString`)
+- Most of `Array` (`of`, `isArray`)
+- Most of `String.prototype` (`at`, `charAt`, `charCodeAt`, `toUpperCase`, `toLowerCase`, `startsWith`, `endsWith`, `indexOf`, `lastIndexOf`, `includes`, `padStart`, `padEnd`, `substring`, `substr`, `slice`, `trimStart`, `trimEnd`, `trim`, `toString`, `big`, `blink`, `bold`, `fixed`, `italics`, `small`, `strike`, `sub`, `sup`,  `trimLeft`, `trimRight`, `trim`)
 - Some of `crypto` (`randomUUID`)
 - `escape`
 - `btoa`
 - Most of `Number.prototype` (`toString`, `toFixed`, `toExponential`)
 - `parseInt`
 - Spec-compliant `Date`
+- WIP typed arrays (`Uint8Array`, `Int32Array`, etc)
 
 ### 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,12 +779,14 @@ _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;
 
-  return out.trim();
+  return `// generated by porffor ${globalThis.version ?? '0.17.0'}\n` + out.trim();
 };

package/compiler/assemble.js

@@ -82,7 +82,17 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
             params.push(valtypeBinary, Valtype.i32);
           }
 
-          const returns = [ valtypeBinary, Valtype.i32 ];
+          if (inst.at(-1) === 'constr') {
+            inst.pop();
+            params.unshift(Valtype.i32);
+          }
+
+          let returns = [ valtypeBinary, Valtype.i32 ];
+          if (inst.at(-1) === 'no_type_return') {
+            inst.pop();
+            returns = [ valtypeBinary ];
+          }
+
           inst[1] = getType(params, returns);
         }
       }
@@ -116,16 +126,21 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     ] ])
   );
 
-  if (pages.has('func argc lut') && !data.addedFuncArgcLut) {
-    // generate func argc lut data
+  if (pages.has('func lut') && !data.addedFuncArgcLut) {
+    // generate func lut data
     const bytes = [];
     for (let i = 0; i < funcs.length; i++) {
       const argc = Math.floor(funcs[i].params.length / 2);
       bytes.push(argc % 256, (argc / 256 | 0) % 256);
+
+      let flags = 0b00000000; // 8 flag bits
+      if (funcs[i].returnType != null) flags |= 0b1;
+      if (funcs[i].constr) flags |= 0b10;
+      bytes.push(flags);
     }
 
     data.push({
-      offset: pages.get('func argc lut').ind * pageSize,
+      offset: pages.get('func lut').ind * pageSize,
       bytes
     });
     data.addedFuncArgcLut = true;

package/compiler/builtins/array.ts

@@ -4,6 +4,7 @@ export const __Array_isArray = (x: unknown): boolean =>
   // Porffor.wasm`local.get ${x+1}` == Porffor.TYPES.array;
   Porffor.rawType(x) == Porffor.TYPES.array;
 
+
 export const __Array_prototype_slice = (_this: any[], start: number, end: number) => {
   const len: i32 = _this.length;
   if (Porffor.rawType(end) == Porffor.TYPES.undefined) end = len;
@@ -22,7 +23,7 @@ export const __Array_prototype_slice = (_this: any[], start: number, end: number
   }
   if (end > len) end = len;
 
-  let out: any[] = [];
+  let out: any[] = Porffor.allocate();
 
   if (start > end) return out;
 
@@ -42,10 +43,38 @@ export const __Array_prototype_slice = (_this: any[], start: number, end: number
   }
 
   out.length = end - start;
-
   return out;
 };
 
+// @porf-typed-array
+export const __Array_prototype_fill = (_this: any[], value: any, start: any, end: any) => {
+  const len: i32 = _this.length;
+
+  if (Porffor.rawType(start) == Porffor.TYPES.undefined) start = 0;
+  if (Porffor.rawType(end) == Porffor.TYPES.undefined) end = len;
+
+  start |= 0;
+  end |= 0;
+
+  if (start < 0) {
+    start = len + start;
+    if (start < 0) start = 0;
+  }
+  if (start > len) start = len;
+  if (end < 0) {
+    end = len + end;
+    if (end < 0) end = 0;
+  }
+  if (end > len) end = len;
+
+  for (let i: i32 = start; i < end; i++) {
+    _this[i] = value;
+  }
+
+  return _this;
+};
+
+// @porf-typed-array
 export const __Array_prototype_indexOf = (_this: any[], searchElement: any, position: number) => {
   const len: i32 = _this.length;
   if (position > 0) {
@@ -60,6 +89,7 @@ export const __Array_prototype_indexOf = (_this: any[], searchElement: any, posi
   return -1;
 };
 
+// @porf-typed-array
 export const __Array_prototype_lastIndexOf = (_this: any[], searchElement: any, position: number) => {
   const len: i32 = _this.length;
   if (position > 0) {
@@ -74,6 +104,7 @@ export const __Array_prototype_lastIndexOf = (_this: any[], searchElement: any,
   return -1;
 };
 
+// @porf-typed-array
 export const __Array_prototype_includes = (_this: any[], searchElement: any, position: number) => {
   const len: i32 = _this.length;
   if (position > 0) {
@@ -88,6 +119,7 @@ export const __Array_prototype_includes = (_this: any[], searchElement: any, pos
   return false;
 };
 
+// @porf-typed-array
 export const __Array_prototype_with = (_this: any[], index: number, value: any) => {
   const len: i32 = _this.length;
   if (index < 0) {
@@ -101,8 +133,7 @@ export const __Array_prototype_with = (_this: any[], index: number, value: any)
     throw new RangeError('Invalid index');
   }
 
-  // todo: allocator is bad here?
-  let out: any[] = [];
+  let out: any[] = Porffor.allocate();
 
   Porffor.clone(_this, out);
 
@@ -111,6 +142,7 @@ export const __Array_prototype_with = (_this: any[], index: number, value: any)
   return out;
 };
 
+// @porf-typed-array
 export const __Array_prototype_reverse = (_this: any[]) => {
   const len: i32 = _this.length;
 
@@ -126,14 +158,14 @@ export const __Array_prototype_reverse = (_this: any[]) => {
   return _this;
 };
 
-// todo: this has memory/allocation bugs so sometimes crashes :(
+// @porf-typed-array
 export const __Array_prototype_toReversed = (_this: any[]) => {
   const len: i32 = _this.length;
 
   let start: i32 = 0;
   let end: i32 = len - 1;
 
-  let out: any[] = [];
+  let out: any[] = Porffor.allocate();
   out.length = len;
 
   while (start < end) {
@@ -144,11 +176,13 @@ export const __Array_prototype_toReversed = (_this: any[]) => {
   return out;
 };
 
+// @porf-typed-array
 export const __Array_prototype_valueOf = (_this: any[]) => {
   return _this;
 };
 
 
+// @porf-typed-array
 export const __Array_prototype_forEach = (_this: any[], callbackFn: any) => {
   const len: i32 = _this.length;
   let i: i32 = 0;
@@ -157,22 +191,26 @@ export const __Array_prototype_forEach = (_this: any[], callbackFn: any) => {
   }
 };
 
+// @porf-typed-array
 export const __Array_prototype_filter = (_this: any[], callbackFn: any) => {
-  const out: any[] = [];
+  const out: any[] = Porffor.allocate();
 
   const len: i32 = _this.length;
   let i: i32 = 0;
+  let j: i32 = 0;
   while (i < len) {
     const el: any = _this[i];
-    if (Boolean(callbackFn(el, i++, _this))) out.push(el);
+    if (Boolean(callbackFn(el, i++, _this))) out[j++] = el;
   }
 
+  out.length = j;
   return out;
 };
 
+// @porf-typed-array
 export const __Array_prototype_map = (_this: any[], callbackFn: any) => {
   const len: i32 = _this.length;
-  const out: any[] = [];
+  const out: any[] = Porffor.allocate();
   out.length = len;
 
   let i: i32 = 0;
@@ -183,6 +221,7 @@ export const __Array_prototype_map = (_this: any[], callbackFn: any) => {
   return out;
 };
 
+// @porf-typed-array
 export const __Array_prototype_find = (_this: any[], callbackFn: any) => {
   const len: i32 = _this.length;
   let i: i32 = 0;
@@ -192,6 +231,7 @@ export const __Array_prototype_find = (_this: any[], callbackFn: any) => {
   }
 };
 
+// @porf-typed-array
 export const __Array_prototype_findLast = (_this: any[], callbackFn: any) => {
   let i: i32 = _this.length;
   while (i > 0) {
@@ -200,6 +240,7 @@ export const __Array_prototype_findLast = (_this: any[], callbackFn: any) => {
   }
 };
 
+// @porf-typed-array
 export const __Array_prototype_findIndex = (_this: any[], callbackFn: any) => {
   const len: i32 = _this.length;
   let i: i32 = 0;
@@ -208,6 +249,7 @@ export const __Array_prototype_findIndex = (_this: any[], callbackFn: any) => {
   }
 };
 
+// @porf-typed-array
 export const __Array_prototype_findLastIndex = (_this: any[], callbackFn: any) => {
   let i: i32 = _this.length;
   while (i > 0) {
@@ -215,6 +257,7 @@ export const __Array_prototype_findLastIndex = (_this: any[], callbackFn: any) =
   }
 };
 
+// @porf-typed-array
 export const __Array_prototype_every = (_this: any[], callbackFn: any) => {
   const len: i32 = _this.length;
   let i: i32 = 0;
@@ -225,6 +268,7 @@ export const __Array_prototype_every = (_this: any[], callbackFn: any) => {
   return true;
 };
 
+// @porf-typed-array
 export const __Array_prototype_some = (_this: any[], callbackFn: any) => {
   const len: i32 = _this.length;
   let i: i32 = 0;
@@ -235,6 +279,7 @@ export const __Array_prototype_some = (_this: any[], callbackFn: any) => {
   return false;
 };
 
+// @porf-typed-array
 export const __Array_prototype_reduce = (_this: any[], callbackFn: any, initialValue: any) => {
   let acc: any = initialValue ?? _this[0];
 
@@ -247,6 +292,7 @@ export const __Array_prototype_reduce = (_this: any[], callbackFn: any, initialV
   return acc;
 };
 
+// @porf-typed-array
 export const __Array_prototype_reduceRight = (_this: any[], callbackFn: any, initialValue: any) => {
   const len: i32 = _this.length;
   let acc: any = initialValue ?? _this[len - 1];
@@ -259,6 +305,52 @@ export const __Array_prototype_reduceRight = (_this: any[], callbackFn: any, ini
   return acc;
 };
 
+// @porf-typed-array
+export const __Array_prototype_sort = (_this: any[], callbackFn: any) => {
+  // todo: default callbackFn
+
+  // insertion sort, i guess
+  const len: i32 = _this.length;
+  for (let i: i32 = 0; i < len; i++) {
+    const x: any = _this[i];
+    let j: i32 = i;
+    while (j > 0) {
+      const y: any = _this[j - 1];
+
+      // 23.1.3.30.2 CompareArrayElements (x, y, comparefn)
+      // https://tc39.es/ecma262/#sec-comparearrayelements
+      const xt: i32 = Porffor.rawType(x);
+      const yt: i32 = Porffor.rawType(y);
+      let v: number;
+
+      // 1. If x and y are both undefined, return +0𝔽.
+      if (xt == Porffor.TYPES.undefined && yt == Porffor.TYPES.undefined) v = 0;
+        // 2. If x is undefined, return 1𝔽.
+        else if (xt == Porffor.TYPES.undefined) v = 1;
+        // 3. If y is undefined, return -1𝔽.
+        else if (yt == Porffor.TYPES.undefined) v = -1;
+        else {
+          // 4. If comparefn is not undefined, then
+          // a. Let v be ? ToNumber(? Call(comparefn, undefined, « x, y »)).
+          v = callbackFn(x, y);
+
+          // b. If v is NaN, return +0𝔽.
+          // if (Number.isNaN(v)) v = 0;
+
+          // c. Return v.
+        }
+
+      if (v >= 0) break;
+      _this[j--] = y;
+    }
+
+    _this[j] = x;
+  }
+
+  return _this;
+};
+
+// @porf-typed-array
 export const __Array_prototype_toString = (_this: any[]) => {
   // todo: this is bytestring only!
 
@@ -283,6 +375,7 @@ export const __Array_prototype_toString = (_this: any[]) => {
   return out;
 };
 
+// @porf-typed-array
 export const __Array_prototype_join = (_this: any[], _separator: any) => {
   // todo: this is bytestring only!
   // todo/perf: optimize single char separators