porffor 0.14.0-4e46400a9 → 0.14.0-5951093a3

package/compiler/assemble.js

@@ -65,6 +65,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
     importFuncs = [...imports.values()];
 
     // fix call indexes for non-imports
+    // also fix call_indirect types
     const delta = importedFuncs.length - importFuncs.length;
     for (const f of funcs) {
       f.originalIndex = f.index;
@@ -74,6 +75,16 @@ export default (funcs, globals, tags, pages, data, flags) => {
         if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
           inst[1] -= delta;
         }
+
+        if (inst[0] === Opcodes.call_indirect) {
+          const params = [];
+          for (let i = 0; i < inst[1]; i++) {
+            params.push(valtypeBinary, Valtype.i32);
+          }
+
+          const returns = [ valtypeBinary, Valtype.i32 ];
+          inst[1] = getType(params, returns);
+        }
       }
     }
   }
@@ -101,7 +112,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
     encodeVector([ [
       0x00,
       Opcodes.i32_const, 0, Opcodes.end,
-      encodeVector(funcs.map(x => x.index))
+      ...encodeVector(funcs.map(x => x.index))
     ] ])
   );
 

package/compiler/builtins/array.ts

@@ -27,14 +27,16 @@ export const __Array_prototype_slice = (_this: any[], start: number, end: number
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
 
-  const thisPtrEnd: i32 = thisPtr + end * 8;
+  const thisPtrEnd: i32 = thisPtr + end * 9;
 
-  thisPtr += start * 8;
+  thisPtr += start * 9;
 
   while (thisPtr < thisPtrEnd) {
     Porffor.wasm.f64.store(outPtr, Porffor.wasm.f64.load(thisPtr, 0, 4), 0, 4);
-    thisPtr += 8;
-    outPtr += 8;
+    Porffor.wasm.i32.store8(outPtr + 8, Porffor.wasm.i32.load8_u(thisPtr + 8, 0, 4), 0, 4);
+
+    thisPtr += 9;
+    outPtr += 9;
   }
 
   out.length = end - start;

package/compiler/builtins/boolean.ts

@@ -15,4 +15,4 @@ export const __Boolean_prototype_toString = (_this: boolean) => {
 export const __Boolean_prototype_valueOf = (_this: boolean) => {
   // 1. Return ? ThisBooleanValue(this value).
   return _this;
-};
+};

package/compiler/builtins/set.ts

@@ -56,14 +56,13 @@ i32.store8 0 12`;
 };
 
 
-// todo: this should be a getter somehow not a method
-export const __Set_prototype_size = (_this: Set) => {
+export const __Set_prototype_size$get = (_this: Set) => {
   return Porffor.wasm.i32.load(_this, 0, 0);
 };
 
 export const __Set_prototype_values = (_this: Set) => {
   // todo: this should return an iterator not array
-  const size: number = __Set_prototype_size(_this);
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   const out: any[] = __Porffor_allocate();
   for (let i: number = 0; i < size; i++) {
@@ -79,7 +78,7 @@ export const __Set_prototype_keys = (_this: Set) => {
 };
 
 export const __Set_prototype_has = (_this: Set, value: any) => {
-  const size: number = __Set_prototype_size(_this);
+  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;
@@ -89,7 +88,7 @@ export const __Set_prototype_has = (_this: Set, value: any) => {
 };
 
 export const __Set_prototype_add = (_this: Set, value: any) => {
-  const size: number = __Set_prototype_size(_this);
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   // check if already in set
   for (let i: number = 0; i < size; i++) {
@@ -107,7 +106,7 @@ export const __Set_prototype_add = (_this: Set, value: any) => {
 };
 
 export const __Set_prototype_delete = (_this: Set, value: any) => {
-  const size: number = __Set_prototype_size(_this);
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   // check if already in set
   for (let i: number = 0; i < size; i++) {

package/compiler/builtins/symbol.ts

@@ -0,0 +1,61 @@
+export const __Porffor_symbol_descStore = (op: boolean, value: any): any => {
+  const ptr: bytestring = '';
+
+  if (op) { // write
+    const size: number = Porffor.wasm.i32.load(ptr, 0, 0);
+    Porffor.wasm.i32.store(ptr, size + 1, 0, 0)
+
+    // reuse set internals to store description
+    __Porffor_set_write(ptr, size, value);
+    return size;
+  } else { // read
+    return __Porffor_set_read(ptr, value);
+  }
+};
+
+export const Symbol = (description: any): Symbol => {
+  // 1-based so always truthy as numeric value
+  return __Porffor_symbol_descStore(true, description) + 1;
+};
+
+// todo: this should be a getter somehow not a method
+export const __Symbol_prototype_description$get = (_this: Symbol) => {
+  const description: bytestring = __Porffor_symbol_descStore(false,
+    Porffor.wasm`local.get ${_this}` - 1);
+  return description;
+};
+
+export const __Symbol_prototype_toString = (_this: Symbol) => {
+  let out: bytestring = '';
+
+  // Symbol(
+  Porffor.wasm.i32.store8(out, 83, 0, 4);
+  Porffor.wasm.i32.store8(out, 121, 0, 5);
+  Porffor.wasm.i32.store8(out, 109, 0, 6);
+  Porffor.wasm.i32.store8(out, 98, 0, 7);
+  Porffor.wasm.i32.store8(out, 111, 0, 8);
+  Porffor.wasm.i32.store8(out, 108, 0, 9);
+  Porffor.wasm.i32.store8(out, 40, 0, 10);
+
+  const description: bytestring = __Porffor_symbol_descStore(false,
+    Porffor.wasm`local.get ${_this}` - 1);
+
+  const descLen: i32 = description.length;
+  let outPtr: i32 = Porffor.wasm`local.get ${out}` + 7;
+  let descPtr: i32 = Porffor.wasm`local.get ${description}`;
+  const descPtrEnd: i32 = descPtr + descLen;
+  while (descPtr < descPtrEnd) {
+    Porffor.wasm.i32.store8(outPtr++, Porffor.wasm.i32.load8_u(descPtr++, 0, 4), 0, 4);
+  }
+
+  // )
+  Porffor.wasm.i32.store8(Porffor.wasm`local.get ${out}` + descLen, 41, 0, 11);
+
+  out.length = 8 + descLen;
+
+  return out;
+};
+
+export const __Symbol_prototype_valueOf = (_this: Symbol) => {
+  return _this;
+};

package/compiler/builtins.js

@@ -198,7 +198,8 @@ export const BuiltinFuncs = function() {
     returns: [ valtypeBinary ],
     wasm: [
       [ Opcodes.local_get, 0 ]
-    ]
+    ],
+    constr: true
   };
 
   // just return given (default 0) for (new) Object() as we somewhat supports object just not constructor
@@ -210,7 +211,8 @@ export const BuiltinFuncs = function() {
     wasm: [
       // [ Opcodes.local_get, 0 ]
       ...number(1)
-    ]
+    ],
+    constr: true
   };
 
 
@@ -219,6 +221,7 @@ export const BuiltinFuncs = function() {
     typedParams: true,
     locals: [ Valtype.i32, Valtype.i32 ],
     returns: [],
+    callsSelf: true,
     wasm: (scope, { typeSwitch }) => [
       ...typeSwitch(scope, [ [ Opcodes.local_get, 1 ] ], {
         [TYPES.number]: [
@@ -315,7 +318,7 @@ export const BuiltinFuncs = function() {
 
           // make end pointer
           [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
-          ...number(ValtypeSize[valtype], Valtype.i32),
+          ...number(ValtypeSize[valtype] + 1, Valtype.i32),
           [ Opcodes.i32_mul ],
 
           [ Opcodes.local_get, 2 ],
@@ -326,12 +329,16 @@ export const BuiltinFuncs = function() {
 
           // print current char
           [ Opcodes.local_get, 2 ],
-          [ Opcodes.load, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
-          [ Opcodes.call, importedFuncs.print ],
+          [ Opcodes.load, 0, ValtypeSize.i32 ],
+
+          [ Opcodes.local_get, 2 ],
+          [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
+
+          [ Opcodes.call, -1 ],
 
           // increment pointer by sizeof valtype
           [ Opcodes.local_get, 2 ],
-          ...number(ValtypeSize[valtype], Valtype.i32),
+          ...number(ValtypeSize[valtype] + 1, Valtype.i32),
           [ Opcodes.i32_add ],
           [ Opcodes.local_tee, 2 ],