porffor 0.30.12 → 0.30.14

package/compiler/2c.js

@@ -231,20 +231,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     prependMain.set('argv', `_argc = argc; _argv = argv;`);
   }
 
-  prepend.set('func decls', funcs.filter(x => x.name !== 'main').map(f => {
-    const returns = f.returns.length > 0;
-    const typedReturns = f.returnType == null;
-
-    const invLocals = inv(f.locals, x => x.idx);
-    for (const x in invLocals) {
-      invLocals[x] = sanitize(invLocals[x]);
-    }
-
-    const shouldInline = false;
-
-    return `${!typedReturns ? (returns ? CValtype[f.returns[0]] : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')});`;
-  }).join('\n'));
-
   if (out) out += '\n';
 
   const line = (str, semi = true) => out += `${str}${semi ? ';' : ''}\n`;
@@ -438,7 +424,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
         case Opcodes.f64_const: {
           const val = i[1];
-          vals.push(val);
+          vals.push(val.toString());
           break;
         }
 
@@ -822,7 +808,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             break;
           }
 
-          // log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[90m(${f.name})`);
+          if (Prefs.d) log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[90m(${f.name})`);
       }
 
       lastCond = false;
@@ -844,6 +830,20 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
 
   cify(funcs.find(x => x.name === 'main'));
 
+  prepend.set('func decls', funcs.filter(x => x.name !== 'main' && cified.has(x.name)).map(f => {
+    const returns = f.returns.length > 0;
+    const typedReturns = f.returnType == null;
+
+    const invLocals = inv(f.locals, x => x.idx);
+    for (const x in invLocals) {
+      invLocals[x] = sanitize(invLocals[x]);
+    }
+
+    const shouldInline = false;
+
+    return `${!typedReturns ? (returns ? CValtype[f.returns[0]] : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')});`;
+  }).join('\n'));
+
   const makeIncludes = includes => [...includes.keys()].map(x => `#include <${x}>\n`).join('');
   out = platformSpecific(makeIncludes(winIncludes), makeIncludes(unixIncludes), false) + '\n' + makeIncludes(includes) + '\n' + alwaysPreface + [...prepend.values()].join('\n') + '\n\n' + out;
 

package/compiler/allocators.js

@@ -30,7 +30,7 @@ export class StaticAllocator {
   }
 
   ptr(ind) {
-    if (ind === 0) return 4;
+    if (ind === 0) return 16;
     return ind * PageSize;
   }
 

package/compiler/builtins/_internal_object.ts

@@ -17,21 +17,33 @@ import type {} from './porffor.d.ts';
 //   writable - 0b1000
 
 export const __Porffor_object_preventExtensions = (obj: any): void => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return;
+  }
+
   let rootFlags: i32 = Porffor.wasm.i32.load8_u(obj, 0, 4);
   rootFlags |= 0b0001;
   Porffor.wasm.i32.store8(obj, rootFlags, 0, 4);
 };
 
 export const __Porffor_object_isInextensible = (obj: any): boolean => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return false;
+  }
+
   const out: boolean = Porffor.wasm.i32.load8_u(obj, 0, 4) & 0b0001;
   return out;
 };
 
 
 export const __Porffor_object_overrideAllFlags = (obj: any, overrideOr: i32, overrideAnd: i32): void => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return;
+  }
+
   let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
 
   const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
@@ -45,7 +57,11 @@ export const __Porffor_object_overrideAllFlags = (obj: any, overrideOr: i32, ove
 };
 
 export const __Porffor_object_checkAllFlags = (obj: any, dataAnd: i32, accessorAnd: i32, dataExpected: i32, accessorExpected: i32): boolean => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return false;
+  }
+
   let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
 
   const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
@@ -107,7 +123,10 @@ export const __Porffor_object_accessorSet = (entryPtr: i32): Function => {
 
 export const __Porffor_object_lookup = (obj: any, target: any): i32 => {
   if (Porffor.wasm`local.get ${obj}` == 0) return -1;
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return -1;
+  }
 
   const targetType: i32 = Porffor.wasm`local.get ${target+1}`;
 
@@ -247,7 +266,11 @@ export const __Porffor_object_writeKey = (ptr: i32, key: any): void => {
 export const __Porffor_object_set = (obj: any, key: any, value: any): any => {
   if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot set property of null');
 
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return value;
+  }
+
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   let flags: i32;
   if (entryPtr == -1) {
@@ -328,7 +351,11 @@ export const __Porffor_object_set = (obj: any, key: any, value: any): any => {
 };
 
 export const __Porffor_object_define = (obj: any, key: any, value: any, flags: i32): void => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return;
+  }
+
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
     // add new entry

package/compiler/builtins/object.ts

@@ -245,11 +245,6 @@ export const __Object_is = (x: any, y: any): boolean => {
 
 
 export const __Object_preventExtensions = (obj: any): any => {
-  // todo: support non-pure-objects
-  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return obj;
-  }
-
   Porffor.object.preventExtensions(obj);
 
   return obj;
@@ -260,21 +255,11 @@ export const __Object_isExtensible = (obj: any): any => {
     return false;
   }
 
-  // todo: support non-pure-objects
-  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return true;
-  }
-
   return !Porffor.object.isInextensible(obj);
 };
 
 
 export const __Object_freeze = (obj: any): any => {
-  // todo: support non-pure-objects
-  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return obj;
-  }
-
   // make inextensible
   Porffor.object.preventExtensions(obj);
 
@@ -289,11 +274,6 @@ export const __Object_isFrozen = (obj: any): any => {
     return true;
   }
 
-  // todo: support non-pure-objects
-  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return false;
-  }
-
   // check obj is inextensible
   if (!Porffor.object.isInextensible(obj)) {
     return false;
@@ -305,11 +285,6 @@ export const __Object_isFrozen = (obj: any): any => {
 
 
 export const __Object_seal = (obj: any): any => {
-  // todo: support non-pure-objects
-  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return obj;
-  }
-
   // make inextensible
   Porffor.object.preventExtensions(obj);
 
@@ -324,11 +299,6 @@ export const __Object_isSealed = (obj: any): any => {
     return true;
   }
 
-  // todo: support non-pure-objects
-  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return false;
-  }
-
   // check obj is inextensible
   if (!Porffor.object.isInextensible(obj)) {
     return false;
@@ -345,24 +315,18 @@ export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): any => {
   const objType: i32 = Porffor.rawType(obj);
   if (objType == Porffor.TYPES.function) {
     // hack: function .name and .length
-    const out: object = {};
-
-    out.writable = false;
-    out.enumerable = false;
-    out.configurable = true;
-
     const v = obj[p];
     if (v != null) {
+      const out: object = {};
+      out.writable = false;
+      out.enumerable = false;
+      out.configurable = true;
+
       out.value = v;
       return out;
     }
   }
 
-  // todo: support non-pure-objects
-  if (objType != Porffor.TYPES.object) {
-    return undefined;
-  }
-
   const entryPtr: i32 = Porffor.object.lookup(obj, p);
   if (entryPtr == -1) return undefined;
 
@@ -397,9 +361,9 @@ local.set ${value+1}`;
 export const __Object_getOwnPropertyDescriptors = (obj: any): any => {
   const out: object = {};
 
-  // todo: support non-pure-objects
   if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return out;
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.rawType(obj) != Porffor.TYPES.object) return out;
   }
 
   for (const x in obj) {

package/compiler/builtins.js

@@ -99,44 +99,6 @@ export const BuiltinVars = function(ctx) {
   this.Infinity = number(Infinity);
   this.Infinity.floatOnly = true;
 
-  this.__Number_NaN = number(NaN);
-  this.__Number_NaN.floatOnly = true;
-
-  this.__Number_POSITIVE_INFINITY = number(Infinity);
-  this.__Number_POSITIVE_INFINITY.floatOnly = true;
-
-  this.__Number_NEGATIVE_INFINITY = number(-Infinity);
-  this.__Number_NEGATIVE_INFINITY.floatOnly = true;
-
-  switch (valtype) {
-    case 'i32':
-      this.__Number_MAX_VALUE = number(2147483647);
-      this.__Number_MIN_VALUE = number(-2147483648);
-
-      this.__Number_MAX_SAFE_INTEGER = this.__Number_MAX_VALUE;
-      this.__Number_MIN_SAFE_INTEGER = this.__Number_MIN_VALUE;
-      break;
-
-    case 'i64':
-      // todo: we use 32 bit limits here as we cannot encode 64 bit integers yet
-      this.__Number_MAX_VALUE = number(2147483647);
-      this.__Number_MIN_VALUE = number(-2147483648);
-
-      this.__Number_MAX_SAFE_INTEGER = this.__Number_MAX_VALUE;
-      this.__Number_MIN_SAFE_INTEGER = this.__Number_MIN_VALUE;
-      break;
-
-    case 'f64':
-      this.__Number_MAX_VALUE = number(1.7976931348623157e+308);
-      this.__Number_MIN_VALUE = number(5e-324);
-
-      this.__Number_MAX_SAFE_INTEGER = number(9007199254740991);
-      this.__Number_MIN_SAFE_INTEGER = number(-9007199254740991);
-
-      this.__Number_EPSILON = number(2.220446049250313e-16);
-      break;
-  }
-
   for (const x in TYPES) {
     this['__Porffor_TYPES_' + x] = number(TYPES[x]);
   }

package/compiler/builtins_objects.js

@@ -8,6 +8,9 @@ export default function({ builtinFuncs }, Prefs) {
     done.add(name);
     const prefix = name === 'globalThis' ? '' : `__${name}_`;
 
+    // already a func
+    const existingFunc = builtinFuncs[name];
+
     builtinFuncs['#get_' + name] = {
       params: [],
       locals: [],
@@ -20,8 +23,13 @@ export default function({ builtinFuncs }, Prefs) {
 
         // todo/perf: precompute bytes here instead of calling real funcs if we really care about perf later
 
-        const page = allocPage(scope, `builtin object: ${name}`);
-        const ptr = page === 0 ? 4 : page * PageSize;
+        let ptr;
+        if (existingFunc) {
+          ptr = 1;
+        } else {
+          const page = allocPage(scope, `builtin object: ${name}`);
+          ptr = page === 0 ? 16 : page * PageSize;
+        }
 
         const out = [
           // check if already made/cached
@@ -54,7 +62,7 @@ export default function({ builtinFuncs }, Prefs) {
 
           out.push(
             [ Opcodes.global_get, 0 ],
-            ...number(TYPES.object, Valtype.i32),
+            ...number(existingFunc ? TYPES.function : TYPES.object, Valtype.i32),
 
             ...makeString(scope, x, false, `#builtin_object_${name}_${x}`),
             Opcodes.i32_to_u,
@@ -80,17 +88,28 @@ export default function({ builtinFuncs }, Prefs) {
       }
     };
 
-
-    this[name] = (scope, { builtin }) => [
-      [ Opcodes.call, builtin('#get_' + name) ],
-      Opcodes.i32_from_u
-    ];
-    this[name].type = TYPES.object;
+    if (existingFunc) {
+      const originalWasm = existingFunc.wasm;
+      existingFunc.wasm = (...args) => {
+        const { builtin } = args[1];
+        return [
+          [ Opcodes.call, builtin('#get_' + name) ],
+          [ Opcodes.drop ],
+          ...originalWasm(...args)
+        ];
+      };
+    } else {
+      this[name] = (scope, { builtin }) => [
+        [ Opcodes.call, builtin('#get_' + name) ],
+        Opcodes.i32_from_u
+      ];
+      this[name].type = TYPES.object;
+    }
 
     for (const x in props) {
       const d = props[x];
 
-      if (d.value) {
+      if (Object.hasOwn(d, 'value')) {
         const k = prefix + x;
 
         if (typeof d.value === 'number') {
@@ -177,19 +196,25 @@ export default function({ builtinFuncs }, Prefs) {
 
 
   // todo: support when existing func
-  // object('Number', {
-  //   NaN: NaN,
-  //   POSITIVE_INFINITY: Infinity,
-  //   NEGATIVE_INFINITY: -Infinity,
+  object('Number', {
+    ...props({
+      writable: false,
+      enumerable: false,
+      configurable: false
+    }, {
+      NaN: NaN,
+      POSITIVE_INFINITY: Infinity,
+      NEGATIVE_INFINITY: -Infinity,
 
-  //   MAX_VALUE: valtype === 'i32' ? 2147483647 : 1.7976931348623157e+308,
-  //   MIN_VALUE: valtype === 'i32' ? -2147483648 : 5e-324,
+      MAX_VALUE: valtype === 'i32' ? 2147483647 : 1.7976931348623157e+308,
+      MIN_VALUE: valtype === 'i32' ? -2147483648 : 5e-324,
 
-  //   MAX_SAFE_INTEGER: valtype === 'i32' ? 2147483647 : 9007199254740991,
-  //   MIN_SAFE_INTEGER: valtype === 'i32' ? -2147483648 : -9007199254740991,
+      MAX_SAFE_INTEGER: valtype === 'i32' ? 2147483647 : 9007199254740991,
+      MIN_SAFE_INTEGER: valtype === 'i32' ? -2147483648 : -9007199254740991,
 
-  //   EPSILON: 2.220446049250313e-16
-  // });
+      EPSILON: 2.220446049250313e-16
+    })
+  });
 
 
   // these technically not spec compliant as it should be classes or non-enumerable but eh