porffor 0.57.21 → 0.57.22

package/compiler/builtins/_internal_object.ts

@@ -25,76 +25,79 @@ export const __Porffor_object_hash = (key: any): i32 => {
     return 0;
   }
 
-  // bytestring or string, fnv-1a hash (custom variant)
+  // bytestring or string, xxh32-based hash
   // todo/opt: custom wasm simd variant?
-  // todo/opt: pgo for if no hash collisions?
   // todo: bytestring/string symmetric hashing
-
-  let ptr: i32 = Porffor.wasm`local.get ${key}`;
-  const len: i32 = Porffor.wasm.i32.load(key, 0, 0);
-
-  let hash: i32 = (2166136261 ^ len) * 16777619;
-
-  // chunks of 8 bytes via i64.load
-  const endPtr: i32 = ptr + len - 8;
-  for (; ptr <= endPtr; ptr += 8) {
+  let p: i32 = Porffor.wasm`local.get ${key}`;
+  let len: i32 = Porffor.wasm.i32.load(key, 0, 0);
+  if (Porffor.wasm`local.get ${key+1}` == Porffor.TYPES.string) len *= 2;
+
+  let hash: i32 = 374761393 + len;
+  const end: i32 = p + len;
+  while (p + 4 <= end) {
+    // hash in chunks of i32 (4 bytes)
     Porffor.wasm`
-local x i64
-local.get ${ptr}
-i64.load 0 4
-local.set x
-
-local.get ${hash}
-local.get x
-i64.const 32
-i64.shr_u
-i32.wrap_i64
-i32.xor
-i32.const 16777619
+local.get hash
+local.get p
+i32.load 0 4
+i32.const 3266489917
 i32.mul
-
-local.get x
-i32.wrap_i64
-i32.xor
-i32.const 16777619
+i32.add
+i32.const 17
+i32.rotl
+i32.const 668265263
 i32.mul
-
-local.set ${hash}`;
+local.set hash`;
+    p += 4;
   }
 
-  // remaining 0-7 bytes via i64.load and bitwise
   Porffor.wasm`
-local.get ${ptr}
-i64.load 0 4
+;; hash final bytes up to 4 via shift depending on bytes remaining
+local.get hash
+local.get p
+i32.load 0 4
 
-local shift i64
-local.get ${ptr}
-local.get ${endPtr}
+i32.const 1
+local.get end
+local.get p
 i32.sub
 i32.const 8
 i32.mul
-i64.extend_i32_u
-local.tee shift
+i32.shl
+i32.const 1
+i32.sub
+i32.and
 
-i64.shl
-local.get shift
-i64.shr_u
-local.set x
+i32.const 3266489917
+i32.mul
+i32.add
+i32.const 17
+i32.rotl
+i32.const 668265263
+i32.mul
+local.tee hash
 
-local.get ${hash}
-local.get x
-i64.const 32
-i64.shr_u
-i32.wrap_i64
+;; final avalanche
+local.get hash
+i32.const 15
+i32.shr_u
 i32.xor
-i32.const 16777619
+i32.const 2246822519
 i32.mul
+local.tee hash
 
-local.get x
-i32.wrap_i64
+local.get hash
+i32.const 13
+i32.shr_u
 i32.xor
-i32.const 16777619
+i32.const 3266489917
 i32.mul
+local.tee hash
+
+local.get hash
+i32.const 16
+i32.shr_u
+i32.xor
 return`;
 };
 
@@ -489,7 +492,7 @@ local.set ${obj+1}`;
     } else obj = __Porffor_object_getHiddenPrototype(trueType);
 
     // todo/opt: put this behind comptime flag if only __proto__ is used
-    if (hash == -406948493) if (Porffor.strcmp(key, '__proto__')) {
+    if (hash == 593337848) if (Porffor.strcmp(key, '__proto__')) {
       // get prototype
       Porffor.wasm`
 local.get ${obj}
@@ -565,7 +568,7 @@ export const __Porffor_object_set = (obj: any, key: any, value: any): any => {
   let entryPtr: i32 = __Porffor_object_lookup(obj, key, hash);
   let flags: i32;
   if (entryPtr == -1) {
-    if (hash == -406948493) if (Porffor.strcmp(key, '__proto__')) {
+    if (hash == 593337848) if (Porffor.strcmp(key, '__proto__')) {
       // set prototype
       __Porffor_object_setPrototype(obj, value);
       return value;
@@ -671,7 +674,7 @@ export const __Porffor_object_setStrict = (obj: any, key: any, value: any): any
   let entryPtr: i32 = __Porffor_object_lookup(obj, key, hash);
   let flags: i32;
   if (entryPtr == -1) {
-    if (hash == -406948493) if (Porffor.strcmp(key, '__proto__')) {
+    if (hash == 593337848) if (Porffor.strcmp(key, '__proto__')) {
       // set prototype
       __Porffor_object_setPrototype(obj, value);
       return value;
@@ -949,7 +952,7 @@ export const __Porffor_object_expr_init = (obj: any, key: any, value: any): void
   const hash: i32 = __Porffor_object_hash(key);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key, hash);
   if (entryPtr == -1) {
-    if (hash == -406948493) if (Porffor.strcmp(key, '__proto__')) {
+    if (hash == 593337848) if (Porffor.strcmp(key, '__proto__')) {
       // set prototype
       __Porffor_object_setPrototype(obj, value);
       return value;

package/compiler/builtins_precompiled.js

@@ -13,9 +13,9 @@ params:[127,127,127,127],typedParams:1,returns:[127,127],
 locals:[127,127,127,127,127],localNames:["a","a#type","b","b#type","al","bl","out","i","ptr"],
 }
 this.__Porffor_object_hash = {
-wasm:()=>[[32,1],[65,5],[70],[4,64],[65,0],[15],[26],[11],[32,0],[33,2],[32,0],[40,0,0],[33,3],[65,197,187,242,136,120],[32,3],[115],[65,147,131,128,8],[108],[33,4],[32,2],[32,3],[106],[65,8],[107],[33,5],[3,64],[32,2],[32,5],[76],[4,64],[32,2],[41,0,4],[33,6],[32,4],[32,6],[66,32],[136],[167],[115],[65,147,131,128,8],[108],[32,6],[167],[115],[65,147,131,128,8],[108],[33,4],[32,2],[65,8],[106],[33,2],[12,1],[11],[11],[32,2],[41,0,4],[32,2],[32,5],[107],[65,8],[108],[173],[34,7],[134],[32,7],[136],[33,6],[32,4],[32,6],[66,32],[136],[167],[115],[65,147,131,128,8],[108],[32,6],[167],[115],[65,147,131,128,8],[108],[15]],
+wasm:()=>[[32,1],[65,5],[70],[4,64],[65,0],[15],[26],[11],[32,0],[33,2],[32,0],[40,0,0],[33,3],[32,1],[65,195,0],[70],[4,64],[32,3],[65,2],[108],[33,3],[11],[65,177,207,217,178,1],[32,3],[106],[33,4],[32,2],[32,3],[106],[33,5],[3,64],[32,2],[65,4],[106],[32,5],[76],[4,64],[32,4],[32,2],[40,0,4],[65,189,220,202,149,124],[108],[106],[65,17],[119],[65,175,214,211,190,2],[108],[33,4],[32,2],[65,4],[106],[33,2],[12,1],[11],[11],[32,4],[32,2],[40,0,4],[65,1],[32,5],[32,2],[107],[65,8],[108],[116],[65,1],[107],[113],[65,189,220,202,149,124],[108],[106],[65,17],[119],[65,175,214,211,190,2],[108],[34,4],[32,4],[65,15],[118],[115],[65,247,148,175,175,120],[108],[34,4],[32,4],[65,13],[118],[115],[65,189,220,202,149,124],[108],[34,4],[32,4],[65,16],[118],[115],[15]],
 params:[127,127],typedParams:1,returns:[127],returnType:1,
-locals:[127,127,127,127,126,126],localNames:["key","key#type","ptr","len","hash","endPtr","x","shift"],
+locals:[127,127,127,127],localNames:["key","key#type","p","len","hash","end"],
 }
 this.__Porffor_object_writeKey = {
 wasm:()=>[[32,0],[32,4],[54,0,0],[32,2],[33,6],[32,3],[65,195,0],[70],[4,64],[32,6],[65,128,128,128,128,120],[114],[33,6],[5],[32,3],[65,5],[70],[4,64],[32,6],[65,128,128,128,128,124],[114],[33,6],[11],[11],[32,0],[32,6],[54,0,4],[15]],
@@ -109,19 +109,19 @@ params:[127,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["entryPtr","entryPtr#type"],
 }
 this.__Porffor_object_get = {
-wasm:(_,{i32ify,t,makeString,builtin,internalThrow})=>[[32,1],[34,4],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,5],[33,1],[33,0],[11],[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot get property of null`),[26],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,6],[32,0],[32,1],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_lookup')],[34,7],[65,127],[70],[4,64],[32,4],[65,7],[70],[4,64],[32,0],[32,0],[40,0,4],[33,0],[45,0,3],[34,1],[69],[4,64],[16,builtin('#get___Object_prototype')],[33,0],[65,7],[33,1],[11],[5],[32,4],[65,1],[16,builtin('__Porffor_object_getHiddenPrototype')],[34,5],[33,1],[33,0],[11],[32,6],[65,243,234,249,189,126],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,"__proto__",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[184],[32,1],[15],[26],[11],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,5],[33,1],[33,0],[11],[32,0],[33,8],[32,1],[33,9],[3,64],[65,1],[4,64],[32,0],[32,1],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_lookup')],[34,7],[65,127],[71],[4,64],[12,1],[26],[11],[32,1],[65,7],[70],[4,64],[32,0],[32,0],[40,0,4],[33,0],[45,0,3],[33,1],[5],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,5],[33,1],[33,0],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,5],[33,1],[33,0],[11],[32,0],[33,10],[32,1],[33,11],[2,127],...t([0,128],()=>[[32,11],[69],[32,11],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),[32,11],[65,7],[70],[4,64],[32,10],[69],[12,1],[11],[65,0],[11],[32,0],[32,8],[70],[114],[4,64],[12,1],[26],[11],[32,0],[33,8],[32,1],[33,9],[12,1],[11],[11],[32,7],[65,127],[70],[4,64],[68,0],[65,128,1],[15],[26],[11],[11],[32,7],[47,0,16],[34,12],[65,1],[113],[4,64],[32,7],[65,1],[16,builtin('__Porffor_object_accessorGet')],[33,5],[34,13],[69],[4,64],[68,0],[65,128,1],[15],[26],[11],[32,13],[33,16],[65,0],[65,128,1],[33,17],[183],[32,17],[32,0],[34,14],[32,1],[34,15],[33,17],[183],[32,17],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,16],[17,12,0],[34,5],[15],[26],[11],[32,7],[43,0,8],[32,12],[65,8],[118],[15]],
+wasm:(_,{i32ify,t,makeString,builtin,internalThrow})=>[[32,1],[34,4],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,5],[33,1],[33,0],[11],[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot get property of null`),[26],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,6],[32,0],[32,1],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_lookup')],[34,7],[65,127],[70],[4,64],[32,4],[65,7],[70],[4,64],[32,0],[32,0],[40,0,4],[33,0],[45,0,3],[34,1],[69],[4,64],[16,builtin('#get___Object_prototype')],[33,0],[65,7],[33,1],[11],[5],[32,4],[65,1],[16,builtin('__Porffor_object_getHiddenPrototype')],[34,5],[33,1],[33,0],[11],[32,6],[65,248,187,246,154,2],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,"__proto__",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[184],[32,1],[15],[26],[11],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,5],[33,1],[33,0],[11],[32,0],[33,8],[32,1],[33,9],[3,64],[65,1],[4,64],[32,0],[32,1],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_lookup')],[34,7],[65,127],[71],[4,64],[12,1],[26],[11],[32,1],[65,7],[70],[4,64],[32,0],[32,0],[40,0,4],[33,0],[45,0,3],[33,1],[5],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,5],[33,1],[33,0],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,5],[33,1],[33,0],[11],[32,0],[33,10],[32,1],[33,11],[2,127],...t([0,128],()=>[[32,11],[69],[32,11],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),[32,11],[65,7],[70],[4,64],[32,10],[69],[12,1],[11],[65,0],[11],[32,0],[32,8],[70],[114],[4,64],[12,1],[26],[11],[32,0],[33,8],[32,1],[33,9],[12,1],[11],[11],[32,7],[65,127],[70],[4,64],[68,0],[65,128,1],[15],[26],[11],[11],[32,7],[47,0,16],[34,12],[65,1],[113],[4,64],[32,7],[65,1],[16,builtin('__Porffor_object_accessorGet')],[33,5],[34,13],[69],[4,64],[68,0],[65,128,1],[15],[26],[11],[32,13],[33,16],[65,0],[65,128,1],[33,17],[183],[32,17],[32,0],[34,14],[32,1],[34,15],[33,17],[183],[32,17],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,16],[17,12,0],[34,5],[15],[26],[11],[32,7],[43,0,8],[32,12],[65,8],[118],[15]],
 params:[127,127,127,127],typedParams:1,returns:[124,127],
 locals:[127,127,127,127,127,127,127,127,127,127,127,127,127,127],localNames:["obj","obj#type","key","key#type","trueType","#last_type","hash","entryPtr","lastProto","lastProto#type","#logicinner_tmp","#typeswitch_tmp1","tail","get","#call_val","#call_type","#indirect_2_callee","#swap"],
 table:1,usesTag:1,
 }
 this.__Porffor_object_set = {
-wasm:(_,{i32ify,t,makeString,builtin,internalThrow})=>[[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,6],[33,1],[33,0],[32,1],[65,7],[71],[4,64],[32,4],[32,5],[15],[26],[11],[11],[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property of null`),[26],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,7],[32,0],[32,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[70],[4,64],[32,7],[65,243,234,249,189,126],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,"__proto__",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[32,1],[32,4],[252,2],[32,5],[16,builtin('__Porffor_object_setPrototype')],[32,4],[32,5],[15],[26],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[34,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[69],[4,64],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,14],[32,11],[33,15],[3,64],[65,1],[4,64],[32,10],[32,11],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[71],[4,64],[12,1],[26],[11],[32,10],[32,11],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[33,10],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[32,10],[32,14],[70],[114],[4,64],[12,1],[26],[11],[32,10],[33,14],[32,11],[33,15],[12,1],[11],[11],[32,8],[65,127],[71],[4,64],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,17],[33,20],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,20],[17,12,0],[33,6],[26],[32,4],[32,5],[15],[26],[11],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[4,64],[32,4],[32,5],[15],[26],[11],[32,0],[47,0,0],[33,22],[32,0],[32,22],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,22],[65,18],[108],[106],[34,8],[65,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_writeKey')],[65,14],[33,9],[5],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,17],[33,23],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,23],[17,12,0],[33,6],[26],[32,4],[32,5],[15],[26],[11],[32,16],[65,8],[113],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,16],[65,255,1],[113],[33,9],[11],[32,8],[32,4],[57,0,8],[32,8],[32,9],[32,5],[65,8],[116],[106],[59,0,16],[32,4],[32,5],[15]],
+wasm:(_,{i32ify,t,makeString,builtin,internalThrow})=>[[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,6],[33,1],[33,0],[32,1],[65,7],[71],[4,64],[32,4],[32,5],[15],[26],[11],[11],[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property of null`),[26],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,7],[32,0],[32,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[70],[4,64],[32,7],[65,248,187,246,154,2],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,"__proto__",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[32,1],[32,4],[252,2],[32,5],[16,builtin('__Porffor_object_setPrototype')],[32,4],[32,5],[15],[26],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[34,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[69],[4,64],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,14],[32,11],[33,15],[3,64],[65,1],[4,64],[32,10],[32,11],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[71],[4,64],[12,1],[26],[11],[32,10],[32,11],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[33,10],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[32,10],[32,14],[70],[114],[4,64],[12,1],[26],[11],[32,10],[33,14],[32,11],[33,15],[12,1],[11],[11],[32,8],[65,127],[71],[4,64],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,17],[33,20],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,20],[17,12,0],[33,6],[26],[32,4],[32,5],[15],[26],[11],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[4,64],[32,4],[32,5],[15],[26],[11],[32,0],[47,0,0],[33,22],[32,0],[32,22],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,22],[65,18],[108],[106],[34,8],[65,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_writeKey')],[65,14],[33,9],[5],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,17],[33,23],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,23],[17,12,0],[33,6],[26],[32,4],[32,5],[15],[26],[11],[32,16],[65,8],[113],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,16],[65,255,1],[113],[33,9],[11],[32,8],[32,4],[57,0,8],[32,8],[32,9],[32,5],[65,8],[116],[106],[59,0,16],[32,4],[32,5],[15]],
 params:[127,127,127,127,124,127],typedParams:1,returns:[124,127],
 locals:[127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","#last_type","hash","entryPtr","flags","proto","proto#type","#logicinner_tmp","#typeswitch_tmp1","lastProto","lastProto#type","tail","set","#call_val","#call_type","#indirect_3_callee","#swap","size","#indirect_4_callee"],
 table:1,usesTag:1,
 }
 this.__Porffor_object_setStrict = {
-wasm:(_,{i32ify,t,makeString,builtin,internalThrow})=>[[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property of null`),[26],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,6],[33,1],[33,0],[32,1],[65,7],[71],[4,64],[32,4],[32,5],[15],[26],[11],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,7],[32,0],[32,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[70],[4,64],[32,7],[65,243,234,249,189,126],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,"__proto__",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[32,1],[32,4],[252,2],[32,5],[16,builtin('__Porffor_object_setPrototype')],[32,4],[32,5],[15],[26],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[34,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[69],[4,64],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,14],[32,11],[33,15],[3,64],[65,1],[4,64],[32,10],[32,11],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[71],[4,64],[12,1],[26],[11],[32,10],[32,11],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[33,10],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[32,10],[32,14],[70],[114],[4,64],[12,1],[26],[11],[32,10],[33,14],[32,11],[33,15],[12,1],[11],[11],[32,8],[65,127],[71],[4,64],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,17],[33,20],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,20],[17,12,0],[33,6],[26],[32,4],[32,5],[15],[26],[11],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[4,64],...internalThrow(_,'TypeError',`Cannot add property to inextensible object`),[26],[11],[32,0],[47,0,0],[33,22],[32,0],[32,22],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,22],[65,18],[108],[106],[34,8],[65,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_writeKey')],[65,14],[33,9],[5],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property with no setter of object`),[26],[11],[32,17],[33,23],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,23],[17,12,0],[33,6],[26],[32,4],[32,5],[15],[26],[11],[32,16],[65,8],[113],[69],[4,64],...internalThrow(_,'TypeError',`Cannot modify read-only property of object`),[26],[11],[32,16],[65,255,1],[113],[33,9],[11],[32,8],[32,4],[57,0,8],[32,8],[32,9],[32,5],[65,8],[116],[106],[59,0,16],[32,4],[32,5],[15]],
+wasm:(_,{i32ify,t,makeString,builtin,internalThrow})=>[[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property of null`),[26],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,6],[33,1],[33,0],[32,1],[65,7],[71],[4,64],[32,4],[32,5],[15],[26],[11],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,7],[32,0],[32,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[70],[4,64],[32,7],[65,248,187,246,154,2],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,"__proto__",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[32,1],[32,4],[252,2],[32,5],[16,builtin('__Porffor_object_setPrototype')],[32,4],[32,5],[15],[26],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[34,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[69],[4,64],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,14],[32,11],[33,15],[3,64],[65,1],[4,64],[32,10],[32,11],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[71],[4,64],[12,1],[26],[11],[32,10],[32,11],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[33,10],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[32,10],[32,14],[70],[114],[4,64],[12,1],[26],[11],[32,10],[33,14],[32,11],[33,15],[12,1],[11],[11],[32,8],[65,127],[71],[4,64],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,17],[33,20],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,20],[17,12,0],[33,6],[26],[32,4],[32,5],[15],[26],[11],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[4,64],...internalThrow(_,'TypeError',`Cannot add property to inextensible object`),[26],[11],[32,0],[47,0,0],[33,22],[32,0],[32,22],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,22],[65,18],[108],[106],[34,8],[65,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_writeKey')],[65,14],[33,9],[5],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property with no setter of object`),[26],[11],[32,17],[33,23],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,23],[17,12,0],[33,6],[26],[32,4],[32,5],[15],[26],[11],[32,16],[65,8],[113],[69],[4,64],...internalThrow(_,'TypeError',`Cannot modify read-only property of object`),[26],[11],[32,16],[65,255,1],[113],[33,9],[11],[32,8],[32,4],[57,0,8],[32,8],[32,9],[32,5],[65,8],[116],[106],[59,0,16],[32,4],[32,5],[15]],
 params:[127,127,127,127,124,127],typedParams:1,returns:[124,127],
 locals:[127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","#last_type","hash","entryPtr","flags","proto","proto#type","#logicinner_tmp","#typeswitch_tmp1","lastProto","lastProto#type","tail","set","#call_val","#call_type","#indirect_5_callee","#swap","size","#indirect_6_callee"],
 table:1,usesTag:1,
@@ -150,7 +150,7 @@ params:[127,127],typedParams:1,returns:[127],returnType:2,
 locals:[],localNames:["entryPtr","entryPtr#type"],
 }
 this.__Porffor_object_expr_init = {
-wasm:(_,{i32ify,makeString,builtin})=>[[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,6],[33,1],[33,0],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,7],[32,0],[32,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[70],[4,64],[32,7],[65,243,234,249,189,126],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,"__proto__",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[32,1],[32,4],[252,2],[32,5],[16,builtin('__Porffor_object_setPrototype')],[15],[26],[11],[11],[32,0],[47,0,0],[33,9],[32,0],[32,9],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,9],[65,18],[108],[106],[34,8],[65,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_writeKey')],[11],[32,8],[32,4],[57,0,8],[32,8],[65,14],[32,5],[65,8],[116],[106],[59,0,16],[15]],
+wasm:(_,{i32ify,makeString,builtin})=>[[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,6],[33,1],[33,0],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,7],[32,0],[32,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[70],[4,64],[32,7],[65,248,187,246,154,2],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,"__proto__",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[32,1],[32,4],[252,2],[32,5],[16,builtin('__Porffor_object_setPrototype')],[15],[26],[11],[11],[32,0],[47,0,0],[33,9],[32,0],[32,9],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,9],[65,18],[108],[106],[34,8],[65,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_writeKey')],[11],[32,8],[32,4],[57,0,8],[32,8],[65,14],[32,5],[65,8],[116],[106],[59,0,16],[15]],
 params:[127,127,127,127,124,127],typedParams:1,returns:[],returnType:128,
 locals:[127,127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","#last_type","hash","entryPtr","size"],
 }

package/compiler/codegen.js

@@ -1391,7 +1391,18 @@ const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTy
   }
 
   if (table) funcs.table = true;
-  if (usesTag) ensureTag();
+  if (usesTag) {
+    if (Prefs.wasmExceptions === false) {
+      for (let i = 0; i < wasm.length; i++) {
+        const inst = wasm[i];
+        if (inst[0] === Opcodes.throw) {
+          wasm.splice(i, 1, ...generateThrow(func, {}));
+        }
+      }
+    } else {
+      ensureTag();
+    }
+  }
 
   if (returnTypes) {
     for (const x of returnTypes) typeUsed(func, x);
@@ -5279,6 +5290,14 @@ const ensureTag = (exceptionMode = Prefs.exceptionMode ?? 'stack') => {
 };
 
 const generateThrow = (scope, decl) => {
+  if (Prefs.wasmExceptions === false) {
+    return [
+      ...(scope.returns.length === 0 ? [] : [ number(0, scope.returns[0]) ]),
+      ...(scope.returns.length === 0 || scope.returnType != null ? [] : [ number(0, scope.returns[1]) ]),
+      [ Opcodes.return ]
+    ];
+  }
+
   let exceptionMode = Prefs.exceptionMode ?? 'stack';
   if (globalThis.precompile) exceptionMode = decl.argument.callee != null ? 'lut' : 'stack';
   ensureTag(exceptionMode);
@@ -6392,6 +6411,11 @@ const generateTaggedTemplate = (scope, decl, global = false, name = undefined, v
               return funcIndex[x];
             }
 
+            if (Object.hasOwn(importedFuncs, x)) {
+              scope.usesImports = true;
+              return importedFuncs[x];
+            }
+
             return scope.locals[x]?.idx ?? globals[x]?.idx ?? (log.warning('codegen', `unknown immediate in Porffor.wasm: ${x}`) || 0);
           }
 

package/compiler/index.js

@@ -33,6 +33,7 @@ let progressLines = 0, progressInterval;
 let spinner = ['-', '\\', '|', '/'], spin = 0;
 const progressStart = msg => {
   if (globalThis.onProgress) return;
+  if (!process.stdout.isTTY) return;
 
   const log = (extra, after) => {
     const pre = extra ? `${extra}` : spinner[spin++ % 4];
@@ -49,11 +50,12 @@ const progressDone = (msg, start) => {
   clearInterval(progressInterval);
 
   const timeStr = (performance.now() - start).toFixed(0);
-  console.log(`\r${' '.repeat(60)}\r\u001b[2m${' '.repeat(10 - timeStr.length)}${timeStr}ms\u001b[0m  \u001b[92m${msg}\u001b[0m`);
+  console.log(`${process.stdout.isTTY ? `\r${' '.repeat(60)}\r` : ''}\u001b[2m${' '.repeat(10 - timeStr.length)}${timeStr}ms\u001b[0m  \u001b[92m${msg}\u001b[0m`);
   progressLines++;
 };
 const progressClear = () => {
   if (globalThis.onProgress) return;
+  if (!process.stdout.isTTY) return;
 
   process.stdout.write(`\u001b[${progressLines}F\u001b[0J`);
   progressLines = 0;

package/compiler/log.js

@@ -12,5 +12,5 @@ const areaColors = {
   wrap: [ 250, 100, 20 ]
 };
 
-export const log = (area, ...args) => console.log(`\u001b[90m[\u001b[0m${rgb(...areaColors[area], area)}\u001b[90m]\u001b[0m`, ...args);
+export const log = (area, ...args) => console.log(`\u001b[90m[\u001b[0m${rgb(...areaColors[area] ?? areaColors.parse, area)}\u001b[90m]\u001b[0m`, ...args);
 log.warning = (area, ...args) => log(area, '\u001b[93m' + args[0], ...args.slice(1), '\u001b[0m');

package/foo.js

@@ -1,17 +1 @@
-import compile from './compiler/wrap.js';
-import { Worker, isMainThread } from 'node:worker_threads';
-
-import { join } from 'node:path';
-const __dirname = import.meta.dirname;
-const __filename = join(__dirname, 'foo.js');
-
-if (isMainThread) {
-  const worker = new Worker(__filename);
-} else {
-  for (let i = 0; i < 500; i++) {
-    const js = `console.log(globalThis);`;
-    const out = compile(js);
-    out.exports.main();
-    console.log(i);
-  }
-}
+console.log(await Promise.resolve(5));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.57.21",
+  "version": "0.57.22",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/richards_direct.js

@@ -0,0 +1,558 @@
+// Copyright 2006-2008 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This is a JavaScript implementation of the Richards
+// benchmark from:
+//
+//    http://www.cl.cam.ac.uk/~mr10/Bench.html
+//
+// The benchmark was originally implemented in BCPL by
+// Martin Richards.
+
+/**
+ * The Richards benchmark simulates the task dispatcher of an
+ * operating system.
+ **/
+function runRichards() {
+  var scheduler = new Scheduler();
+  scheduler_addIdleTask.call(scheduler, ID_IDLE, 0, null, COUNT);
+
+  var queue = new Packet(null, ID_WORKER, KIND_WORK);
+  queue = new Packet(queue, ID_WORKER, KIND_WORK);
+  scheduler_addWorkerTask.call(scheduler, ID_WORKER, 1000, queue);
+
+  queue = new Packet(null, ID_DEVICE_A, KIND_DEVICE);
+  queue = new Packet(queue, ID_DEVICE_A, KIND_DEVICE);
+  queue = new Packet(queue, ID_DEVICE_A, KIND_DEVICE);
+  scheduler_addHandlerTask.call(scheduler, ID_HANDLER_A, 2000, queue);
+
+  queue = new Packet(null, ID_DEVICE_B, KIND_DEVICE);
+  queue = new Packet(queue, ID_DEVICE_B, KIND_DEVICE);
+  queue = new Packet(queue, ID_DEVICE_B, KIND_DEVICE);
+  scheduler_addHandlerTask.call(scheduler, ID_HANDLER_B, 3000, queue);
+
+  scheduler_addDeviceTask.call(scheduler, ID_DEVICE_A, 4000, null);
+
+  scheduler_addDeviceTask.call(scheduler, ID_DEVICE_B, 5000, null);
+
+  scheduler_schedule.call(scheduler);
+
+  if (scheduler.queueCount != EXPECTED_QUEUE_COUNT || scheduler.holdCount != EXPECTED_HOLD_COUNT) {
+    var msg =
+      "Error during execution: queueCount = " + scheduler.queueCount + ", holdCount = " + scheduler.holdCount + ".";
+    throw new Error(msg);
+  }
+}
+
+var COUNT = 1000;
+
+/**
+ * These two constants specify how many times a packet is queued and
+ * how many times a task is put on hold in a correct run of richards.
+ * They don't have any meaning a such but are characteristic of a
+ * correct run so if the actual queue or hold count is different from
+ * the expected there must be a bug in the implementation.
+ **/
+var EXPECTED_QUEUE_COUNT = 2322;
+var EXPECTED_HOLD_COUNT = 928;
+
+/**
+ * A scheduler can be used to schedule a set of tasks based on their relative
+ * priorities.  Scheduling is done by maintaining a list of task control blocks
+ * which holds tasks and the data queue they are processing.
+ * @constructor
+ */
+function Scheduler() {
+  this.queueCount = 0;
+  this.holdCount = 0;
+  this.blocks = new Array(NUMBER_OF_IDS);
+  this.list = null;
+  this.currentTcb = null;
+  this.currentId = null;
+}
+
+var ID_IDLE = 0;
+var ID_WORKER = 1;
+var ID_HANDLER_A = 2;
+var ID_HANDLER_B = 3;
+var ID_DEVICE_A = 4;
+var ID_DEVICE_B = 5;
+var NUMBER_OF_IDS = 6;
+
+var KIND_DEVICE = 0;
+var KIND_WORK = 1;
+
+/**
+ * Add an idle task to this scheduler.
+ * @param {int} id the identity of the task
+ * @param {int} priority the task's priority
+ * @param {Packet} queue the queue of work to be processed by the task
+ * @param {int} count the number of times to schedule the task
+ */
+function scheduler_addIdleTask(id, priority, queue, count) {
+  scheduler_addRunningTask.call(this, id, priority, queue, new IdleTask(this, 1, count));
+};
+
+/**
+ * Add a work task to this scheduler.
+ * @param {int} id the identity of the task
+ * @param {int} priority the task's priority
+ * @param {Packet} queue the queue of work to be processed by the task
+ */
+function scheduler_addWorkerTask(id, priority, queue) {
+  scheduler_addTask.call(this, id, priority, queue, new WorkerTask(this, ID_HANDLER_A, 0));
+};
+
+/**
+ * Add a handler task to this scheduler.
+ * @param {int} id the identity of the task
+ * @param {int} priority the task's priority
+ * @param {Packet} queue the queue of work to be processed by the task
+ */
+function scheduler_addHandlerTask(id, priority, queue) {
+  scheduler_addTask.call(this, id, priority, queue, new HandlerTask(this));
+};
+
+/**
+ * Add a handler task to this scheduler.
+ * @param {int} id the identity of the task
+ * @param {int} priority the task's priority
+ * @param {Packet} queue the queue of work to be processed by the task
+ */
+function scheduler_addDeviceTask(id, priority, queue) {
+  scheduler_addTask.call(this, id, priority, queue, new DeviceTask(this));
+};
+
+/**
+ * Add the specified task and mark it as running.
+ * @param {int} id the identity of the task
+ * @param {int} priority the task's priority
+ * @param {Packet} queue the queue of work to be processed by the task
+ * @param {Task} task the task to add
+ */
+function scheduler_addRunningTask(id, priority, queue, task) {
+  scheduler_addTask.call(this, id, priority, queue, task);
+  tcb_setRunning.call(this.currentTcb);
+};
+
+/**
+ * Add the specified task to this scheduler.
+ * @param {int} id the identity of the task
+ * @param {int} priority the task's priority
+ * @param {Packet} queue the queue of work to be processed by the task
+ * @param {Task} task the task to add
+ */
+function scheduler_addTask(id, priority, queue, task) {
+  this.currentTcb = new TaskControlBlock(this.list, id, priority, queue, task);
+  this.list = this.currentTcb;
+  this.blocks[id] = this.currentTcb;
+};
+
+/**
+ * Execute the tasks managed by this scheduler.
+ */
+function scheduler_schedule() {
+  this.currentTcb = this.list;
+  while (this.currentTcb != null) {
+    if (tcb_isHeldOrSuspended.call(this.currentTcb)) {
+      this.currentTcb = this.currentTcb.link;
+    } else {
+      this.currentId = this.currentTcb.id;
+      this.currentTcb = tcb_run.call(this.currentTcb);
+    }
+  }
+};
+
+/**
+ * Release a task that is currently blocked and return the next block to run.
+ * @param {int} id the id of the task to suspend
+ */
+function scheduler_release(id) {
+  var tcb = this.blocks[id];
+  if (tcb == null) return tcb;
+  tcb_markAsNotHeld.call(tcb);
+  if (tcb.priority > this.currentTcb.priority) {
+    return tcb;
+  } else {
+    return this.currentTcb;
+  }
+};
+
+/**
+ * Block the currently executing task and return the next task control block
+ * to run.  The blocked task will not be made runnable until it is explicitly
+ * released, even if new work is added to it.
+ */
+function scheduler_holdCurrent() {
+  this.holdCount++;
+  tcb_markAsHeld.call(this.currentTcb);
+  return this.currentTcb.link;
+};
+
+/**
+ * Suspend the currently executing task and return the next task control block
+ * to run.  If new work is added to the suspended task it will be made runnable.
+ */
+function scheduler_suspendCurrent() {
+  tcb_markAsSuspended.call(this.currentTcb);
+  return this.currentTcb;
+};
+
+/**
+ * Add the specified packet to the end of the worklist used by the task
+ * associated with the packet and make the task runnable if it is currently
+ * suspended.
+ * @param {Packet} packet the packet to add
+ */
+function scheduler_queue(packet) {
+  var t = this.blocks[packet.id];
+  if (t == null) return t;
+  this.queueCount++;
+  packet.link = null;
+  packet.id = this.currentId;
+  return tcb_checkPriorityAdd.call(t, this.currentTcb, packet);
+};
+
+/**
+ * A task control block manages a task and the queue of work packages associated
+ * with it.
+ * @param {TaskControlBlock} link the preceding block in the linked block list
+ * @param {int} id the id of this block
+ * @param {int} priority the priority of this block
+ * @param {Packet} queue the queue of packages to be processed by the task
+ * @param {Task} task the task
+ * @constructor
+ */
+function TaskControlBlock(link, id, priority, queue, task) {
+  this.link = link;
+  this.id = id;
+  this.priority = priority;
+  this.queue = queue;
+  this.task = task;
+  if (queue == null) {
+    this.state = STATE_SUSPENDED;
+  } else {
+    this.state = STATE_SUSPENDED_RUNNABLE;
+  }
+}
+
+/**
+ * The task is running and is currently scheduled.
+ */
+var STATE_RUNNING = 0;
+
+/**
+ * The task has packets left to process.
+ */
+var STATE_RUNNABLE = 1;
+
+/**
+ * The task is not currently running.  The task is not blocked as such and may
+ * be started by the scheduler.
+ */
+var STATE_SUSPENDED = 2;
+
+/**
+ * The task is blocked and cannot be run until it is explicitly released.
+ */
+var STATE_HELD = 4;
+
+var STATE_SUSPENDED_RUNNABLE = STATE_SUSPENDED | STATE_RUNNABLE;
+var STATE_NOT_HELD = ~STATE_HELD;
+
+function tcb_setRunning() {
+  this.state = STATE_RUNNING;
+};
+
+function tcb_markAsNotHeld() {
+  this.state = this.state & STATE_NOT_HELD;
+};
+
+function tcb_markAsHeld() {
+  this.state = this.state | STATE_HELD;
+};
+
+function tcb_isHeldOrSuspended() {
+  return (this.state & STATE_HELD) != 0 || this.state == STATE_SUSPENDED;
+};
+
+function tcb_markAsSuspended() {
+  this.state = this.state | STATE_SUSPENDED;
+};
+
+function tcb_markAsRunnable() {
+  this.state = this.state | STATE_RUNNABLE;
+};
+
+/**
+ * Runs this task, if it is ready to be run, and returns the next task to run.
+ */
+function tcb_run() {
+  var packet;
+  if (this.state == STATE_SUSPENDED_RUNNABLE) {
+    packet = this.queue;
+    this.queue = packet.link;
+    if (this.queue == null) {
+      this.state = STATE_RUNNING;
+    } else {
+      this.state = STATE_RUNNABLE;
+    }
+  } else {
+    packet = null;
+  }
+  // Note: This remains a dynamic dispatch call as the task type isn't
+  // known statically here.
+  return this.task.run(packet);
+};
+
+/**
+ * Adds a packet to the worklist of this block's task, marks this as runnable if
+ * necessary, and returns the next runnable object to run (the one
+ * with the highest priority).
+ */
+function tcb_checkPriorityAdd(task, packet) {
+  if (this.queue == null) {
+    this.queue = packet;
+    tcb_markAsRunnable.call(this);
+    if (this.priority > task.priority) return this;
+  } else {
+    this.queue = packet_addTo.call(packet, this.queue);
+  }
+  return task;
+};
+
+function tcb_toString() {
+  return "tcb { " + this.task + "@" + this.state + " }";
+};
+
+/**
+ * An idle task doesn't do any work itself but cycles control between the two
+ * device tasks.
+ * @param {Scheduler} scheduler the scheduler that manages this task
+ * @param {int} v1 a seed value that controls how the device tasks are scheduled
+ * @param {int} count the number of times this task should be scheduled
+ * @constructor
+ */
+function IdleTask(scheduler, v1, count) {
+  this.scheduler = scheduler;
+  this.v1 = v1;
+  this.count = count;
+}
+
+function idleTask_run(packet) {
+  this.count--;
+  if (this.count == 0) return scheduler_holdCurrent.call(this.scheduler);
+  if ((this.v1 & 1) == 0) {
+    this.v1 = this.v1 >> 1;
+    return scheduler_release.call(this.scheduler, ID_DEVICE_A);
+  } else {
+    this.v1 = (this.v1 >> 1) ^ 0xd008;
+    return scheduler_release.call(this.scheduler, ID_DEVICE_B);
+  }
+};
+// Assign the run method to the prototype for dynamic dispatch in tcb_run
+IdleTask.prototype.run = idleTask_run;
+
+
+function idleTask_toString() {
+  return "IdleTask";
+};
+IdleTask.prototype.toString = idleTask_toString;
+
+/**
+ * A task that suspends itself after each time it has been run to simulate
+ * waiting for data from an external device.
+ * @param {Scheduler} scheduler the scheduler that manages this task
+ * @constructor
+ */
+function DeviceTask(scheduler) {
+  this.scheduler = scheduler;
+  this.v1 = null;
+}
+
+function deviceTask_run(packet) {
+  if (packet == null) {
+    if (this.v1 == null) return scheduler_suspendCurrent.call(this.scheduler);
+    var v = this.v1;
+    this.v1 = null;
+    return scheduler_queue.call(this.scheduler, v);
+  } else {
+    this.v1 = packet;
+    return scheduler_holdCurrent.call(this.scheduler);
+  }
+};
+// Assign the run method to the prototype for dynamic dispatch in tcb_run
+DeviceTask.prototype.run = deviceTask_run;
+
+
+function deviceTask_toString() {
+  return "DeviceTask";
+};
+DeviceTask.prototype.toString = deviceTask_toString;
+
+/**
+ * A task that manipulates work packets.
+ * @param {Scheduler} scheduler the scheduler that manages this task
+ * @param {int} v1 a seed used to specify how work packets are manipulated
+ * @param {int} v2 another seed used to specify how work packets are manipulated
+ * @constructor
+ */
+function WorkerTask(scheduler, v1, v2) {
+  this.scheduler = scheduler;
+  this.v1 = v1;
+  this.v2 = v2;
+}
+
+function workerTask_run(packet) {
+  if (packet == null) {
+    return scheduler_suspendCurrent.call(this.scheduler);
+  } else {
+    if (this.v1 == ID_HANDLER_A) {
+      this.v1 = ID_HANDLER_B;
+    } else {
+      this.v1 = ID_HANDLER_A;
+    }
+    packet.id = this.v1;
+    packet.a1 = 0;
+    for (var i = 0; i < DATA_SIZE; i++) {
+      this.v2++;
+      if (this.v2 > 26) this.v2 = 1;
+      packet.a2[i] = this.v2;
+    }
+    return scheduler_queue.call(this.scheduler, packet);
+  }
+};
+// Assign the run method to the prototype for dynamic dispatch in tcb_run
+WorkerTask.prototype.run = workerTask_run;
+
+
+function workerTask_toString() {
+  return "WorkerTask";
+};
+WorkerTask.prototype.toString = workerTask_toString;
+
+/**
+ * A task that manipulates work packets and then suspends itself.
+ * @param {Scheduler} scheduler the scheduler that manages this task
+ * @constructor
+ */
+function HandlerTask(scheduler) {
+  this.scheduler = scheduler;
+  this.v1 = null;
+  this.v2 = null;
+}
+
+function handlerTask_run(packet) {
+  if (packet != null) {
+    if (packet.kind == KIND_WORK) {
+      this.v1 = packet_addTo.call(packet, this.v1);
+    } else {
+      this.v2 = packet_addTo.call(packet, this.v2);
+    }
+  }
+  if (this.v1 != null) {
+    var count = this.v1.a1;
+    var v;
+    if (count < DATA_SIZE) {
+      if (this.v2 != null) {
+        v = this.v2;
+        this.v2 = this.v2.link;
+        v.a1 = this.v1.a2[count];
+        this.v1.a1 = count + 1;
+        return scheduler_queue.call(this.scheduler, v);
+      }
+    } else {
+      v = this.v1;
+      this.v1 = this.v1.link;
+      return scheduler_queue.call(this.scheduler, v);
+    }
+  }
+  return scheduler_suspendCurrent.call(this.scheduler);
+};
+// Assign the run method to the prototype for dynamic dispatch in tcb_run
+HandlerTask.prototype.run = handlerTask_run;
+
+
+function handlerTask_toString() {
+  return "HandlerTask";
+};
+HandlerTask.prototype.toString = handlerTask_toString;
+
+
+/* --- *
+ * P a c k e t
+ * --- */
+
+var DATA_SIZE = 4;
+
+/**
+ * A simple package of data that is manipulated by the tasks.  The exact layout
+ * of the payload data carried by a packet is not importaint, and neither is the
+ * nature of the work performed on packets by the tasks.
+ *
+ * Besides carrying data, packets form linked lists and are hence used both as
+ * data and worklists.
+ * @param {Packet} link the tail of the linked list of packets
+ * @param {int} id an ID for this packet
+ * @param {int} kind the type of this packet
+ * @constructor
+ */
+function Packet(link, id, kind) {
+  this.link = link;
+  this.id = id;
+  this.kind = kind;
+  this.a1 = 0;
+  this.a2 = new Array(DATA_SIZE);
+}
+
+/**
+ * Add this packet to the end of a worklist, and return the worklist.
+ * @param {Packet} queue the worklist to add this packet to
+ */
+function packet_addTo(queue) {
+  this.link = null;
+  if (queue == null) return this;
+  var peek,
+    next = queue;
+  while ((peek = next.link) != null) next = peek;
+  next.link = this;
+  return queue;
+};
+
+
+function packet_toString() {
+  return "Packet";
+};
+Packet.prototype.toString = packet_toString;
+
+
+const start = Date.now();
+for (let i = 0; i < 100; i++) {
+  runRichards();
+}
+
+console.log(Date.now() - start);

package/runtime/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.57.21';
+globalThis.version = '0.57.22';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/r.js

@@ -1,243 +0,0 @@
-function isConfigurable(obj, name) {
-  if (Object.hasOwn(obj, name)) return Object.getOwnPropertyDescriptor(obj, name).configurable;
-  return true;
-}
-
-function isEnumerable(obj, name) {
-  return Object.hasOwn(obj, name) && Object.getOwnPropertyDescriptor(obj, name).enumerable;
-}
-
-function isSameValue(a, b) {
-  if (a === 0 && b === 0) return 1 / a === 1 / b;
-  if (a !== a && b !== b) return true;
-
-  return a === b;
-}
-
-function isWritable(obj, name, verifyProp, value) {
-  if (Object.hasOwn(obj, name) && Object.getOwnPropertyDescriptor(obj, name).writable != null) return Object.getOwnPropertyDescriptor(obj, name).writable;
-  if (!Object.hasOwn(obj, name) && Object.isExtensible(obj)) return true;
-
-  var unlikelyValue = Array.isArray(obj) && name === "length" ?
-    Math.pow(2, 32) - 1 :
-    "unlikelyValue";
-  var newValue = value || unlikelyValue;
-  var hadValue = Object.hasOwn(obj, name);
-  var oldValue = obj[name];
-  var writeSucceeded;
-
-  try {
-    obj[name] = newValue;
-  } catch {}
-
-  writeSucceeded = isSameValue(obj[verifyProp || name], newValue);
-
-  if (writeSucceeded) {
-    if (hadValue) {
-      obj[name] = oldValue;
-    } else {
-      delete obj[name];
-    }
-  }
-
-  return writeSucceeded;
-}
-
-function verifyProperty(obj, name, desc, options) {
-  var originalDesc = Object.getOwnPropertyDescriptor(obj, name);
-
-  if (desc === undefined) {
-    if (originalDesc !== undefined) {
-      throw new Test262Error('verifyProperty: expected undefined descriptor');
-    }
-
-    return true;
-  }
-
-  if (!Object.hasOwn(obj, name)) throw new Test262Error('verifyProperty: obj should have own property');
-
-  if (Object.hasOwn(desc, 'value')) {
-    const v = desc.value;
-    if (!isSameValue(originalDesc.value, v)) throw new Test262Error('verifyProperty: descriptor value mismatch');
-    // if (!isSameValue(obj[name], v)) throw new Test262Error('verifyProperty: object value mismatch');
-  }
-
-  if (Object.hasOwn(desc, 'enumerable')) {
-    if (desc.enumerable !== originalDesc.enumerable ||
-        desc.enumerable !== isEnumerable(obj, name)) {
-      throw new Test262Error('enumerable fail');
-    }
-  }
-
-  if (Object.hasOwn(desc, 'writable')) {
-    if (desc.writable !== originalDesc.writable ||
-        desc.writable !== isWritable(obj, name)) {
-      throw new Test262Error('writable fail');
-    }
-  }
-
-  if (Object.hasOwn(desc, 'configurable')) {
-    if (desc.configurable !== originalDesc.configurable ||
-        desc.configurable !== isConfigurable(obj, name)) {
-      throw new Test262Error('configurable fail');
-    }
-  }
-
-  if (options && options.restore) {
-    Object.defineProperty(obj, name, originalDesc);
-  }
-
-  return true;
-}
-
-function verifyEqualTo(obj, name, value) {
-  if (!isSameValue(obj[name], value)) {
-    throw new Test262Error('propertyHelper verifyEqualTo failed');
-  }
-}
-
-function verifyWritable(obj, name, verifyProp, value) {
-  if (!verifyProp) {
-    if (!Object.getOwnPropertyDescriptor(obj, name).writable)
-      throw new Test262Error('propertyHelper verifyWritable failed');
-  }
-
-  if (!isWritable(obj, name, verifyProp, value)) {
-    throw new Test262Error('propertyHelper verifyWritable failed');
-  }
-}
-
-function verifyNotWritable(obj, name, verifyProp, value) {
-  if (!verifyProp) {
-    if (Object.getOwnPropertyDescriptor(obj, name).writable)
-      throw new Test262Error('propertyHelper verifyNotWritable failed');
-  }
-
-  if (isWritable(obj, name, verifyProp)) {
-    throw new Test262Error('propertyHelper verifyNotWritable failed');
-  }
-}
-
-function verifyEnumerable(obj, name) {
-  if (!isEnumerable(obj, name)) {
-    throw new Test262Error('propertyHelper verifyEnumerable failed');
-  }
-}
-
-function verifyNotEnumerable(obj, name) {
-  if (isEnumerable(obj, name)) {
-    throw new Test262Error('propertyHelper verifyNotEnumerable failed');
-  }
-}
-
-function verifyConfigurable(obj, name) {
-  if (!isConfigurable(obj, name)) {
-    throw new Test262Error('propertyHelper verifyConfigurable failed');
-  }
-}
-
-function verifyNotConfigurable(obj, name) {
-  if (isConfigurable(obj, name)) {
-    throw new Test262Error('propertyHelper verifyNotConfigurable failed');
-  }
-}
-var assert = mustBeTrue => {
-  if (mustBeTrue === true) {
-    return;
-  }
-
-  throw new Test262Error('assert failed');
-};
-assert; // idk why exactly but this fixes many tests by forcing indirect ref
-
-var __assert_throws = (expectedErrorConstructor, func) => {
-  if (typeof func !== 'function') {
-    throw new Test262Error('assert.throws invoked with a non-function value');
-  }
-
-  try {
-    func();
-  } catch {
-    return;
-  }
-
-  throw new Test262Error('assert.throws failed');
-};
-
-var __assert__isSameValue = (a, b) => {
-  if (a === b) {
-    // Handle +/-0 vs. -/+0
-    return a !== 0 || 1 / a === 1 / b;
-  }
-
-  // Handle NaN vs. NaN
-  return a !== a && b !== b;
-};
-
-var __assert_sameValue = (actual, expected) => {
-  if (assert._isSameValue(actual, expected)) {
-    return;
-  }
-
-  throw new Test262Error('assert.sameValue failed');
-};
-
-var __assert_notSameValue = (actual, unexpected) => {
-  if (!assert._isSameValue(actual, unexpected)) {
-    return;
-  }
-
-  throw new Test262Error('assert.notSameValue failed');
-};
-// define our $262 here too
-// var $262 = {
-//   global: globalThis,
-//   gc() { /* noop */ },
-//   detachArrayBuffer(buffer) {
-//     return Porffor.arraybuffer.detach(buffer);
-//   },
-//   getGlobal(name) {
-//     return globalThis[name];
-//   },
-//   // todo: setGlobal
-//   destroy() { /* noop */ },
-//   agent: {}
-// };
-
-// function Test262Error(message) {
-//   this.message = message;
-//   this.name = 'Test262Error';
-// }
-
-// var __Test262Error_thrower = message => {
-//   throw new Test262Error(message);
-// };
-
-var $DONOTEVALUATE = () => {
-  throw 'Test262: This statement should not be evaluated.';
-};
-// Copyright (C) 2019 Aleksey Shvayka. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-array-constructor
-description: >
-  Property descriptor of Array
-info: |
-  22.1.1 The Array Constructor
-
-  * is the initial value of the Array property of the global object.
-
-  17 ECMAScript Standard Built-in Objects
-
-  Every other data property described in clauses 18 through 26 and in Annex B.2
-  has the attributes { [[Writable]]: true, [[Enumerable]]: false,
-  [[Configurable]]: true } unless otherwise specified.
-includes: [propertyHelper.js]
----*/
-
-verifyProperty(this, 'Array', {
-  value: Array,
-  writable: true,
-  enumerable: false,
-  configurable: true,
-});