porffor 0.56.1 → 0.56.3

package/bun.lock

@@ -4,7 +4,7 @@
     "": {
       "name": "porffor",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.14.1",
         "node-repl-polyfill": "github:CanadaHonk/node-repl-polyfill",
       },
       "optionalDependencies": {
@@ -23,7 +23,7 @@
 
     "@babel/types": ["@babel/types@7.26.9", "", { "dependencies": { "@babel/helper-string-parser": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9" } }, "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw=="],
 
-    "acorn": ["acorn@8.14.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="],
+    "acorn": ["acorn@8.14.1", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg=="],
 
     "hermes-estree": ["hermes-estree@0.18.2", "", {}, "sha512-KoLsoWXJ5o81nit1wSyEZnWUGy9cBna9iYMZBR7skKh7okYAYKqQ9/OczwpMHn/cH0hKDyblulGsJ7FknlfVxQ=="],
 

package/compiler/2c.js

@@ -728,8 +728,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           break;
 
         case Opcodes.drop:
-          // line(vals.pop());
-          vals.pop();
+          if (vals.length > 0) line(`(void) ${vals.pop()}`);
           break;
 
         case Opcodes.block:

package/compiler/allocator.js

@@ -29,6 +29,8 @@ export const allocPage = ({ scope, pages }, name) => {
 };
 
 export const allocBytes = ({ scope, pages }, reason, bytes) => {
+  bytes += 2; // overallocate by 2 bytes to ensure null termination
+
   const allocs = pages.allocs ??= new Map();
   const bins = pages.bins ??= [];
 

package/compiler/builtins/_internal_object.ts

@@ -522,10 +522,6 @@ export const __Porffor_object_accessorSet = (entryPtr: i32): Function|undefined
 
 export const __Porffor_object_lookup = (obj: any, target: any, targetHash: i32): i32 => {
   if (Porffor.wasm`local.get ${obj}` == 0) return -1;
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
-    obj = __Porffor_object_underlying(obj);
-    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return -1;
-  }
 
   let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
   const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
@@ -616,6 +612,7 @@ local.get ${obj+1}
 return`;
     }
 
+    if (Porffor.type(obj) != Porffor.TYPES.object) obj = __Porffor_object_underlying(obj);
     let lastProto: any = obj;
     while (true) {
       if ((entryPtr = __Porffor_object_lookup(obj, key, hash)) != -1) break;
@@ -630,6 +627,7 @@ local.set ${obj}
 i32.load8_u 0 3
 local.set ${obj+1}`;
       } else obj = __Porffor_object_getPrototype(obj);
+      if (Porffor.type(obj) != Porffor.TYPES.object) obj = __Porffor_object_underlying(obj);
 
       if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
       lastProto = obj;
@@ -691,11 +689,13 @@ export const __Porffor_object_set = (obj: any, key: any, value: any): any => {
     // check prototype chain for setter
     let proto: any = __Porffor_object_getPrototype(obj);
     if (proto != null) {
+      if (Porffor.type(proto) != Porffor.TYPES.object) proto = __Porffor_object_underlying(proto);
       let lastProto: any = proto;
       while (true) {
         if ((entryPtr = __Porffor_object_lookup(proto, key, hash)) != -1) break;
 
         proto = __Porffor_object_getPrototype(proto);
+        if (Porffor.type(proto) != Porffor.TYPES.object) proto = __Porffor_object_underlying(proto);
         if (Porffor.fastOr(proto == null, Porffor.wasm`local.get ${proto}` == Porffor.wasm`local.get ${lastProto}`)) break;
         lastProto = proto;
       }
@@ -795,11 +795,14 @@ export const __Porffor_object_setStrict = (obj: any, key: any, value: any): any
     // check prototype chain for setter
     let proto: any = __Porffor_object_getPrototype(obj);
     if (proto != null) {
+      if (Porffor.type(proto) != Porffor.TYPES.object) proto = __Porffor_object_underlying(proto);
+
       let lastProto: any = proto;
       while (true) {
         if ((entryPtr = __Porffor_object_lookup(proto, key, hash)) != -1) break;
 
         proto = __Porffor_object_getPrototype(proto);
+        if (Porffor.type(proto) != Porffor.TYPES.object) proto = __Porffor_object_underlying(proto);
         if (Porffor.fastOr(proto == null, Porffor.wasm`local.get ${proto}` == Porffor.wasm`local.get ${lastProto}`)) break;
         lastProto = proto;
       }

package/compiler/builtins/_internal_string.ts

@@ -1,34 +1,29 @@
 import type {} from './porffor.d.ts';
 
 export const __Porffor_compareStrings = (a: any, b: any): boolean => {
-  let at: i32 = Porffor.type(a);
-  let bt: i32 = Porffor.type(b);
-
-  if ((at | 0b10000000) != Porffor.TYPES.bytestring) {
+  if ((Porffor.type(a) | 0b10000000) != Porffor.TYPES.bytestring) {
     // a is not string or bytestring
     // check if it is bad type or value
     if (Porffor.fastOr(
       a == null,
 
-      at == Porffor.TYPES.symbol,
-      at == Porffor.TYPES.boolean
+      Porffor.type(a) == Porffor.TYPES.symbol,
+      Porffor.type(a) == Porffor.TYPES.boolean
     )) return false;
 
-    // todo/perf: just use a.toString()?
     a = ecma262.ToString(a);
   }
 
-  if ((bt | 0b10000000) != Porffor.TYPES.bytestring) {
+  if ((Porffor.type(b) | 0b10000000) != Porffor.TYPES.bytestring) {
     // b is not string or bytestring
     // check if it is bad type or value
     if (Porffor.fastOr(
       b == null,
 
-      bt == Porffor.TYPES.symbol,
-      bt == Porffor.TYPES.boolean
+      Porffor.type(b) == Porffor.TYPES.symbol,
+      Porffor.type(b) == Porffor.TYPES.boolean
     )) return false;
 
-    // todo/perf: just use b.toString()?
     b = ecma262.ToString(b);
   }
 
@@ -36,18 +31,13 @@ export const __Porffor_compareStrings = (a: any, b: any): boolean => {
 };
 
 export const __Porffor_concatStrings = (a: any, b: any): any => {
-  let at: i32 = Porffor.type(a);
-  let bt: i32 = Porffor.type(b);
-
-  if ((at | 0b10000000) != Porffor.TYPES.bytestring) {
+  if ((Porffor.type(a) | 0b10000000) != Porffor.TYPES.bytestring) {
     // a is not string or bytestring
-    // todo/perf: just use a.toString()?
     a = ecma262.ToString(a);
   }
 
-  if ((bt | 0b10000000) != Porffor.TYPES.bytestring) {
+  if ((Porffor.type(b) | 0b10000000) != Porffor.TYPES.bytestring) {
     // b is not string or bytestring
-    // todo/perf: just use b.toString()?
     b = ecma262.ToString(b);
   }
 

package/compiler/builtins/object.ts

@@ -345,6 +345,7 @@ export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): object|u
   if (obj == null) throw new TypeError('Argument is nullish, expected object');
   const p: any = ecma262.ToPropertyKey(prop);
 
+  obj = __Porffor_object_underlying(obj);
   const entryPtr: i32 = Porffor.object.lookup(obj, p, __Porffor_object_hash(p));
   if (entryPtr == -1) {
     if (Porffor.type(obj) == Porffor.TYPES.function) {

package/compiler/builtins/string_f64.ts

@@ -26,7 +26,7 @@ export const String = function (...args: any[]): string|bytestring|StringObject
   // 4. Return StringCreate(s, ? GetPrototypeFromConstructor(NewTarget, "%String.prototype%")).
 
   // force bytestrings to strings
-  if (Porffor.type(s) == Porffor.TYPES.bytestring) s = Porffor.bytestringToString(s, s.length);
+  if (Porffor.type(s) == Porffor.TYPES.bytestring) s = Porffor.bytestringToString(s);
 
   return s as StringObject;
 };

package/compiler/builtins.js

@@ -72,10 +72,7 @@ export const BuiltinVars = function(ctx) {
   this.null.type = TYPES.object;
 
   this.NaN = [ number(NaN) ];
-  this.NaN.floatOnly = true;
-
   this.Infinity = [ number(Infinity) ];
-  this.Infinity.floatOnly = true;
 
   for (const x in TYPES) {
     this['__Porffor_TYPES_' + x] = () => [ number(TYPES[x]) ];
@@ -101,7 +98,6 @@ export const BuiltinVars = function(ctx) {
 
 export const BuiltinFuncs = function() {
   this.isNaN = {
-    floatOnly: true,
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
@@ -116,7 +112,6 @@ export const BuiltinFuncs = function() {
   this.__Number_isNaN = this.isNaN;
 
   this.isFinite = {
-    floatOnly: true,
     params: [ valtypeBinary ],
     locals: [ valtypeBinary ],
     returns: [ valtypeBinary ],
@@ -135,7 +130,6 @@ export const BuiltinFuncs = function() {
 
   // todo: should be false for +-Infinity
   this.__Number_isInteger = {
-    floatOnly: true,
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
@@ -150,7 +144,6 @@ export const BuiltinFuncs = function() {
   };
 
   this.__Number_isSafeInteger = {
-    floatOnly: true,
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
@@ -209,7 +202,6 @@ export const BuiltinFuncs = function() {
   };
 
   this.__Math_fround = {
-    floatOnly: true,
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
@@ -223,7 +215,6 @@ export const BuiltinFuncs = function() {
 
   // todo: this does not overflow correctly
   this.__Math_imul = {
-    floatOnly: true,
     params: [ valtypeBinary, valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
@@ -503,7 +494,6 @@ export const BuiltinFuncs = function() {
   if (!prng) throw new Error(`unknown prng algo: ${Prefs.prng}`);
 
   this.__Math_random = {
-    floatOnly: true,
     params: [],
     locals: prng.locals,
     localNames: [ 's1', 's0' ],
@@ -514,23 +504,6 @@ export const BuiltinFuncs = function() {
     returnType: TYPES.number,
     wasm: [
       ...prng.wasm,
-
-      // you thought it was over? now we need the result as a f64 between 0-1 :)
-
-      // should we >> 12 here?
-      // it feels like it but it breaks values
-
-      // | 0x3FF0000000000000
-      // [ Opcodes.i64_const, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf8, 0x3f ],
-      // [ Opcodes.i64_or ],
-
-      // bit cast as f64
-      // [ Opcodes.f64_reinterpret_i64 ],
-
-      // - 1
-      // number(1),
-      // [ Opcodes.f64_sub ],
-
       ...(prng.returns === Valtype.i64 ? [
         number((1 << 53) - 1, Valtype.i64),
         [ Opcodes.i64_and ],
@@ -581,7 +554,6 @@ export const BuiltinFuncs = function() {
   };
 
   this.__Math_radians = {
-    floatOnly: true,
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
@@ -594,7 +566,6 @@ export const BuiltinFuncs = function() {
   };
 
   this.__Math_degrees = {
-    floatOnly: true,
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
@@ -607,7 +578,6 @@ export const BuiltinFuncs = function() {
   };
 
   this.__Math_clamp = {
-    floatOnly: true,
     params: [ valtypeBinary, valtypeBinary, valtypeBinary ],
     locals: [],
     localNames: [ 'x', 'lower', 'upper' ],
@@ -623,7 +593,6 @@ export const BuiltinFuncs = function() {
   };
 
   this.__Math_scale = {
-    floatOnly: true,
     params: [ valtypeBinary, valtypeBinary, valtypeBinary, valtypeBinary, valtypeBinary ],
     locals: [],
     localNames: [ 'x', 'inLow', 'inHigh', 'outLow', 'outHigh' ],
@@ -654,7 +623,6 @@ export const BuiltinFuncs = function() {
 
   // todo: fix for -0
   this.__Math_signbit = {
-    floatOnly: true,
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
@@ -701,13 +669,8 @@ export const BuiltinFuncs = function() {
     returns: [],
     returnType: TYPES.undefined,
     wasm: [
-      // dst
       [ Opcodes.local_get, 1 ],
-
-      // src
       [ Opcodes.local_get, 0 ],
-
-      // size = pageSize
       number(pageSize, Valtype.i32),
       [ ...Opcodes.memory_copy, 0x00, 0x00 ],
     ]
@@ -805,21 +768,20 @@ export const BuiltinFuncs = function() {
   };
 
   this.__Porffor_bytestringToString = {
-    params: [ Valtype.i32, Valtype.i32 ],
-    locals: [ Valtype.i32, Valtype.i32 ],
+    params: [ Valtype.i32 ],
+    locals: [ Valtype.i32, Valtype.i32, Valtype.i32 ],
     localNames: [ 'src', 'len', 'counter', 'dst' ],
     returns: [ Valtype.i32 ],
     returnType: TYPES.string,
-    wasm: [
-      // dst = grow memory by 1 page
-      [ Opcodes.i32_const, 1 ],
-      [ Opcodes.memory_grow, 0 ],
-      number(65536, Valtype.i32),
-      [ Opcodes.i32_mul ],
+    wasm: (scope, { builtin }) => [
+      // dst = allocate
+      [ Opcodes.call, builtin('__Porffor_allocate') ],
       [ Opcodes.local_tee, 3 ],
 
-      // dst.length = len
-      [ Opcodes.local_get, 1 ],
+      // dst.length = src.length
+      [ Opcodes.local_get, 0 ],
+      [ Opcodes.i32_load, 0, 0 ],
+      [ Opcodes.local_tee, 1 ],
       [ Opcodes.i32_store, 0, 0 ],
 
       [ Opcodes.loop, Blocktype.void ],