porffor 0.14.0-f67c123a1 → 0.16.0-08983b6b1

package/compiler/allocators.js

@@ -0,0 +1,128 @@
+import { Opcodes, PageSize, Valtype } from './wasmSpec.js';
+import { number } from './embedding.js';
+import Prefs from './prefs.js';
+
+// we currently have 3 allocators:
+// - static (default): a static/compile-time allocator. fast (no grow/run-time alloc needed) but can break some code
+// - grow: perform a memory.grow every allocation. simple but maybe slow?
+// - chunk: perform large memory.grow's in chunks when needed. needs investigation
+
+export default name => {
+  switch (name) {
+    case 'static': return new StaticAllocator();
+    case 'grow': return new GrowAllocator();
+    case 'chunk': return new ChunkAllocator();
+    default: throw new Error(`unknown allocator: ${name}`);
+  }
+};
+
+export class StaticAllocator {
+  constructor() {
+  }
+
+  allocType(itemType) {
+    switch (itemType) {
+      case 'i8': return 'bytestring';
+      case 'i16': return 'string';
+
+      default: return 'array';
+    }
+  }
+
+  ptr(ind) {
+    if (ind === 0) return 4;
+    return ind * PageSize;
+  }
+
+  alloc({ scope, pages }, name, { itemType }) {
+    const reason = `${this.allocType(itemType)}: ${Prefs.scopedPageNames ? (scope.name + '/') : ''}${name}`;
+
+    if (pages.has(reason)) return number(this.ptr(pages.get(reason).ind), Valtype.i32);
+
+    if (reason.startsWith('array:')) pages.hasArray = true;
+    if (reason.startsWith('string:')) pages.hasString = true;
+    if (reason.startsWith('bytestring:')) pages.hasByteString = true;
+    if (reason.includes('string:')) pages.hasAnyString = true;
+
+    let ind = pages.size;
+    pages.set(reason, { ind, type: itemType });
+
+    scope.pages ??= new Map();
+    scope.pages.set(reason, { ind, type: itemType });
+
+    return number(this.ptr(ind), Valtype.i32);
+  }
+}
+
+export class GrowAllocator {
+  constructor() {
+    Prefs.rmUnusedTypes = false;
+  }
+
+  alloc() {
+    return [
+      // grow by 1 page
+      [ Opcodes.i32_const, 1 ],
+      [ Opcodes.memory_grow, 0 ], // returns old page count
+
+      // get ptr (page count * page size)
+      number(65536, Valtype.i32)[0],
+      [ Opcodes.i32_mul ]
+    ];
+  }
+}
+
+export class ChunkAllocator {
+  constructor(chunkSize) {
+    Prefs.rmUnusedTypes = false;
+
+    // 64KiB * chunk size each growth
+    // 16: 1MiB chunks
+    this.chunkSize = chunkSize ?? Prefs.chunkAllocatorSize ?? 16;
+  }
+
+  alloc({ asmFunc, funcIndex }) {
+    const func = funcIndex['#chunkallocator_alloc'] ?? asmFunc('#chunkallocator_alloc', {
+      wasm: [
+        [ Opcodes.global_get, 0 ],
+        [ Opcodes.global_get, 1 ],
+        [ Opcodes.i32_ge_s ],
+        [ Opcodes.if, Valtype.i32 ], // ptr >= next
+          // grow by chunk size pages
+          [ Opcodes.i32_const, this.chunkSize ],
+          [ Opcodes.memory_grow, 0 ],
+
+          // ptr = prev memory size * PageSize
+          number(65536, Valtype.i32)[0],
+          [ Opcodes.i32_mul ],
+          [ Opcodes.global_set, 0 ],
+
+          // next = ptr + ((chunkSize - 1) * PageSize)
+          [ Opcodes.global_get, 0 ],
+          number(65536 * (this.chunkSize - 1), Valtype.i32)[0],
+          [ Opcodes.i32_add ],
+          [ Opcodes.global_set, 1 ],
+
+          // return ptr
+          [ Opcodes.global_get, 0 ],
+        [ Opcodes.else ],
+          // return ptr = ptr + PageSize
+          [ Opcodes.global_get, 0 ],
+          number(65536, Valtype.i32)[0],
+          [ Opcodes.i32_add ],
+          [ Opcodes.global_set, 0 ],
+          [ Opcodes.global_get, 0 ],
+        [ Opcodes.end ],
+      ],
+      params: [],
+      locals: [],
+      globals: [ Valtype.i32, Valtype.i32 ],
+      globalNames: ['#chunkallocator_ptr', '#chunkallocator_next'],
+      returns: [ Valtype.i32 ],
+    }).index;
+
+    return [
+      [ Opcodes.call, func ]
+    ];
+  }
+}

package/compiler/assemble.js

@@ -21,7 +21,7 @@ const chHint = (topTier, baselineTier, strategy) => {
   return (strategy | (baselineTier << 2) | (topTier << 4));
 };
 
-export default (funcs, globals, tags, pages, data, flags) => {
+export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) => {
   const types = [], typeCache = {};
 
   const optLevel = parseInt(process.argv.find(x => x.startsWith('-O'))?.[2] ?? 1);
@@ -44,7 +44,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   let importFuncs = [];
 
-  if (optLevel < 1 || !Prefs.treeshakeWasmImports) {
+  if (optLevel < 1 || !Prefs.treeshakeWasmImports || noTreeshake) {
     importFuncs = importedFuncs;
   } else {
     let imports = new Map();
@@ -65,6 +65,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
     importFuncs = [...imports.values()];
 
     // fix call indexes for non-imports
+    // also fix call_indirect types
     const delta = importedFuncs.length - importFuncs.length;
     for (const f of funcs) {
       f.originalIndex = f.index;
@@ -74,6 +75,16 @@ export default (funcs, globals, tags, pages, data, flags) => {
         if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
           inst[1] -= delta;
         }
+
+        if (inst[0] === Opcodes.call_indirect) {
+          const params = [];
+          for (let i = 0; i < inst[1]; i++) {
+            params.push(valtypeBinary, Valtype.i32);
+          }
+
+          const returns = [ valtypeBinary, Valtype.i32 ];
+          inst[1] = getType(params, returns);
+        }
       }
     }
   }
@@ -83,7 +94,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   const importSection = importFuncs.length === 0 ? [] : createSection(
     Section.import,
-    encodeVector(importFuncs.map(x => [ 0, ...encodeString(x.import), ExportDesc.func, getType(new Array(x.params).fill(x.name.startsWith('profile') ? Valtype.i32 : valtypeBinary), new Array(x.returns).fill(valtypeBinary)) ]))
+    encodeVector(importFuncs.map(x => [ 0, ...encodeString(x.import), ExportDesc.func, getType(typeof x.params === 'object' ? x.params : new Array(x.params).fill(valtypeBinary), new Array(x.returns).fill(valtypeBinary)) ]))
   );
 
   const funcSection = createSection(
@@ -101,10 +112,25 @@ export default (funcs, globals, tags, pages, data, flags) => {
     encodeVector([ [
       0x00,
       Opcodes.i32_const, 0, Opcodes.end,
-      encodeVector(funcs.map(x => x.index))
+      ...encodeVector(funcs.map(x => x.index))
     ] ])
   );
 
+  if (pages.has('func argc lut') && !data.addedFuncArgcLut) {
+    // generate func argc 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);
+    }
+
+    data.push({
+      offset: pages.get('func argc lut').ind * pageSize,
+      bytes
+    });
+    data.addedFuncArgcLut = true;
+  }
+
   // const t0 = performance.now();
 
   // specially optimized assembly for globals as this version is much (>5x) faster than traditional createSection()
@@ -214,7 +240,13 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   const dataSection = data.length === 0 ? [] : createSection(
     Section.data,
-    encodeVector(data.map(x => [ 0x00, Opcodes.i32_const, ...signedLEB128(x.offset), Opcodes.end, ...encodeVector(x.bytes) ]))
+    encodeVector(data.map(x => {
+      // type: active
+      if (x.offset != null) return [ 0x00, Opcodes.i32_const, ...signedLEB128(x.offset), Opcodes.end, ...encodeVector(x.bytes) ];
+
+      // type: passive
+      return [ 0x01, ...encodeVector(x.bytes) ];
+    }))
   );
 
   const dataCountSection = data.length === 0 ? [] : createSection(

package/compiler/builtins/annexb_string.ts

@@ -1,4 +1,5 @@
 // @porf --valtype=i32
+import type {} from './porffor.d.ts';
 
 export const __String_prototype_trimLeft = (_this: string) => {
   return __String_prototype_trimStart(_this);

package/compiler/builtins/array.ts

@@ -1,3 +1,5 @@
+import type {} from './porffor.d.ts';
+
 export const __Array_isArray = (x: unknown): boolean =>
   // Porffor.wasm`local.get ${x+1}` == Porffor.TYPES.array;
   Porffor.rawType(x) == Porffor.TYPES.array;
@@ -27,14 +29,16 @@ export const __Array_prototype_slice = (_this: any[], start: number, end: number
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
 
-  const thisPtrEnd: i32 = thisPtr + end * 8;
+  const thisPtrEnd: i32 = thisPtr + end * 9;
 
-  thisPtr += start * 8;
+  thisPtr += start * 9;
 
   while (thisPtr < thisPtrEnd) {
     Porffor.wasm.f64.store(outPtr, Porffor.wasm.f64.load(thisPtr, 0, 4), 0, 4);
-    thisPtr += 8;
-    outPtr += 8;
+    Porffor.wasm.i32.store8(outPtr + 8, Porffor.wasm.i32.load8_u(thisPtr + 8, 0, 4), 0, 4);
+
+    thisPtr += 9;
+    outPtr += 9;
   }
 
   out.length = end - start;
@@ -50,7 +54,7 @@ export const __Array_prototype_indexOf = (_this: any[], searchElement: any, posi
   } else position = 0;
 
   for (let i: i32 = position; i < len; i++) {
-    if (_this[i] == searchElement) return i;
+    if (_this[i] === searchElement) return i;
   }
 
   return -1;
@@ -64,7 +68,7 @@ export const __Array_prototype_lastIndexOf = (_this: any[], searchElement: any,
   } else position = 0;
 
   for (let i: i32 = len - 1; i >= position; i--) {
-    if (_this[i] == searchElement) return i;
+    if (_this[i] === searchElement) return i;
   }
 
   return -1;
@@ -78,7 +82,7 @@ export const __Array_prototype_includes = (_this: any[], searchElement: any, pos
   } else position = 0;
 
   for (let i: i32 = position; i < len; i++) {
-    if (_this[i] == searchElement) return true;
+    if (_this[i] === searchElement) return true;
   }
 
   return false;
@@ -142,4 +146,147 @@ export const __Array_prototype_toReversed = (_this: any[]) => {
 
 export const __Array_prototype_valueOf = (_this: any[]) => {
   return _this;
+};
+
+
+export const __Array_prototype_forEach = (_this: any[], callbackFn: any) => {
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    callbackFn(_this[i], i++, _this);
+  }
+};
+
+export const __Array_prototype_filter = (_this: any[], callbackFn: any) => {
+  const out: any[] = [];
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    const el: any = _this[i];
+    if (Boolean(callbackFn(el, i++, _this))) out.push(el);
+  }
+
+  return out;
+};
+
+export const __Array_prototype_map = (_this: any[], callbackFn: any) => {
+  const len: i32 = _this.length;
+  const out: any[] = [];
+  out.length = len;
+
+  let i: i32 = 0;
+  while (i < len) {
+    out[i] = callbackFn(_this[i], i++, _this);
+  }
+
+  return out;
+};
+
+export const __Array_prototype_find = (_this: any[], callbackFn: any) => {
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    const el: any = _this[i];
+    if (Boolean(callbackFn(el, i++, _this))) return el;
+  }
+};
+
+export const __Array_prototype_findLast = (_this: any[], callbackFn: any) => {
+  let i: i32 = _this.length;
+  while (i > 0) {
+    const el: any = _this[--i];
+    if (Boolean(callbackFn(el, i, _this))) return el;
+  }
+};
+
+export const __Array_prototype_findIndex = (_this: any[], callbackFn: any) => {
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (Boolean(callbackFn(_this[i], i++, _this))) return i;
+  }
+};
+
+export const __Array_prototype_findLastIndex = (_this: any[], callbackFn: any) => {
+  let i: i32 = _this.length;
+  while (i > 0) {
+    if (Boolean(callbackFn(_this[--i], i, _this))) return i;
+  }
+};
+
+export const __Array_prototype_every = (_this: any[], callbackFn: any) => {
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (!Boolean(callbackFn(_this[i], i++, _this))) return false;
+  }
+
+  return true;
+};
+
+export const __Array_prototype_reduce = (_this: any[], callbackFn: any, initialValue: any) => {
+  let acc: any = initialValue ?? _this[0];
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    acc = callbackFn(acc, _this[i], i++, _this);
+  }
+
+  return acc;
+};
+
+export const __Array_prototype_toString = (_this: any[]) => {
+  // todo: this is bytestring only!
+
+  let out: bytestring = '';
+  out.length = 0;
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (i > 0) Porffor.bytestring.appendChar(out, 44);
+
+    const element: any = _this[i++];
+    const type: i32 = Porffor.rawType(element);
+    if (element != 0 || Porffor.fastAnd(
+      type != Porffor.TYPES.undefined, // undefined
+      type != Porffor.TYPES.object // null
+    )) {
+      Porffor.bytestring.appendStr(out, ecma262.ToString(element));
+    }
+  }
+
+  return out;
+};
+
+export const __Array_prototype_join = (_this: any[], _separator: any) => {
+  // todo: this is bytestring only!
+  // todo/perf: optimize single char separators
+  // todo/perf: optimize default separator (?)
+
+  let separator: bytestring = ',';
+  if (Porffor.rawType(_separator) != Porffor.TYPES.undefined)
+    separator = ecma262.ToString(_separator);
+
+  let out: bytestring = '';
+  out.length = 0;
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (i > 0) Porffor.bytestring.appendStr(out, separator);
+
+    const element: any = _this[i++];
+    const type: i32 = Porffor.rawType(element);
+    if (element != 0 || Porffor.fastAnd(
+      type != Porffor.TYPES.undefined, // undefined
+      type != Porffor.TYPES.object // null
+    )) {
+      Porffor.bytestring.appendStr(out, ecma262.ToString(element));
+    }
+  }
+
+  return out;
 };

package/compiler/builtins/base64.ts

@@ -1,4 +1,5 @@
 // @porf --valtype=i32
+import type {} from './porffor.d.ts';
 
 export const btoa = (input: bytestring): bytestring => {
   const keyStr: bytestring = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';

package/compiler/builtins/boolean.ts

@@ -1,3 +1,5 @@
+import type {} from './porffor.d.ts';
+
 // 20.3.3.2 Boolean.prototype.toString ()
 // https://tc39.es/ecma262/#sec-boolean.prototype.tostring
 export const __Boolean_prototype_toString = (_this: boolean) => {
@@ -15,4 +17,4 @@ export const __Boolean_prototype_toString = (_this: boolean) => {
 export const __Boolean_prototype_valueOf = (_this: boolean) => {
   // 1. Return ? ThisBooleanValue(this value).
   return _this;
-};
+};

package/compiler/builtins/console.ts

@@ -0,0 +1,6 @@
+import type {} from './porffor.d.ts';
+
+export const __console_clear = () => {
+  const clear: bytestring = '\x1b[1;1H\x1b[J';
+  Porffor.print(clear);
+};

package/compiler/builtins/crypto.ts

@@ -1,4 +1,5 @@
 // @porf --valtype=i32
+import type {} from './porffor.d.ts';
 
 export const __crypto_randomUUID = (): bytestring => {
   let bytes: bytestring = '................';

package/compiler/builtins/date.ts

@@ -1,3 +1,5 @@
+import type {} from './porffor.d.ts';
+
 // 21.4.1.3 Day (t)
 // https://tc39.es/ecma262/multipage/numbers-and-dates.html#sec-day
 // 1. Return 𝔽(floor(ℝ(t / msPerDay))).
@@ -251,29 +253,6 @@ export const __ecma262_UTC = (t: number): number => {
   return t;
 };
 
-
-// todo: move this somewhere generic?
-// 7.1.5 ToIntegerOrInfinity (argument)
-// https://tc39.es/ecma262/multipage/abstract-operations.html#sec-tointegerorinfinity
-export const __ecma262_ToIntegerOrInfinity = (argument: unknown): number => {
-  // 1. Let number be ? ToNumber(argument).
-  let number: number = Number(argument);
-
-  // 2. If number is one of NaN, +0𝔽, or -0𝔽, return 0.
-  if (Number.isNaN(number)) return 0;
-
-  // 3. If number is +∞𝔽, return +∞.
-  // 4. If number is -∞𝔽, return -∞.
-  if (!Number.isFinite(number)) return number;
-
-  // 5. Return truncate(ℝ(number)).
-  number = Math.trunc(number);
-
-  // return 0 for -0
-  if (number == 0) return 0;
-  return number;
-};
-
 // 21.4.1.27 MakeTime (hour, min, sec, ms)
 // https://tc39.es/ecma262/multipage/numbers-and-dates.html#sec-maketime
 export const __ecma262_MakeTime = (hour: number, min: number, sec: number, ms: number): number => {
@@ -720,12 +699,9 @@ export const __Porffor_date_allocate = (): Date => {
   const hack: bytestring = '';
 
   if (hack.length == 0) {
-    hack.length = Porffor.wasm`i32.const 1
-memory.grow 0
-drop
-memory.size 0
+    hack.length = Porffor.wasm`
 i32.const 1
-i32.sub
+memory.grow 0
 i32.const 65536
 i32.mul
 i32.from_u`;
@@ -1892,8 +1868,7 @@ export const __ecma262_ToDateString = (tv: number) => {
 
   // 1. If tv is NaN, return "Invalid Date".
   if (Number.isNaN(tv)) {
-    out = 'Invalid Date';
-    return out;
+    return out = 'Invalid Date';
   }
 
   // 2. Let t be LocalTime(tv).

package/compiler/builtins/error.js

@@ -0,0 +1,22 @@
+export default () => {
+  let out = '';
+
+  const error = name => out += `export const ${name} = (message: bytestring) => {
+  return {};
+};
+
+export const ${name}$constructor = (message: bytestring) => {
+  return {};
+};`;
+
+  error('Error');
+  error('AggregateError');
+  error('TypeError');
+  error('ReferenceError');
+  error('SyntaxError');
+  error('RangeError');
+  error('EvalError');
+  error('URIError');
+
+  return out;
+};

package/compiler/builtins/escape.ts

@@ -1,6 +1,5 @@
 // @porf --valtype=i32
-
-import type {} from './porffor';
+import type {} from './porffor.d.ts';
 
 export const escape = (input: string|bytestring): bytestring => {
   // we have no byte array yet so use bytestring with 0x00 and 0x01 via escape characters

package/compiler/builtins/function.ts

@@ -1,3 +1,5 @@
+import type {} from './porffor.d.ts';
+
 export const __Function_prototype_toString = (_this: Function) => {
   // todo: actually use source
   let out: bytestring = 'function () {}';

package/compiler/builtins/int.ts

@@ -1,3 +1,5 @@
+import type {} from './porffor.d.ts';
+
 // radix: number|any for rawType check
 // export const parseInt = (input: string|bytestring, radix: number|any): f64 => {
 export const parseInt = (input: string|bytestring, radix: number): f64 => {