porffor 0.48.2 → 0.48.4

package/README.md

@@ -85,7 +85,7 @@ Rhemyn is Porffor's own regex engine; it compiles literal regex to Wasm bytecode
 ## Versioning
 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. `18` - minor, total Test262 pass percentage (floored to nearest int)
+2. `18` - minor, total Test262 pass percentage (rounded half down, eg `49.4%` -> `48`, `49.5%` -> `49`)
 3. `2` - micro, build number for that minor (incremented each publish/git push)
 4. `2aa3f0589` - commit hash
 

package/compiler/assemble.js

@@ -1,4 +1,4 @@
-import { Valtype, FuncType, ExportDesc, Section, Magic, ModuleVersion, Opcodes, PageSize, Reftype } from './wasmSpec.js';
+import { Valtype, FuncType, ExportDesc, Section, Magic, Opcodes, PageSize, Reftype } from './wasmSpec.js';
 import { encodeVector, encodeString, encodeLocal, unsignedLEB128, signedLEB128, unsignedLEB128_into, signedLEB128_into, ieee754_binary64, ieee754_binary64_into } from './encoding.js';
 import { importedFuncs } from './builtins.js';
 import { log } from './log.js';
@@ -9,17 +9,10 @@ const createSection = (type, data) => [
   ...encodeVector(data)
 ];
 
-const customSection = (name, data) => [
+const customSection = (name, data) => createSection(
   Section.custom,
-  ...encodeVector([...encodeString(name), ...data])
-];
-
-const chHint = (topTier, baselineTier, strategy) => {
-  // 1 byte of 4 2 bit components: spare, top tier, baseline tier, compilation strategy
-  // tiers: 0x00 = default, 0x01 = baseline (liftoff), 0x02 = optimized (turbofan)
-  // strategy: 0x00 = default, 0x01 = lazy, 0x02 = eager, 0x03 = lazy baseline, eager top tier
-  return (strategy | (baselineTier << 2) | (topTier << 4));
-};
+  [ ...encodeString(name), ...data ]
+);
 
 const encodeNames = funcs => {
   const encodeSection = (id, section) => [
@@ -50,11 +43,6 @@ const encodeNames = funcs => {
 export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
   const types = [], typeCache = {};
 
-  const optLevel = parseInt(process.argv.find(x => x.startsWith('-O'))?.[2] ?? 1);
-
-  const compileHints = Prefs.compileHints;
-  if (compileHints) log.warning('assemble', 'compile hints is V8 only w/ experimental arg! (you used -compile-hints)');
-
   const getType = (params, returns) => {
     const hash = `${params.join(',')}_${returns.join(',')}`;
     if (Prefs.optLog) log('assemble', `getType(${JSON.stringify(params)}, ${JSON.stringify(returns)}) -> ${hash} | cache: ${typeCache[hash]}`);
@@ -77,15 +65,15 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
   };
 
   let importFuncs = [], importDelta = 0;
-  if (optLevel < 1 || !Prefs.treeshakeWasmImports || noTreeshake) {
+  if (!Prefs.treeshakeWasmImports || noTreeshake) {
     importFuncs = importedFuncs;
   } else {
     let imports = new Map();
 
     // tree shake imports
     for (const f of funcs) {
-      for (const inst of f.wasm) {
-        if ((inst[0] === Opcodes.call /* || inst[0] === Opcodes.return_call */) && inst[1] < importedFuncs.length) {
+      if (f.usesImports) for (const inst of f.wasm) {
+        if (inst[0] === Opcodes.call && inst[1] < importedFuncs.length) {
           const idx = inst[1];
           const func = importedFuncs[idx];
 
@@ -261,101 +249,103 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
   );
   time('export section');
 
-  const codeSection = createSection(
-    Section.code,
-    encodeVector(funcs.map(x => {
-      // time(x.name);
-      const locals = Object.values(x.locals).sort((a, b) => a.idx - b.idx).slice(x.params.length);
-      // time('  locals gen');
-
-      let localDecl = [], typeCount = 0, lastType;
-      for (let i = 0; i < locals.length; i++) {
-        const local = locals[i];
-        if (i !== 0 && local.type !== lastType) {
-          localDecl.push(encodeLocal(typeCount, lastType));
-          typeCount = 0;
-        }
-
-        typeCount++;
-        lastType = local.type;
+  let codeSection = [];
+  for (let i = 0; i < funcs.length; i++) {
+    const x = funcs[i];
+    // time(x.name);
+    const locals = Object.values(x.locals).sort((a, b) => a.idx - b.idx);
+    // time('  locals gen');
+
+    const paramCount = x.params.length;
+    let localDecl = [], typeCount = 0, lastType, declCount = 0;
+    for (let i = paramCount; i <= locals.length; i++) {
+      const local = locals[i];
+      if (i !== paramCount && local?.type !== lastType) {
+        unsignedLEB128_into(typeCount, localDecl);
+        localDecl.push(lastType);
+        typeCount = 0;
+        declCount++;
       }
 
-      if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
-      // time('  localDecl gen');
-
-      const makeAssembled = Prefs.d;
-      let wasm = [], wasmNonFlat = [];
-      for (let i = 0; i < x.wasm.length; i++) {
-        let o = x.wasm[i];
-
-        // encode local/global ops as unsigned leb128 from raw number
-        if (
-          // (o[0] === Opcodes.local_get || o[0] === Opcodes.local_set || o[0] === Opcodes.local_tee || o[0] === Opcodes.global_get || o[0] === Opcodes.global_set) &&
-          (o[0] >= Opcodes.local_get && o[0] <= Opcodes.global_set) &&
-          o[1] > 127
-        ) {
-          const n = o[1];
-          o = [ o[0] ];
-          unsignedLEB128_into(n, o);
-        }
+      typeCount++;
+      lastType = local?.type;
+    }
 
-        // encode f64.const ops as ieee754 from raw number
-        if (o[0] === Opcodes.f64_const) {
-          const n = o[1];
-          // o = [ o[0] ];
-          // ieee754_binary64_into(n, o);
-          o = ieee754_binary64(n);
-          if (o.length === 8) o.unshift(Opcodes.f64_const);
-        }
+    // time('  localDecl gen');
+
+    const makeAssembled = Prefs.d;
+    let wasm = [], wasmNonFlat = [];
+    for (let i = 0; i < x.wasm.length; i++) {
+      let o = x.wasm[i];
+
+      // encode local/global ops as unsigned leb128 from raw number
+      if (
+        (o[0] >= Opcodes.local_get && o[0] <= Opcodes.global_set) &&
+        o[1] > 127
+      ) {
+        const n = o[1];
+        o = [ o[0] ];
+        unsignedLEB128_into(n, o);
+      }
 
-        // encode call ops as unsigned leb128 from raw number
-        if ((o[0] === Opcodes.call /* || o[0] === Opcodes.return_call */) && o[1] >= importedFuncs.length) {
-          const n = o[1] - importDelta;
-          // o = [ o[0] ];
-          o = [ Opcodes.call ];
-          unsignedLEB128_into(n, o);
-        }
+      // encode f64.const ops as ieee754 from raw number
+      if (o[0] === Opcodes.f64_const) {
+        const n = o[1];
+        o = ieee754_binary64(n);
+        if (o.length === 8) o.unshift(Opcodes.f64_const);
+      }
+
+      // encode call ops as unsigned leb128 from raw number
+      if ((o[0] === Opcodes.call /* || o[0] === Opcodes.return_call */) && o[1] >= importedFuncs.length) {
+        const n = o[1] - importDelta;
+        o = [ Opcodes.call ];
+        unsignedLEB128_into(n, o);
+      }
 
-        // encode call indirect ops as types from info
-        if (o[0] === Opcodes.call_indirect) {
-          o = [...o];
-          const params = [];
-          for (let i = 0; i < o[1]; i++) {
-            params.push(valtypeBinary, Valtype.i32);
-          }
-
-          let returns = [ valtypeBinary, Valtype.i32 ];
-          if (o.at(-1) === 'no_type_return') {
-            o.pop();
-            returns = [ valtypeBinary ];
-          }
-
-          o[1] = getType(params, returns);
+      // encode call indirect ops as types from info
+      if (o[0] === Opcodes.call_indirect) {
+        o = [...o];
+        const params = [];
+        for (let i = 0; i < o[1]; i++) {
+          params.push(valtypeBinary, Valtype.i32);
         }
 
-        for (let j = 0; j < o.length; j++) {
-          const x = o[j];
-          if (x == null || !(x <= 0xff)) continue;
-          wasm.push(x);
+        let returns = [ valtypeBinary, Valtype.i32 ];
+        if (o.at(-1) === 'no_type_return') {
+          o.pop();
+          returns = [ valtypeBinary ];
         }
 
-        if (makeAssembled) wasmNonFlat.push(o);
+        o[1] = getType(params, returns);
       }
-      // time('  wasm transform');
 
-      if (makeAssembled) {
-        x.assembled = { localDecl, wasm, wasmNonFlat };
+      for (let j = 0; j < o.length; j++) {
+        const x = o[j];
+        if (x == null || !(x <= 0xff)) continue;
+        wasm.push(x);
       }
 
-      let out = unsignedLEB128(localDecl.length)
-        .concat(localDecl.flat(), wasm, Opcodes.end);
+      if (makeAssembled) wasmNonFlat.push(o);
+    }
+    // time('  wasm transform');
+
+    if (makeAssembled) {
+      x.assembled = { localDecl, wasm, wasmNonFlat };
+    }
 
-      out.unshift(...unsignedLEB128(out.length));
+    let out = unsignedLEB128(declCount)
+      .concat(localDecl, wasm, Opcodes.end);
 
-      // time('  finish');
-      return out;
-    }))
-  );
+    codeSection.push(
+      ...unsignedLEB128(out.length),
+      ...out
+    );
+
+    // time('  finish');
+  }
+
+  codeSection.unshift(...unsignedLEB128(funcs.length, codeSection));
+  codeSection.unshift(Section.code, ...unsignedLEB128(codeSection.length));
   time('code section');
 
   const typeSection = createSection(
@@ -364,25 +354,32 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
   );
   time('type section');
 
-  const dataSection = data.length === 0 ? [] : createSection(
-    Section.data,
-    encodeVector(data.map(x => {
+  let dataSection = [];
+  if (data.length > 0) {
+    for (let i = 0; i < data.length; i++) {
+      const x = data[i];
       if (Prefs.d && x.bytes.length > PageSize) log.warning('assemble', `data (${x.page}) has more bytes than Wasm page size! (${x.bytes.length})`);
 
-      const bytes = unsignedLEB128(x.bytes.length).concat(x.bytes);
       if (x.page != null) {
         // type: active
         let offset = pages.allocs.get(x.page) ?? (pages.get(x.page) * pageSize);
         if (offset === 0) offset = 16;
-        bytes.unshift(0x00, Opcodes.i32_const, ...signedLEB128(offset), Opcodes.end);
+        dataSection.push(0x00, Opcodes.i32_const, ...signedLEB128(offset), Opcodes.end);
       } else {
         // type: passive
-        bytes.unshift(0x01);
+        dataSection.push(0x01);
       }
 
-      return bytes;
-    }))
-  );
+      dataSection.push(
+        ...unsignedLEB128(x.bytes.length),
+        ...x.bytes
+      );
+    }
+
+    dataSection.unshift(...unsignedLEB128(data.length, dataSection));
+    dataSection.unshift(Section.data, ...unsignedLEB128(dataSection.length));
+  }
+
   time('data section');
 
   const dataCountSection = data.length === 0 ? [] : createSection(
@@ -391,31 +388,11 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
   );
   time('datacount section');
 
-  if (Prefs.sections) console.log({
-    typeSection: typeSection.map(x => x.toString(16)),
-    importSection: importSection.map(x => x.toString(16)),
-    funcSection: funcSection.map(x => x.toString(16)),
-    globalSection: globalSection.map(x => x.toString(16)),
-    exportSection: exportSection.map(x => x.toString(16)),
-    codeSection: codeSection.map(x => x.toString(16)),
-    dataSection: dataSection.map(x => x.toString(16)),
-  });
-
-  // compilation hints section - unspecd, v8 only
-  // https://github.com/WebAssembly/design/issues/1473#issuecomment-1431274746
-  const chSection = !compileHints ? [] : customSection(
-    'compilationHints',
-    // for now just do everything as optimize eager
-    encodeVector(funcs.map(_ => chHint(0x02, 0x02, 0x02)))
-  );
-
   return Uint8Array.from([
     ...Magic,
-    ...ModuleVersion,
     ...typeSection,
     ...importSection,
     ...funcSection,
-    ...chSection,
     ...tableSection,
     ...memorySection,
     ...tagSection,

package/compiler/builtins/promise.ts

@@ -92,13 +92,67 @@ export const __ecma262_RejectPromise = (promise: any[], reason: any): void => {
 };
 
 
-export const __Porffor_promise_noop = () => {};
+export const __Porffor_promise_noop = (x: any): any => x;
+
+export const __Porffor_promise_newReaction = (handler: Function, promise: any, flags: i32): any[] => {
+  // enum ReactionType { then = 0, finally = 1 }
+  const out: any[] = Porffor.allocateBytes(32);
+  out[0] = handler;
+  out[1] = promise;
+  out[2] = flags;
+
+  return out;
+};
+
+export const __Porffor_then = (promise: any[], fulfillReaction: any[], rejectReaction: any[]): void => {
+  const state: i32 = promise[1];
+
+  // 27.2.5.4.1 PerformPromiseThen (promise, onFulfilled, onRejected [, resultCapability])
+  // https://tc39.es/ecma262/#sec-performpromisethen
+
+  // 9. If promise.[[PromiseState]] is pending, then
+  if (state == 0) { // pending
+    // a. Append fulfillReaction to promise.[[PromiseFulfillReactions]].
+    const fulfillReactions: any[] = promise[2];
+    Porffor.array.fastPush(fulfillReactions, fulfillReaction);
+
+    // b. Append rejectReaction to promise.[[PromiseRejectReactions]].
+    const rejectReactions: any[] = promise[3];
+    Porffor.array.fastPush(rejectReactions, rejectReaction);
+  } else if (state == 1) { // fulfilled
+    // 10. Else if promise.[[PromiseState]] is fulfilled, then
+    // a. Let value be promise.[[PromiseResult]].
+    const value: any = promise[0];
+
+    // b. Let fulfillJob be NewPromiseReactionJob(fulfillReaction, value).
+    // c. Perform HostEnqueuePromiseJob(fulfillJob.[[Job]], fulfillJob.[[Realm]]).
+    __ecma262_HostEnqueuePromiseJob(__ecma262_NewPromiseReactionJob(fulfillReaction, value));
+  } else { // rejected
+    // 11. Else,
+    // a. Assert: The value of promise.[[PromiseState]] is rejected.
+    // todo
+
+    // b. Let reason be promise.[[PromiseResult]].
+    const reason: any = promise[0];
+
+    // c. If promise.[[PromiseIsHandled]] is false, perform HostPromiseRejectionTracker(promise, "handle").
+    // unimplemented
+
+    // d. Let rejectJob be NewPromiseReactionJob(rejectReaction, reason).
+    // e. Perform HostEnqueuePromiseJob(rejectJob.[[Job]], rejectJob.[[Realm]]).
+    __ecma262_HostEnqueuePromiseJob(__ecma262_NewPromiseReactionJob(rejectReaction, reason));
+  }
+};
 
 export const __Porffor_promise_resolve = (value: any, promise: any): any => {
-  // todo: if value is own promise, reject with typeerror
+  // if value is own promise, reject with typeerror
+  if (value === promise) throw new TypeError('cannot resolve promise with itself');
 
   if (__ecma262_IsPromise(value)) {
-    // todo
+    const fulfillReaction: any[] = __Porffor_promise_newReaction(__Porffor_promise_noop, promise, 0);
+    const rejectReaction: any[] = __Porffor_promise_newReaction(__Porffor_promise_noop, promise, 2);
+
+    __Porffor_then(value, fulfillReaction, rejectReaction);
   } else {
     __ecma262_FulfillPromise(promise, value);
   }
@@ -107,12 +161,7 @@ export const __Porffor_promise_resolve = (value: any, promise: any): any => {
 };
 
 export const __Porffor_promise_reject = (reason: any, promise: any): any => {
-  if (__ecma262_IsPromise(reason)) {
-    // todo
-  } else {
-    __ecma262_RejectPromise(promise, reason);
-  }
-
+  __ecma262_RejectPromise(promise, reason);
   return undefined;
 };
 
@@ -138,18 +187,8 @@ export const __Porffor_promise_create = (): any[] => {
   return obj;
 };
 
-export const __Porffor_promise_newReaction = (handler: Function, promise: any, type: i32): any[] => {
-  // enum ReactionType { then = 0, finally = 1 }
-  const out: any[] = Porffor.allocateBytes(32);
-  out[0] = handler;
-  out[1] = promise;
-  out[2] = type;
-
-  return out;
-};
-
 export const __Porffor_promise_runNext = (func: Function) => {
-  const reaction = __Porffor_promise_newReaction(func, undefined, 1);
+  const reaction: any[] = __Porffor_promise_newReaction(func, undefined, 1);
   __ecma262_HostEnqueuePromiseJob(__ecma262_NewPromiseReactionJob(reaction, undefined));
 };
 
@@ -161,21 +200,26 @@ export const __Porffor_promise_runJobs = () => {
     const reaction: any[] = x[0];
     const handler: Function = reaction[0];
     const outPromise: any = reaction[1];
-    const type: i32 = reaction[2];
+    const flags: i32 = reaction[2];
 
     const value: any = x[1];
 
     // todo: handle thrown errors in handler?
     let outValue: any;
-    if (type == 0) { // 0: then reaction
-      outValue = handler(value);
-    } else { // 1: finally reaction
+    if (flags & 0b01) { // finally reaction
       handler();
       outValue = value;
+    } else { // then reaction
+      outValue = handler(value);
     }
 
-    // todo: should this be resolve or fulfill?
-    if (outPromise) __ecma262_FulfillPromise(outPromise, outValue);
+    if (outPromise) if (flags & 0b10) {
+      // reject reaction
+      __Porffor_promise_reject(outValue, outPromise);
+    } else {
+      // resolve reaction
+      __Porffor_promise_resolve(outValue, outPromise);
+    }
   }
 };
 
@@ -242,52 +286,15 @@ export const __Promise_prototype_then = (_this: any, onFulfilled: any, onRejecte
   // 2. If IsPromise(promise) is false, throw a TypeError exception.
   if (!__ecma262_IsPromise(_this)) throw new TypeError('Promise.prototype.then called on non-Promise');
 
-  // 27.2.5.4.1 PerformPromiseThen (promise, onFulfilled, onRejected [, resultCapability])
-  // https://tc39.es/ecma262/#sec-performpromisethen
-
   if (Porffor.rawType(onFulfilled) != Porffor.TYPES.function) onFulfilled = __Porffor_promise_noop;
   if (Porffor.rawType(onRejected) != Porffor.TYPES.function) onRejected = __Porffor_promise_noop;
 
-  const promise: any[] = _this;
-  const state: i32 = promise[1];
-
   const outPromise: any[] = __Porffor_promise_create();
 
   const fulfillReaction: any[] = __Porffor_promise_newReaction(onFulfilled, outPromise, 0);
-  const rejectReaction: any[] = __Porffor_promise_newReaction(onRejected, outPromise, 0);
+  const rejectReaction: any[] = __Porffor_promise_newReaction(onRejected, outPromise, 2);
 
-  // 9. If promise.[[PromiseState]] is pending, then
-  if (state == 0) { // pending
-    // a. Append fulfillReaction to promise.[[PromiseFulfillReactions]].
-    const fulfillReactions: any[] = promise[2];
-    Porffor.array.fastPush(fulfillReactions, fulfillReaction);
-
-    // b. Append rejectReaction to promise.[[PromiseRejectReactions]].
-    const rejectReactions: any[] = promise[3];
-    Porffor.array.fastPush(rejectReactions, rejectReaction);
-  } else if (state == 1) { // fulfilled
-    // 10. Else if promise.[[PromiseState]] is fulfilled, then
-    // a. Let value be promise.[[PromiseResult]].
-    const value: any = promise[0];
-
-    // b. Let fulfillJob be NewPromiseReactionJob(fulfillReaction, value).
-    // c. Perform HostEnqueuePromiseJob(fulfillJob.[[Job]], fulfillJob.[[Realm]]).
-    __ecma262_HostEnqueuePromiseJob(__ecma262_NewPromiseReactionJob(fulfillReaction, value));
-  } else { // rejected
-    // 11. Else,
-    // a. Assert: The value of promise.[[PromiseState]] is rejected.
-    // todo
-
-    // b. Let reason be promise.[[PromiseResult]].
-    const reason: any = promise[0];
-
-    // c. If promise.[[PromiseIsHandled]] is false, perform HostPromiseRejectionTracker(promise, "handle").
-    // unimplemented
-
-    // d. Let rejectJob be NewPromiseReactionJob(rejectReaction, reason).
-    // e. Perform HostEnqueuePromiseJob(rejectJob.[[Job]], rejectJob.[[Realm]]).
-    __ecma262_HostEnqueuePromiseJob(__ecma262_NewPromiseReactionJob(rejectReaction, reason));
-  }
+  __Porffor_then(_this, fulfillReaction, rejectReaction);
 
   const pro: Promise = outPromise;
   return pro;

package/compiler/builtins.js

@@ -68,21 +68,6 @@ for (let i = 0; i < importedFuncs.length; i++) {
   importedFuncs[f.name] = i;
 }
 
-const printStaticStr = str => {
-  const out = [];
-
-  for (let i = 0; i < str.length; i++) {
-    out.push(
-      // ...number(str.charCodeAt(i)),
-      ...number(str.charCodeAt(i), Valtype.i32),
-      Opcodes.i32_from_u,
-      [ Opcodes.call, importedFuncs.printChar ]
-    );
-  }
-
-  return out;
-};
-
 export const UNDEFINED = 0;
 export const NULL = 0;
 
@@ -106,6 +91,7 @@ export const BuiltinVars = function(ctx) {
   this.__performance_timeOrigin = [
     [ Opcodes.call, importedFuncs.timeOrigin ]
   ];
+  this.__performance_timeOrigin.usesImports = true;
 
   this.__Uint8Array_BYTES_PER_ELEMENT = number(1);
   this.__Int8Array_BYTES_PER_ELEMENT = number(1);
@@ -849,6 +835,7 @@ export const BuiltinFuncs = function() {
       [ Opcodes.call, importedFuncs.time ]
     ]
   };
+  this.__performance_now.usesImports = true;
 
 
   this.__Porffor_type = {