porffor 0.56.2 → 0.56.4

package/compiler/2c.js

@@ -395,6 +395,21 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     for (let _ = 0; _ < f.wasm.length; _++) {
       const i = f.wasm[_];
 
+      if (i[0] === null && i[1] === 'c') {
+        // inline c
+        let c = i[2];
+        c = c.replace(/^\s*(?:(?:inline|static)\s+)?\w+\s+\*?\s*\w+\s*\(.*?\)\s* {([\w\W]*?)\n}/gm, _ => {
+          prepend.set(_, _);
+          return '';
+        });
+        line(c);
+
+        // hack: add includes for some common calls
+        if (c.includes('printf')) includes.set('stdio.h', true);
+
+        continue;
+      }
+
       if (i[0] === null && i[1] === 'dlopen') {
         // special ffi time
         const path = i[2];
@@ -607,6 +622,11 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
                 winIncludes.set('windows.h', true);
                 break;
 
+              case 'timeOrigin':
+                // todo: actually implement
+                vals.push('0');
+                break;
+
               case '__Porffor_readArgv': {
                 prepend.set('__Porffor_readArgv',
 `i32 __Porffor_readArgv(u32 index, u32 outPtr) {
@@ -721,15 +741,14 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           break;
 
         case Opcodes.call_indirect:
-          // todo: stub
+          // stub
           if (Prefs.d) log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[2m(${f.name})`);
           vals.pop();
           vals.push('0', '0');
           break;
 
         case Opcodes.drop:
-          // line(vals.pop());
-          vals.pop();
+          if (vals.length > 0) line(`(void) ${vals.pop()}`);
           break;
 
         case Opcodes.block:
@@ -775,10 +794,15 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
         }
 
         case Opcodes.throw: {
-          // todo: actually print exception
-          vals.pop();
-          vals.pop();
-          line(`printf("Uncaught exception\\n")`);
+          // todo: allow catching
+          const type = vals.pop();
+          const val = vals.pop();
+          line(`printf("Uncaught ")`);
+
+          const id = tmpId++;
+          line(`const struct ReturnValue _t${id} = __ecma262_ToString(${val}, ${type})`);
+          line(`__Porffor_printString(_t${id}.value, _t${id}.type)`);
+          line(`printf("\\n")`);
           line(`exit(1)`);
 
           includes.set('stdio.h', true);
@@ -828,24 +852,13 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           includes.set('math.h', true);
           break;
         case Opcodes.f64_trunc:
-          // vals.push(`trunc(${vals.pop()})`);
-          // includes.set('math.h', true);
-
-          vals.push(`(i32)(${removeBrackets(vals.pop())})`); // this is ~10x faster with clang??
+          vals.push(`(i32)(${removeBrackets(vals.pop())})`); // this is ~10x faster than math.h's trunc() with clang??
           break;
         case Opcodes.f64_nearest:
           vals.push(`round(${vals.pop()})`);
           includes.set('math.h', true);
           break;
 
-        // case Opcodes.f64_sqrt: {
-        //   break;
-        // }
-
-        // case Opcodes.f64_copysign: {
-        //   break;
-        // }
-
         case Opcodes.memory_grow: {
           const id = localTmpId++;
           line(`const u32 _oldPages${id} = _memoryPages`);

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/array.ts

@@ -892,4 +892,43 @@ export const __Porffor_array_fastIndexOf = (arr: any[], el: number): i32 => {
   }
 
   return -1;
+};
+
+// functional to arr.splice(i, 1)
+export const __Porffor_array_fastRemove = (arr: any[], i: i32, len: i32): void => {
+  arr.length = len - 1;
+
+  // offset all elements after by -1 ind
+  Porffor.wasm`
+local offset i32
+local.get ${i}
+i32.to_u
+i32.const 9
+i32.mul
+local.get ${arr}
+i32.to_u
+i32.add
+i32.const 4
+i32.add
+local.set offset
+
+;; dst = offset (this element)
+local.get offset
+
+;; src = offset + 9 (this element + 1 element)
+local.get offset
+i32.const 9
+i32.add
+
+;; size = (size - i - 1) * 9
+local.get ${len}
+local.get ${i}
+f64.sub
+i32.to_u
+i32.const 1
+i32.sub
+i32.const 9
+i32.mul
+
+memory.copy 0 0`;
 };

package/compiler/builtins/{z_map.ts → map.ts}

@@ -5,31 +5,33 @@ export const __Map_prototype_size$get = (_this: Map) => {
 };
 
 export const __Map_prototype_has = (_this: Map, key: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
-  return __Set_prototype_has(keys, key);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
+  for (const x of keys) {
+    if (x === key) return true;
+  }
+
+  return false;
 };
 
 export const __Map_prototype_get = (_this: Map, key: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
   const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
-
   for (let i: i32 = 0; i < size; i++) {
-    if (Porffor.set.read(keys, i) === key) return vals[i];
+    if (keys[i] === key) return vals[i];
   }
 
   return undefined;
 };
 
 export const __Map_prototype_set = (_this: Map, key: any, value: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
-  const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
-
+  const size: i32 = keys.length;
   for (let i: i32 = 0; i < size; i++) {
-    if (Porffor.set.read(keys, i) === key) {
+    if (keys[i] === key) {
       vals[i] = value;
       return _this;
     }
@@ -37,28 +39,24 @@ export const __Map_prototype_set = (_this: Map, key: any, value: any) => {
 
   // add key if non-existent
   // increment size by 1
-  Porffor.wasm.i32.store(keys, size + 1, 0, 0);
+  keys.length = size + 1;
 
-  // write new key at end
-  Porffor.set.write(keys, size, key);
-
-  // write new value at end
+  // write new key and value at end
+  keys[size] = key;
   vals[size] = value;
 
   return _this;
 };
 
 export const __Map_prototype_delete = (_this: Map, key: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
-  const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
-
+  const size: i32 = keys.length;
   for (let i: i32 = 0; i < size; i++) {
-    if (Porffor.set.read(keys, i) === key) {
-      __Set_prototype_delete(keys, key);
-      __Array_prototype_splice(vals, i, 1);
-
+    if (keys[i] === key) {
+      Porffor.array.fastRemove(keys, i, size);
+      Porffor.array.fastRemove(vals, i, size);
       return true;
     }
   }
@@ -67,22 +65,22 @@ export const __Map_prototype_delete = (_this: Map, key: any) => {
 };
 
 export const __Map_prototype_clear = (_this: Map) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
-  __Set_prototype_clear(keys);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
+  keys.length = 0;
 
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
   vals.length = 0;
 };
 
 export const __Map_prototype_forEach = (_this: Map, callbackFn: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
   const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
 
   let i: i32 = 0;
   while (i < size) {
-    callbackFn(vals[i], Porffor.set.read(keys, i++), _this);
+    callbackFn(vals[i], keys[i++], _this);
   }
 };
 
@@ -91,10 +89,9 @@ export const Map = function (iterable: any): Map {
 
   const out: Map = Porffor.allocateBytes(8);
 
-  const keys: Set = Porffor.allocate();
-  Porffor.wasm.i32.store(out, keys, 0, 0);
-
+  const keys: any[] = Porffor.allocate();
   const vals: any[] = Porffor.allocate();
+  Porffor.wasm.i32.store(out, keys, 0, 0);
   Porffor.wasm.i32.store(out, vals, 0, 4);
 
   if (iterable != null) for (const x of iterable) {
@@ -106,7 +103,7 @@ export const Map = function (iterable: any): Map {
 };
 
 export const __Map_prototype_keys = (_this: Map) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const out: any[] = Porffor.allocate();
 
   for (const x of keys) {

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/porffor.d.ts

@@ -38,6 +38,7 @@ type PorfforGlobal = {
   array: {
     fastPush(arr: any[], el: any): i32;
     fastIndexOf(arr: any[], el: any): i32;
+    fastRemove(arr: any[], i: i32): void;
   }
 
   arraybuffer: {

package/compiler/builtins/set.ts

@@ -1,50 +1,5 @@
 import type {} from './porffor.d.ts';
 
-// dark wasm magic for dealing with memory, sorry.
-export const __Porffor_set_read = (set: Set, index: number): any => {
-  Porffor.wasm`
-local offset i32
-local.get ${index}
-i32.to_u
-i32.const 9
-i32.mul
-local.get ${set}
-i32.to_u
-i32.add
-local.set offset
-
-local.get offset
-f64.load 0 4
-
-local.get offset
-i32.load8_u 0 12
-return`;
-};
-
-export const __Porffor_set_write = (set: Set, index: number, value: any): boolean => {
-  Porffor.wasm`
-local offset i32
-local.get ${index}
-i32.to_u
-i32.const 9
-i32.mul
-local.get ${set}
-i32.to_u
-i32.add
-local.set offset
-
-local.get offset
-local.get ${value}
-f64.store 0 4
-
-local.get offset
-local.get ${value+1}
-i32.store8 0 12`;
-
-  return true;
-};
-
-
 export const __Set_prototype_size$get = (_this: Set) => {
   return Porffor.wasm.i32.load(_this, 0, 0);
 };
@@ -55,8 +10,7 @@ export const __Set_prototype_values = (_this: Set) => {
 
   const out: any[] = __Porffor_allocate();
   for (let i: number = 0; i < size; i++) {
-    const val: any = __Porffor_set_read(_this, i);
-    Porffor.array.fastPush(out, val);
+    Porffor.array.fastPush(out, (_this as any[])[i]);
   }
 
   return out;
@@ -70,7 +24,7 @@ export const __Set_prototype_has = (_this: Set, value: any) => {
   const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) return true;
+    if ((_this as any[])[i] === value) return true;
   }
 
   return false;
@@ -81,7 +35,7 @@ export const __Set_prototype_add = (_this: Set, value: any) => {
 
   // check if already in set
   for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) return _this;
+    if ((_this as any[])[i] === value) return _this;
   }
 
   // not, add it
@@ -89,55 +43,18 @@ export const __Set_prototype_add = (_this: Set, value: any) => {
   Porffor.wasm.i32.store(_this, size + 1, 0, 0);
 
   // write new value at end
-  __Porffor_set_write(_this, size, value);
+  (_this as any[])[size] = value;
 
   return _this;
 };
 
 export const __Set_prototype_delete = (_this: Set, value: any) => {
-  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
-
   // check if already in set
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
   for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) {
+    if ((_this as any[])[i] === value) {
       // found, delete
-      // decrement size by 1
-      Porffor.wasm.i32.store(_this, size - 1, 0, 0);
-
-      // offset all elements after by -1 ind
-      Porffor.wasm`
-local offset i32
-local.get ${i}
-i32.to_u
-i32.const 9
-i32.mul
-local.get ${_this}
-i32.to_u
-i32.add
-i32.const 4
-i32.add
-local.set offset
-
-;; dst = offset (this element)
-local.get offset
-
-;; src = offset + 9 (this element + 1 element)
-local.get offset
-i32.const 9
-i32.add
-
-;; size = (size - i - 1) * 9
-local.get ${size}
-local.get ${i}
-f64.sub
-i32.to_u
-i32.const 1
-i32.sub
-i32.const 9
-i32.mul
-
-memory.copy 0 0`;
-
+      Porffor.array.fastRemove(_this, i, size);
       return true;
     }
   }
@@ -148,8 +65,7 @@ memory.copy 0 0`;
 
 export const __Set_prototype_clear = (_this: Set) => {
   // just set size to 0
-  // do not need to delete any as will not be accessed anymore,
-  // and will be overwritten with new add
+  // do not need to delete any as old will just be overwritten
   Porffor.wasm.i32.store(_this, 0, 0, 0);
 };
 

package/compiler/builtins/{z_weakmap.ts → weakmap.ts}

@@ -1,21 +1,18 @@
 import type {} from './porffor.d.ts';
 
 export const __WeakMap_prototype_has = (_this: WeakMap, key: any) => {
-  const map: Map = _this;
-  return __Map_prototype_has(map, key);
+  return __Map_prototype_has(_this as Map, key);
 };
 
 export const __WeakMap_prototype_set = (_this: WeakMap, key: any, value: any) => {
   if (!Porffor.object.isObjectOrSymbol(key)) throw new TypeError('Value in WeakSet needs to be an object or symbol');
 
-  const map: Map = _this;
-  __Map_prototype_set(map, key, value);
+  __Map_prototype_set(_this as Map, key, value);
   return _this;
 };
 
 export const __WeakMap_prototype_delete = (_this: WeakMap, key: any) => {
-  const map: Map = _this;
-  return __Map_prototype_delete(map, key);
+  return __Map_prototype_delete(_this as Map, key);
 };
 
 export const WeakMap = function (iterable: any): WeakMap {
@@ -23,10 +20,9 @@ export const WeakMap = function (iterable: any): WeakMap {
 
   const out: WeakMap = Porffor.allocateBytes(8);
 
-  const keys: Set = Porffor.allocate();
-  Porffor.wasm.i32.store(out, keys, 0, 0);
-
+  const keys: any[] = Porffor.allocate();
   const vals: any[] = Porffor.allocate();
+  Porffor.wasm.i32.store(out, keys, 0, 0);
   Porffor.wasm.i32.store(out, vals, 0, 4);
 
   if (iterable != null) for (const x of iterable) {

package/compiler/builtins/{z_weakset.ts → weakset.ts}

@@ -1,28 +1,24 @@
 import type {} from './porffor.d.ts';
 
 export const __WeakSet_prototype_has = (_this: WeakSet, value: any) => {
-  const set: Set = _this;
-  return __Set_prototype_has(set, value);
+  return __Set_prototype_has(_this as Set, value);
 };
 
 export const __WeakSet_prototype_add = (_this: WeakSet, value: any) => {
   if (!Porffor.object.isObjectOrSymbol(value)) throw new TypeError('Value in WeakSet needs to be an object or symbol');
 
-  const set: Set = _this;
-  __Set_prototype_add(set, value);
+  __Set_prototype_add(_this as Set, value);
   return _this;
 };
 
 export const __WeakSet_prototype_delete = (_this: WeakSet, value: any) => {
-  const set: Set = _this;
-  return __Set_prototype_delete(set, value);
+  return __Set_prototype_delete(_this as Set, value);
 };
 
 export const WeakSet = function (iterable: any): WeakSet {
   if (!new.target) throw new TypeError("Constructor WeakSet requires 'new'");
 
   const out: WeakSet = __Porffor_allocate();
-
   if (iterable != null) for (const x of iterable) {
     __WeakSet_prototype_add(out, x);
   }