porffor 0.34.10 → 0.34.12

package/README.md

@@ -1,5 +1,5 @@
 # Porffor &nbsp;<sup><sub>/ˈpɔrfɔr/ &nbsp;*(poor-for)*</sup></sub>
-A from-scratch experimental **AOT** optimizing JS/TS -> Wasm/C engine/compiler/runtime in JS. Not serious/intended for (real) use.<br>
+A from-scratch experimental **AOT** optimizing JS/TS -> Wasm/C engine/compiler/runtime in JS. Research project, not yet intended for serious use.<br>
 
 <img src="https://github.com/CanadaHonk/porffor/assets/19228318/de8ad753-8ce3-4dcd-838e-f4d49452f8f8" alt="Screenshot of terminal showing Porffor running and compiling a hello world" width="60%">
 
@@ -279,7 +279,6 @@ No particular order and no guarentees, just what could happen soon™
   - Support memory
   - Support exceptions
 - Exceptions
-  - `try { } finally { }`
   - Rethrowing inside catch
 - Optimizations
   - Rewrite local indexes per func for smallest local header and remove unused idxs
@@ -323,8 +322,7 @@ Porffor intentionally does not use Wasm proposals which are not commonly impleme
 `purple` in Welsh is `porffor`. Why purple?
 - No other JS engine is purple colored
 - Purple is pretty cool
-- Purple apparently represents "ambition", which is.. one word to describe this project
-- The hard to speak name is also the noise your brain makes in reaction to this idea!
+- Purple apparently represents "ambition", which is one word to describe this project
 
 ### 2. Why at all?
 Yes!

package/compiler/builtins/string.ts

@@ -1146,8 +1146,9 @@ local.set ${x}`;
   return out;
 };
 
-export const __String_prototype_repeat = (_this: string, count: number) => {
+export const __String_prototype_repeat = (_this: string, cnt: any) => {
   let out: string = Porffor.allocate();
+  const count: number = ecma262.ToIntegerOrInfinity(cnt);
 
   count |= 0;
   if (count < 0) throw new RangeError('Invalid count value');
@@ -1179,8 +1180,9 @@ memory.copy 0 0`;
   return out;
 };
 
-export const __ByteString_prototype_repeat = (_this: string, count: number) => {
+export const __ByteString_prototype_repeat = (_this: string, cnt: any) => {
   let out: bytestring = Porffor.allocate();
+  const count: number = ecma262.ToIntegerOrInfinity(cnt);
 
   count |= 0;
   if (count < 0) throw new RangeError('Invalid count value');
@@ -1495,6 +1497,41 @@ export const __ByteString_prototype_localeCompare = (_this: bytestring, compareS
 };
 
 
+export const __String_prototype_isWellFormed = (_this: string) => {
+  let ptr: i32 = Porffor.wasm`local.get ${_this}`;
+  const endPtr: i32 = ptr + _this.length * 2;
+  while (ptr < endPtr) {
+    const c1: i32 = Porffor.wasm.i32.load16_u(ptr, 0, 4);
+
+    if (Porffor.fastAnd(c1 >= 0xDC00, c1 <= 0xDFFF)) {
+      // lone trailing surrogate, bad
+      return false;
+    }
+
+    if (Porffor.fastAnd(c1 >= 0xD800, c1 <= 0xDBFF)) {
+      // leading surrogate, peek if next is trailing
+      const c2: i32 = ptr + 2 < endPtr ? Porffor.wasm.i32.load16_u(ptr + 2, 0, 4) : 0;
+
+      if (Porffor.fastAnd(c2 >= 0xDC00, c2 <= 0xDFFF)) {
+        // next is trailing surrogate, skip it too
+        ptr += 2;
+      } else {
+        // lone leading surrogate, bad
+        return false;
+      }
+    }
+
+    ptr += 2;
+  }
+
+  return true;
+};
+
+export const __ByteString_prototype_isWellFormed = (_this: bytestring) => {
+  // bytestrings cannot have surrogates, so always true
+  return true;
+};
+
 export const __String_prototype_toWellFormed = (_this: string) => {
   let out: string = Porffor.allocate();
   Porffor.clone(_this, out);
@@ -1562,4 +1599,4 @@ export const __String_prototype_valueOf = (_this: string) => {
 export const __ByteString_prototype_valueOf = (_this: bytestring) => {
   // 1. Return ? ThisStringValue(this value).
   return _this;
-};
+};

package/compiler/builtins_precompiled.js

@@ -2224,14 +2224,14 @@ locals:[127,127,127,127,127,127,127,127,127,127,127],localNames:["_this","_this#
 hasRestArgument:1,
 };
 this.__String_prototype_repeat = {
-wasm:(_,{builtin,internalThrow})=>[[16,builtin('__Porffor_allocate')],[33,4],[32,2],[65,0],[114],[34,2],[65,0],[72],[4,64],...internalThrow(_,'RangeError',`Invalid count value`),[11],[32,0],[40,1,0],[65,2],[108],[33,5],[65,0],[33,6],[3,64],[32,6],[32,2],[72],[4,64],[32,4],[65,4],[106],[32,6],[32,5],[108],[106],[32,0],[65,4],[106],[32,5],[252,10,0,0],[32,6],[65,1],[106],[33,6],[12,1],[11],[11],[32,4],[32,5],[32,2],[108],[54,0,0],[32,4],[65,195,0],[15]],
+wasm:(_,{builtin,internalThrow})=>[[16,builtin('__Porffor_allocate')],[33,4],[32,2],[184],[32,3],[16,builtin('__ecma262_ToIntegerOrInfinity')],[33,6],[252,2],[34,5],[65,0],[114],[34,5],[65,0],[72],[4,64],...internalThrow(_,'RangeError',`Invalid count value`),[11],[32,0],[40,1,0],[65,2],[108],[33,7],[65,0],[33,8],[3,64],[32,8],[32,5],[72],[4,64],[32,4],[65,4],[106],[32,8],[32,7],[108],[106],[32,0],[65,4],[106],[32,7],[252,10,0,0],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[32,4],[32,7],[32,5],[108],[54,0,0],[32,4],[65,195,0],[15]],
 params:[127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
-locals:[127,127,127],localNames:["_this","_this#type","count","count#type","out","thisLen","i"],
+locals:[127,127,127,127,127],localNames:["_this","_this#type","cnt","cnt#type","out","count","#last_type","thisLen","i"],
 };
 this.__ByteString_prototype_repeat = {
-wasm:(_,{builtin,internalThrow})=>[[16,builtin('__Porffor_allocate')],[33,4],[32,2],[65,0],[114],[34,2],[65,0],[72],[4,64],...internalThrow(_,'RangeError',`Invalid count value`),[11],[32,0],[40,1,0],[33,5],[65,0],[33,6],[3,64],[32,6],[32,2],[72],[4,64],[32,4],[65,4],[106],[32,6],[32,5],[108],[106],[32,0],[65,4],[106],[32,5],[252,10,0,0],[32,6],[65,1],[106],[33,6],[12,1],[11],[11],[32,4],[32,5],[32,2],[108],[54,0,0],[32,4],[65,195,1],[15]],
+wasm:(_,{builtin,internalThrow})=>[[16,builtin('__Porffor_allocate')],[33,4],[32,2],[184],[32,3],[16,builtin('__ecma262_ToIntegerOrInfinity')],[33,6],[252,2],[34,5],[65,0],[114],[34,5],[65,0],[72],[4,64],...internalThrow(_,'RangeError',`Invalid count value`),[11],[32,0],[40,1,0],[33,7],[65,0],[33,8],[3,64],[32,8],[32,5],[72],[4,64],[32,4],[65,4],[106],[32,8],[32,7],[108],[106],[32,0],[65,4],[106],[32,7],[252,10,0,0],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[32,4],[32,7],[32,5],[108],[54,0,0],[32,4],[65,195,1],[15]],
 params:[127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
-locals:[127,127,127],localNames:["_this","_this#type","count","count#type","out","thisLen","i"],
+locals:[127,127,127,127,127],localNames:["_this","_this#type","cnt","cnt#type","out","count","#last_type","thisLen","i"],
 };
 this.__String_prototype_split = {
 wasm:(_,{builtin,internalThrow})=>[[16,builtin('__Porffor_allocate')],[33,6],[65,0],[33,7],[65,195,0],[33,8],[32,5],[65,128,1],[70],[4,64],[65,255,255,255,255,7],[34,4],[65,1],[33,5],[26],[11],[32,4],[65,0],[114],[34,4],[65,1],[33,5],[26],[32,4],[65,0],[72],[4,64],[65,255,255,255,255,7],[34,4],[65,1],[33,5],[26],[11],[16,builtin('__Porffor_allocate')],[33,9],[65,0],[33,10],[32,0],[40,1,0],[65,2],[108],[33,11],[32,2],[40,1,0],[34,12],[65,1],[70],[4,64],[32,2],[34,15],[40,1,0],[33,14],[32,3],[33,18],[2,127],[32,18],[65,195,0],[70],[4,64,"TYPESWITCH|String"],[2,127],[65,0],[34,16],[32,14],[78],[4,64],[65,127],[12,1],[11],[32,16],[65,2],[108],[32,15],[106],[47,0,4],[65,1],[33,17],[11],[12,1],[11],[32,18],[65,195,1],[70],[4,64,"TYPESWITCH|ByteString"],[2,127],[65,0],[34,16],[32,14],[78],[4,64],[65,127],[12,1],[11],[32,16],[32,15],[106],[45,0,4],[65,1],[33,17],[11],[12,1],[11],...internalThrow(_,'TypeError',`'charCodeAt' proto func tried to be called on a type without an impl`),[11,"TYPESWITCH_end"],[33,13],[65,0],[33,19],[3,64],[32,19],[32,11],[72],[4,64],[2,64],[32,0],[32,19],[106],[47,0,4],[34,20],[32,13],[70],[4,64],[32,7],[32,4],[78],[4,64],[32,6],[34,22],[32,7],[34,21],[54,1,0],[32,6],[65,208,0],[15],[11],[32,9],[34,22],[32,10],[34,21],[54,1,0],[32,6],[32,7],[65,9],[108],[106],[32,9],[184],[57,0,4],[32,6],[32,7],[65,9],[108],[106],[32,8],[58,0,12],[32,7],[65,1],[106],[33,7],[16,builtin('__Porffor_allocate')],[33,9],[65,0],[33,10],[12,1],[11],[32,9],[32,10],[65,2],[108],[106],[32,20],[59,0,4],[32,10],[65,1],[106],[33,10],[11],[32,19],[65,2],[106],[34,19],[12,1],[11],[11],[5],[65,0],[33,23],[65,0],[33,19],[3,64],[32,19],[32,11],[72],[4,64],[2,64],[32,0],[32,19],[106],[47,0,4],[34,20],[32,2],[34,15],[40,1,0],[33,14],[32,3],[33,18],[2,127],[32,18],[65,195,0],[70],[4,64,"TYPESWITCH|String"],[2,127],[32,23],[34,16],[32,14],[78],[4,64],[65,127],[12,1],[11],[32,16],[65,2],[108],[32,15],[106],[47,0,4],[65,1],[33,17],[11],[12,1],[11],[32,18],[65,195,1],[70],[4,64,"TYPESWITCH|ByteString"],[2,127],[32,23],[34,16],[32,14],[78],[4,64],[65,127],[12,1],[11],[32,16],[32,15],[106],[45,0,4],[65,1],[33,17],[11],[12,1],[11],...internalThrow(_,'TypeError',`'charCodeAt' proto func tried to be called on a type without an impl`),[11,"TYPESWITCH_end"],[70],[4,64],[32,23],[65,1],[106],[34,23],[32,12],[70],[4,64],[32,7],[32,4],[78],[4,64],[32,6],[34,22],[32,7],[34,21],[54,1,0],[32,6],[65,208,0],[15],[11],[32,9],[34,22],[32,10],[32,12],[65,1],[107],[107],[34,21],[54,1,0],[32,6],[32,7],[65,9],[108],[106],[32,9],[184],[57,0,4],[32,6],[32,7],[65,9],[108],[106],[32,8],[58,0,12],[32,7],[65,1],[106],[33,7],[16,builtin('__Porffor_allocate')],[33,9],[65,0],[33,10],[12,2],[11],[5],[65,0],[33,23],[11],[32,9],[32,10],[106],[32,20],[59,0,4],[32,10],[65,1],[106],[33,10],[11],[32,19],[65,2],[106],[34,19],[12,1],[11],[11],[11],[32,10],[65,0],[74],[34,24],[4,127],[32,7],[32,4],[72],[65,2],[33,17],[5],[32,24],[65,2],[33,17],[11],[33,25],[32,17],[33,18],[2,127],[32,18],[65,195,0],[70],[4,64,"TYPESWITCH|String"],[32,25],[40,1,0],[12,1],[11],[32,18],[65,195,1],[70],[4,64,"TYPESWITCH|ByteString"],[32,25],[40,1,0],[12,1],[11],[32,25],[11,"TYPESWITCH_end"],[4,64],[32,9],[34,22],[32,10],[34,21],[54,1,0],[32,6],[32,7],[65,9],[108],[106],[32,9],[184],[57,0,4],[32,6],[32,7],[65,9],[108],[106],[32,8],[58,0,12],[32,7],[65,1],[106],[33,7],[11],[32,6],[34,22],[32,7],[34,21],[54,1,0],[32,6],[65,208,0],[15]],
@@ -2253,6 +2253,16 @@ wasm:(_,{builtin,internalThrow})=>[[32,2],[184],[32,3],[16,builtin('__ecma262_To
 params:[127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
 locals:[127,127,127,127,127,127,127,127,127,127,127],localNames:["_this","_this#type","compareString","compareString#type","#last_type","thisLen","compareLen","maxLen","i","a","__proto_length_cache","__proto_pointer_cache","__charCodeAt_tmp","b","#typeswitch_tmp1"],
 };
+this.__String_prototype_isWellFormed = {
+wasm:()=>[[32,0],[34,2],[32,0],[40,1,0],[65,2],[108],[106],[33,3],[3,64],[32,2],[32,3],[72],[4,64],[32,2],[47,0,4],[34,4],[65,128,184,3],[78],[32,4],[65,255,191,3],[76],[113],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,128,176,3],[78],[32,4],[65,255,183,3],[76],[113],[4,64],[32,2],[65,2],[106],[32,3],[72],[4,127],[32,2],[65,2],[106],[47,0,4],[65,1],[33,6],[5],[65,0],[65,1],[33,6],[11],[34,5],[65,128,184,3],[78],[32,5],[65,255,191,3],[76],[113],[4,64],[32,2],[65,2],[106],[33,2],[5],[65,0],[65,2],[15],[11],[11],[32,2],[65,2],[106],[33,2],[12,1],[11],[11],[65,1],[65,2],[15]],
+params:[127,127],typedParams:1,returns:[127,127],typedReturns:1,
+locals:[127,127,127,127,127],localNames:["_this","_this#type","ptr","endPtr","c1","c2","#last_type"],
+};
+this.__ByteString_prototype_isWellFormed = {
+wasm:()=>[[65,1],[65,2],[15]],
+params:[127,127],typedParams:1,returns:[127,127],typedReturns:1,
+locals:[],localNames:["_this","_this#type"],
+};
 this.__String_prototype_toWellFormed = {
 wasm:(_,{builtin})=>[[16,builtin('__Porffor_allocate')],[33,2],[32,0],[32,2],[16,builtin('__Porffor_clone')],[32,2],[34,3],[32,2],[40,1,0],[65,2],[108],[106],[33,4],[3,64],[32,3],[32,4],[72],[4,64],[32,3],[47,0,4],[34,5],[65,128,184,3],[78],[32,5],[65,255,191,3],[76],[113],[4,64],[32,3],[65,253,255,3],[59,0,4],[11],[32,5],[65,128,176,3],[78],[32,5],[65,255,183,3],[76],[113],[4,64],[32,3],[65,2],[106],[32,4],[72],[4,127],[32,3],[65,2],[106],[47,0,4],[65,1],[33,7],[5],[65,0],[65,1],[33,7],[11],[34,6],[65,128,184,3],[78],[32,6],[65,255,191,3],[76],[113],[4,64],[32,3],[65,2],[106],[33,3],[5],[32,3],[65,253,255,3],[59,0,4],[11],[11],[32,3],[65,2],[106],[33,3],[12,1],[11],[11],[32,2],[65,195,0],[15]],
 params:[127,127],typedParams:1,returns:[127,127],typedReturns:1,

package/compiler/prototype.js

@@ -296,80 +296,6 @@ export const PrototypeFuncs = function() {
       // load current string ind {arg}
       [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
       Opcodes.i32_from_u
-    ],
-
-    isWellFormed: (pointer, length, _1, _2, iTmp, iTmp2) => [
-      // note: we cannot presume it begins as 0 in case it was used previously
-      ...pointer,
-      [ Opcodes.local_set, iTmp ],
-
-      // use cached length as end pointer
-      ...length.getCachedI32(),
-      ...number(ValtypeSize.i16, Valtype.i32),
-      [ Opcodes.i32_mul ],
-      ...pointer,
-      [ Opcodes.i32_add ],
-      ...length.setCachedI32(),
-
-      [ Opcodes.loop, Blocktype.void ],
-
-      [ Opcodes.block, Blocktype.void ],
-
-      [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
-      [ Opcodes.local_set, iTmp2 ],
-
-      // if not surrogate, continue
-      [ Opcodes.local_get, iTmp2 ],
-      ...number(0xF800, Valtype.i32),
-      [ Opcodes.i32_and ],
-      ...number(0xD800, Valtype.i32),
-      [ Opcodes.i32_ne ],
-      [ Opcodes.br_if, 0 ],
-
-      // if not leading surrogate, return false
-      [ Opcodes.local_get, iTmp2 ],
-      ...number(0xDC00, Valtype.i32),
-      [ Opcodes.i32_ge_s ],
-      [ Opcodes.if, Blocktype.void ],
-      ...number(0),
-      [ Opcodes.br, 3 ],
-      [ Opcodes.end ],
-
-      // if not followed by trailing surrogate, return false
-      [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 + ValtypeSize.i16 ],
-      ...number(0xFC00, Valtype.i32),
-      [ Opcodes.i32_and ],
-      ...number(0xDC00, Valtype.i32),
-      [ Opcodes.i32_ne ],
-      [ Opcodes.if, Blocktype.void ],
-      ...number(0),
-      [ Opcodes.br, 3 ],
-      [ Opcodes.end ],
-
-      // bump index again since gone through two valid chars
-      [ Opcodes.local_get, iTmp ],
-      ...number(ValtypeSize.i16, Valtype.i32),
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_set, iTmp ],
-
-      [ Opcodes.end ],
-
-      // bump pointer and loop if not at the end
-      [ Opcodes.local_get, iTmp ],
-      ...number(ValtypeSize.i16, Valtype.i32),
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_tee, iTmp ],
-
-      ...length.getCachedI32(), // end pointer
-      [ Opcodes.i32_ne ],
-      [ Opcodes.br_if, 0 ],
-
-      [ Opcodes.end ],
-
-      // return true
-      ...number(1)
     ]
   };
 
@@ -380,10 +306,6 @@ export const PrototypeFuncs = function() {
   this[TYPES.string].charCodeAt.local = Valtype.i32;
   this[TYPES.string].charCodeAt.noPointerCache = zeroChecks.charcodeat;
 
-  this[TYPES.string].isWellFormed.local = Valtype.i32;
-  this[TYPES.string].isWellFormed.local2 = Valtype.i32;
-  this[TYPES.string].isWellFormed.returnType = TYPES.boolean;
-
   if (Prefs.bytestring) {
     this[TYPES.bytestring] = {
       at: (pointer, length, wIndex, wType, iTmp, _, arrayShell) => {
@@ -499,11 +421,6 @@ export const PrototypeFuncs = function() {
         // load current string ind {arg}
         [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
         Opcodes.i32_from_u
-      ],
-
-      isWellFormed: () => [
-        // we know it must be true as it is a bytestring lol
-        ...number(1)
       ]
     };
 
@@ -513,9 +430,5 @@ export const PrototypeFuncs = function() {
     this[TYPES.bytestring].charCodeAt.returnType = TYPES.number;
     this[TYPES.bytestring].charCodeAt.local = Valtype.i32;
     this[TYPES.bytestring].charCodeAt.noPointerCache = zeroChecks.charcodeat;
-
-    this[TYPES.bytestring].isWellFormed.local = Valtype.i32;
-    this[TYPES.bytestring].isWellFormed.local2 = Valtype.i32;
-    this[TYPES.bytestring].isWellFormed.returnType = TYPES.boolean;
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.34.10+ab92b7b63",
+  "version": "0.34.12+a590b1020",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

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