porffor 0.35.0 → 0.35.2

package/compiler/builtins/__internal_string.ts

@@ -45,4 +45,78 @@ export const __Porffor_strcmp = (a: any, b: any): boolean => {
       return true;
     }
   }
+};
+
+export const __Porffor_strcat = (a: any, b: any): any => {
+  // a and b must be string or bytestring
+
+  const al: i32 = Porffor.wasm.i32.load(a, 0, 0);
+  const bl: i32 = Porffor.wasm.i32.load(b, 0, 0);
+
+  if (Porffor.wasm`local.get ${a+1}` == Porffor.TYPES.bytestring) {
+    if (Porffor.wasm`local.get ${b+1}` == Porffor.TYPES.bytestring) {
+      // bytestring, bytestring
+      const out: bytestring = Porffor.allocateBytes(4 + al + bl);
+
+      // out.length = a.length + b.length
+      Porffor.wasm.i32.store(out, al + bl, 0, 0);
+
+      // copy left (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4, Porffor.wasm`local.get ${a}` + 4, al, 0, 0);
+
+      // copy right (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4 + al, Porffor.wasm`local.get ${b}` + 4, bl, 0, 0);
+
+      return out;
+    } else {
+      // bytestring, string
+      const out: string = Porffor.allocateBytes(4 + (al + bl) * 2);
+
+      // out.length = a.length + b.length
+      Porffor.wasm.i32.store(out, al + bl, 0, 0);
+
+      // copy left (slow bytestring -> string)
+      for (let i: i32 = 0; i < al; i++) {
+        Porffor.wasm.i32.store16(Porffor.wasm`local.get ${out}` + i*2, Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${a}` + i, 0, 4), 0, 4);
+      }
+
+      // copy right (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4 + al*2, Porffor.wasm`local.get ${b}` + 4, bl * 2, 0, 0);
+
+      return out;
+    }
+  } else {
+    if (Porffor.wasm`local.get ${b+1}` == Porffor.TYPES.bytestring) {
+      // string, bytestring
+      const out: string = Porffor.allocateBytes(4 + (al + bl) * 2);
+
+      // out.length = a.length + b.length
+      Porffor.wasm.i32.store(out, al + bl, 0, 0);
+
+      // copy left (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4, Porffor.wasm`local.get ${a}` + 4, al * 2, 0, 0);
+
+      // copy right (slow bytestring -> string)
+      let ptr: i32 = Porffor.wasm`local.get ${out}` + al*2;
+      for (let i: i32 = 0; i < bl; i++) {
+        Porffor.wasm.i32.store16(ptr + i*2, Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${b}` + i, 0, 4), 0, 4);
+      }
+
+      return out;
+    } else {
+      // string, string
+      const out: string = Porffor.allocateBytes(4 + (al + bl) * 2);
+
+      // out.length = a.length + b.length
+      Porffor.wasm.i32.store(out, al + bl, 0, 0);
+
+      // copy left (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4, Porffor.wasm`local.get ${a}` + 4, al * 2, 0, 0);
+
+      // copy right (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4 + al*2, Porffor.wasm`local.get ${b}` + 4, bl * 2, 0, 0);
+
+      return out;
+    }
+  }
 };

package/compiler/builtins/_internal_string.ts

@@ -35,4 +35,25 @@ export const __Porffor_compareStrings = (a: any, b: any): boolean => {
   }
 
   return Porffor.strcmp(a, b);
+};
+
+export const __Porffor_concatStrings = (a: any, b: any): boolean => {
+  let at: i32 = Porffor.rawType(a);
+  let bt: i32 = Porffor.rawType(b);
+
+  if ((at | 0b10000000) != Porffor.TYPES.bytestring) {
+    // a is not string or bytestring
+    // todo/perf: just use a.toString()?
+    a = ecma262.ToString(a);
+    at = Porffor.rawType(a);
+  }
+
+  if ((bt | 0b10000000) != Porffor.TYPES.bytestring) {
+    // b is not string or bytestring
+    // todo/perf: just use b.toString()?
+    b = ecma262.ToString(b);
+    bt = Porffor.rawType(b);
+  }
+
+  return Porffor.strcat(a, b);
 };

package/compiler/builtins/annexb_string.js

@@ -1,59 +1,14 @@
 export default () => {
-  let out = `// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
-`;
-
+  let out = ``;
   const noArgs = (a0, a1) => out += `
-export const __String_prototype_${a0} = (_this: string) => {
-  let out: string = Porffor.s\`<${a1}>\`;
-
-  let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${(2 + a1.length) * 2};
-  let thisPtr: i32 = Porffor.wasm\`local.get \${_this}\`;
-  let thisLen: i32 = _this.length;
-  let endPtr: i32 = thisPtr + thisLen * 2;
-
-  while (thisPtr < endPtr) {
-    let chr: i32 = Porffor.wasm.i32.load16_u(thisPtr, 0, 4);
-    Porffor.wasm.i32.store16(outPtr, chr, 0, 4);
-
-    thisPtr += 2;
-    outPtr += 2;
-  }
-
-  Porffor.wasm.i32.store16(outPtr, 60, 0, 4); // <
-  Porffor.wasm.i32.store16(outPtr, 47, 0, 6); // /
-
-${[...a1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)}, 0, ${8 + i * 2}); // ${x}`).join('\n')}
-
-  Porffor.wasm.i32.store16(outPtr, 62, 0, ${8 + a1.length * 2}); // >
-
-  out.length = thisLen + ${a1.length * 2 + 2 + 3};
-
-  return out;
-};
-export const __ByteString_prototype_${a0} = (_this: bytestring) => {
-  let out: bytestring = Porffor.bs\`<${a1}>\`;
-
-  let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${2 + a1.length};
-  let thisPtr: i32 = Porffor.wasm\`local.get \${_this}\`;
-  let thisLen: i32 = _this.length;
-  let endPtr: i32 = thisPtr + thisLen;
-
-  while (thisPtr < endPtr) {
-    let chr: i32 = Porffor.wasm.i32.load8_u(thisPtr++, 0, 4);
-    Porffor.wasm.i32.store8(outPtr++, chr, 0, 4);
-  }
-
-  Porffor.wasm.i32.store8(outPtr, 60, 0, 4); // <
-  Porffor.wasm.i32.store8(outPtr, 47, 0, 5); // /
-
-${[...a1].map((x, i) => `  Porffor.wasm.i32.store8(outPtr, ${x.charCodeAt(0)}, 0, ${6 + i}); // ${x}`).join('\n')}
-
-  Porffor.wasm.i32.store8(outPtr, 62, 0, ${6 + a1.length}); // >
+export const __String_prototype_${a0} = (_this: any) => {
+  const pre: bytestring = '<${a1}>';
+  const post: bytestring = '</${a1}>';
 
-  out.length = thisLen + ${a1.length * 2 + 2 + 3};
-
-  return out;
+  return Porffor.concatStrings(Porffor.concatStrings(pre, _this), post);
 };
+export const __ByteString_prototype_${a0} = (_this: any) =>
+  __String_prototype_${a0}(_this);
 `;
 
   noArgs('big', 'big');
@@ -67,69 +22,15 @@ ${[...a1].map((x, i) => `  Porffor.wasm.i32.store8(outPtr, ${x.charCodeAt(0)}, 0
   noArgs('sup', 'sup');
 
   const arg = (name, s1, s2) => out += `
-export const __String_prototype_${name} = (_this: string, arg: any) => {
-  let out: string = Porffor.s\`${`<${s1} ${s2}="`}\`;
-  out += arg;
-
-  let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${(`<${s1} ${s2}="`.length + 2) * 2} + arg.length * 2;
-
-  Porffor.wasm.i32.store16(outPtr, 34, 0, 0); // "
-  Porffor.wasm.i32.store16(outPtr, 62, 0, 2); // >
-
-  let thisPtr: i32 = Porffor.wasm\`local.get \${_this}\`;
-  let thisLen: i32 = _this.length;
-  let endPtr: i32 = thisPtr + thisLen * 2;
+export const __String_prototype_${name} = (_this: any, arg: any) => {
+  const pre1: bytestring = '<${s1} ${s2}="';
+  const pre2: bytestring = '">';
+  const post: bytestring = '</${s1}>';
 
-  while (thisPtr < endPtr) {
-    let chr: i32 = Porffor.wasm.i32.load16_u(thisPtr, 0, 4);
-    Porffor.wasm.i32.store16(outPtr, chr, 0, 4);
-
-    thisPtr += 2;
-    outPtr += 2;
-  }
-
-  Porffor.wasm.i32.store16(outPtr, 60, 0, 4); // <
-  Porffor.wasm.i32.store16(outPtr, 47, 0, 6); // /
-
-${[...s1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)}, 0, ${8 + i * 2}); // ${x}`).join('\n')}
-
-  Porffor.wasm.i32.store16(outPtr, 62, 0, ${8 + s1.length * 2}); // >
-
-  out.length = thisLen + arg.length + ${`<${s1} ${s2}="`.length + s1.length + 5};
-
-  return out;
-};
-export const __ByteString_prototype_${name} = (_this: bytestring, arg: any) => {
-  let out: string = Porffor.s\`${`<${s1} ${s2}="`}\`;
-  out += arg;
-
-  let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${(`<${s1} ${s2}="`.length + 2) * 2} + arg.length * 2;
-
-  Porffor.wasm.i32.store16(outPtr, 34, 0, 0); // "
-  Porffor.wasm.i32.store16(outPtr, 62, 0, 2); // >
-
-  let thisPtr: i32 = Porffor.wasm\`local.get \${_this}\`;
-  let thisLen: i32 = _this.length;
-  let endPtr: i32 = thisPtr + thisLen;
-
-  while (thisPtr < endPtr) {
-    let chr: i32 = Porffor.wasm.i32.load8_u(thisPtr++, 0, 4);
-    Porffor.wasm.i32.store16(outPtr, chr, 0, 4);
-
-    outPtr += 2;
-  }
-
-  Porffor.wasm.i32.store16(outPtr, 60, 0, 4); // <
-  Porffor.wasm.i32.store16(outPtr, 47, 0, 6); // /
-
-${[...s1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)}, 0, ${8 + i * 2}); // ${x}`).join('\n')}
-
-  Porffor.wasm.i32.store16(outPtr, 62, 0, ${8 + s1.length * 2}); // >
-
-  out.length = thisLen + arg.length + ${`<${s1} ${s2}="`.length + s1.length + 5};
-
-  return out;
+  return Porffor.concatStrings(Porffor.concatStrings(Porffor.concatStrings(Porffor.concatStrings(pre1, arg), pre2), _this), post);
 };
+export const __ByteString_prototype_${name} = (_this: any, arg: any) =>
+  __String_prototype_${name}(_this, arg);
 `;
 
   arg('fontcolor', 'font', 'color');
@@ -137,12 +38,10 @@ ${[...s1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)},
   arg('anchor', 'a', 'name');
   arg('link', 'a', 'href');
 
-  const prototypeAlias = (regular, annex) => `export const __String_prototype_${annex} = (_this: string) => {
-  return __String_prototype_${regular}(_this);
-};
-export const __ByteString_prototype_${annex} = (_this: bytestring) => {
-  return __ByteString_prototype_${regular}(_this);
-};
+  const prototypeAlias = (regular, annex) => `export const __String_prototype_${annex} = (_this: any) =>
+  __String_prototype_${regular}(_this);
+export const __ByteString_prototype_${annex} = (_this: any) =>
+  __ByteString_prototype_${regular}(_this);
 `;
 
   prototypeAlias('trimStart', 'trimLeft');

package/compiler/builtins/string.ts

@@ -1079,14 +1079,21 @@ export const __ByteString_prototype_trim = (_this: bytestring) => {
 
 
 export const __String_prototype_concat = (_this: string, ...vals: any[]) => {
-  // todo/perf: rewrite to use memory.copy?
-  let out: string = Porffor.allocate();
-  out += _this;
+  let out = Porffor.allocate();
+  Porffor.clone(_this, out);
+
+  // override type to string
+  Porffor.wasm`
+i32.const 67 ;; string
+local.set ${out+1}`;
 
   const valsLen: i32 = vals.length;
   for (let i: i32 = 0; i < valsLen; i++) {
-    let x: any;
     Porffor.wasm`
+local.get ${out}
+f64.convert_i32_u
+local.get ${out+1}
+
 local.get ${vals}
 local.get ${i}
 i32.const 9
@@ -1101,26 +1108,31 @@ i32.mul
 i32.add
 i32.load8_u 0 12
 
-call __ecma262_ToString
-local.set ${x+1}
+call __Porffor_concatStrings
+local.set ${out+1}
 i32.trunc_sat_f64_u
-local.set ${x}`;
-
-    out += x;
+local.set ${out}`;
   }
 
   return out;
 };
 
 export const __ByteString_prototype_concat = (_this: bytestring, ...vals: any[]) => {
-  // todo/perf: rewrite to use memory.copy?
-  let out: string = Porffor.allocate();
-  out += _this;
+  let out = Porffor.allocate();
+  Porffor.clone(_this, out);
+
+  // override type to bytestring
+  Porffor.wasm`
+i32.const 195 ;; bytestring
+local.set ${out+1}`;
 
   const valsLen: i32 = vals.length;
   for (let i: i32 = 0; i < valsLen; i++) {
-    let x: any;
     Porffor.wasm`
+local.get ${out}
+f64.convert_i32_u
+local.get ${out+1}
+
 local.get ${vals}
 local.get ${i}
 i32.const 9
@@ -1135,12 +1147,10 @@ i32.mul
 i32.add
 i32.load8_u 0 12
 
-call __ecma262_ToString
-local.set ${x+1}
+call __Porffor_concatStrings
+local.set ${out+1}
 i32.trunc_sat_f64_u
-local.set ${x}`;
-
-    out += x;
+local.set ${out}`;
   }
 
   return out;

package/compiler/builtins.js

@@ -160,19 +160,19 @@ export const BuiltinFuncs = function() {
   // add bitwise ops by converting operands to i32 first
   for (const [ char, op ] of [ ['&', Opcodes.i32_and], ['|', Opcodes.i32_or], ['^', Opcodes.i32_xor], ['<<', Opcodes.i32_shl], ['>>', Opcodes.i32_shr_s], ['>>>', Opcodes.i32_shr_u] ]) {
     this[`f64_${char}`] = {
-      params: [ valtypeBinary, valtypeBinary ],
+      params: [ Valtype.f64, Valtype.f64 ],
       locals: [],
-      returns: [ valtypeBinary ],
+      returns: [ Valtype.f64 ],
       returnType: TYPES.number,
       wasm: [
         [ Opcodes.local_get, 0 ],
-        Opcodes.i32_to,
+        Opcodes.i32_trunc_sat_f64_s,
 
         [ Opcodes.local_get, 1 ],
-        Opcodes.i32_to,
+        Opcodes.i32_trunc_sat_f64_s,
 
         [ op ],
-        Opcodes.i32_from
+        [ Opcodes.f64_convert_i32_s ]
       ]
     };
   }