porffor 0.2.0-69d30a8 → 0.2.0-6bc63ef

package/compiler/2c.js

@@ -1,7 +1,7 @@
 import { read_ieee754_binary64, read_signedLEB128, read_unsignedLEB128 } from './encoding.js';
 import { Blocktype, Opcodes, Valtype } from './wasmSpec.js';
 import { operatorOpcode } from './expression.js';
-import { log } from "./log.js";
+import { log } from './log.js';
 
 const CValtype = {
   i8: 'i8',
@@ -106,17 +106,6 @@ for (const x in CValtype) {
   if (Valtype[x]) CValtype[Valtype[x]] = CValtype[x];
 }
 
-const todo = msg => {
-  class TodoError extends Error {
-    constructor(message) {
-      super(message);
-      this.name = 'TodoError';
-    }
-  }
-
-  throw new TodoError(msg);
-};
-
 const removeBrackets = str => {
   // return str;
   // if (str.startsWith(`(${CValtype.i32})(${CValtype.u32})`)) return `(${CValtype.i32})(${CValtype.u32})(` + removeBrackets(str.slice(22, -1)) + ')';
@@ -167,11 +156,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     prependMain.set('_data', data.map(x => `memcpy(_memory + ${x.offset}, (unsigned char[]){${x.bytes.join(',')}}, ${x.bytes.length});`).join('\n'));
   }
 
-  // for (const [ x, p ] of pages) {
-    // out += `${CValtype[p.type]} ${x.replace(': ', '_').replace(/[^0-9a-zA-Z_]/g, '')}[100]`;
-    // out += ';\n';
-  // }
-
   if (out) out += '\n';
 
   let depth = 1;
@@ -213,9 +197,9 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
   for (const f of funcs) {
     depth = 1;
+    brDepth = 0;
 
     const invLocals = inv(f.locals, x => x.idx);
-    // if (f.returns.length > 1) todo('funcs returning >1 value unsupported');
 
     for (const x in invLocals) {
       invLocals[x] = sanitize(invLocals[x]);
@@ -247,12 +231,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     const brs = [];
     let lastCond = false;
 
-    // let brDepth = 0;
-
     const blockStart = (i, loop) => {
-      // reset "stack"
-      // vals = [];
-
       rets.push(i[1]);
 
       const br = brId++;
@@ -269,25 +248,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
       brDepth++;
     };
 
-    const highlight = i => {
-      const surrounding = 6;
-
-      const decomp = decompile(f.wasm.slice(i - surrounding, i + surrounding + 1), '', 0, f.locals, f.params, f.returns, funcs, globals, exceptions).slice(0, -1).split('\n');
-
-      const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
-      let longest = 0;
-      for (let j = 0; j < decomp.length; j++) {
-        longest = Math.max(longest, noAnsi(decomp[j]).length);
-      }
-
-      const middle = Math.floor(decomp.length / 2);
-      decomp[middle] = `\x1B[47m\x1B[30m${noAnsi(decomp[middle])}${'\u00a0'.repeat(longest - noAnsi(decomp[middle]).length)}\x1B[0m`;
-
-      console.log('\x1B[90m...\x1B[0m');
-      console.log(decomp.join('\n'));
-      console.log('\x1B[90m...\x1B[0m\n');
-    };
-
     for (let _ = 0; _ < f.wasm.length; _++) {
       const i = f.wasm[_];
       if (!i || !i[0]) continue;
@@ -415,8 +375,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
           const br = brs.at(-1);
           const ret = rets.at(-1);
           if (ret && ret !== Blocktype.void) {
-            // console.log(vals, ret);
-            // console.log(decompile(f.wasm.slice(_ - 5, _ + 1)));
             if (vals.length > 0) line(`_r${br} = ${removeBrackets(vals.pop())}`);
             // vals.push(`_r${br}`);
           }
@@ -425,8 +383,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
           line(`} else {`, false);
           depth++;
 
-          // reset "stack"
-          // vals = [];
           break;
         }
 
@@ -441,8 +397,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
           const br = brs.pop();
           const ret = rets.pop();
           if (ret && ret !== Blocktype.void) {
-            // console.log(vals, ret);
-            // console.log(decompile(f.wasm.slice(_ - 5, _ + 1)));
             if (vals.length > 0) line(`_r${br} = ${removeBrackets(vals.pop())}`);
             vals.push(`_r${br}`);
           }
@@ -541,18 +495,14 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
 
         case Opcodes.br: {
           const ret = rets[brDepth - i[1] - 1];
-          // console.log(rets, brDepth, i[1], brDepth - i[1] - 1, ret, vals);
           if (ret !== Blocktype.void) line(`_r${brs[brDepth - i[1] - 1]} = ${removeBrackets(vals.pop())}`);
           line(`goto j${brs[brDepth - i[1] - 1]}`);
 
-          // // reset "stack"
-          // vals = [];
           break;
         }
 
         case Opcodes.br_if: {
           const ret = rets[brDepth - i[1] - 1];
-          // console.log(rets, brDepth, i[1], brDepth - i[1] - 1, ret, vals);
 
           let cond = removeBrackets(vals.pop());
           if (!lastCond) {
@@ -602,7 +552,6 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           }
 
           log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]}`);
-          // todo(`unimplemented op: ${invOpcodes[i[0]]}`);
       }
 
       lastCond = false;

package/compiler/assemble.js

@@ -1,8 +1,7 @@
-import { Valtype, FuncType, Empty, ExportDesc, Section, Magic, ModuleVersion, Opcodes, PageSize } from './wasmSpec.js';
-import { encodeVector, encodeString, encodeLocal, unsignedLEB128, signedLEB128, ieee754_binary64, unsignedLEB128_into, signedLEB128_into, ieee754_binary64_into } from './encoding.js';
-// import { number } from './embedding.js';
+import { Valtype, FuncType, ExportDesc, Section, Magic, ModuleVersion, Opcodes, PageSize } from './wasmSpec.js';
+import { encodeVector, encodeString, encodeLocal, unsignedLEB128, signedLEB128, unsignedLEB128_into, signedLEB128_into, ieee754_binary64_into } from './encoding.js';
 import { importedFuncs } from './builtins.js';
-import { log } from "./log.js";
+import { log } from './log.js';
 import Prefs from './prefs.js';
 
 const createSection = (type, data) => [
@@ -45,7 +44,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   let importFuncs = [];
 
-  if (optLevel < 1) {
+  if (optLevel < 1 || !Prefs.treeshakeWasmImports) {
     importFuncs = importedFuncs;
   } else {
     let imports = new Map();
@@ -102,7 +101,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   // const t0 = performance.now();
 
-  // specially optimized assembly for globals as this version is much (>5x) faster than traditional createSection(...)
+  // specially optimized assembly for globals as this version is much (>5x) faster than traditional createSection()
   const globalsValues = Object.values(globals);
 
   let globalSection = [];
@@ -154,7 +153,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   const exports = funcs.filter(x => x.export).map((x, i) => [ ...encodeString(x.name === 'main' ? 'm' : x.name), ExportDesc.func, x.index ]);
 
-  if (Prefs.alwaysMemory && pages.size === 0) pages.set('-always-memory', 0);
+  if (Prefs.alwaysMemory && pages.size === 0) pages.set('--always-memory', 0);
   if (optLevel === 0) pages.set('O0 precaution', 0);
 
   const usesMemory = pages.size > 0;

package/compiler/builtins/annexb_string.js

@@ -1,8 +1,8 @@
 export default () => {
-  let out = `// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+  let out = `// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 `;
 
-  const annexB_noArgs = (a0, a1) => out += `
+  const noArgs = (a0, a1) => out += `
 export const __String_prototype_${a0} = (_this: string) => {
   let out: string = Porffor.s\`<${a1}>\`;
 
@@ -31,7 +31,7 @@ ${[...a1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)},
 
   return out;
 };
-export const ___bytestring_prototype_${a0} = (_this: bytestring) => {
+export const __ByteString_prototype_${a0} = (_this: bytestring) => {
   let out: bytestring = Porffor.bs\`<${a1}>\`;
 
   let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${2 + a1.length};
@@ -58,15 +58,15 @@ ${[...a1].map((x, i) => `  Porffor.wasm.i32.store8(outPtr, ${x.charCodeAt(0)}, 0
 };
 `;
 
-  annexB_noArgs('big', 'big');
-  annexB_noArgs('blink', 'blink');
-  annexB_noArgs('bold', 'b');
-  annexB_noArgs('fixed', 'tt');
-  annexB_noArgs('italics', 'i');
-  annexB_noArgs('small', 'small');
-  annexB_noArgs('strike', 'strike');
-  annexB_noArgs('sub', 'sub');
-  annexB_noArgs('sup', 'sup');
+  noArgs('big', 'big');
+  noArgs('blink', 'blink');
+  noArgs('bold', 'b');
+  noArgs('fixed', 'tt');
+  noArgs('italics', 'i');
+  noArgs('small', 'small');
+  noArgs('strike', 'strike');
+  noArgs('sub', 'sub');
+  noArgs('sup', 'sup');
 
   return out;
 };

package/compiler/builtins/annexb_string.ts

@@ -1,12 +1,11 @@
-// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+// @porf --valtype=i32
 
-// todo: trimLeft, trimRight
 export const __String_prototype_trimLeft = (_this: string) => {
   return __String_prototype_trimStart(_this);
 };
 
-export const ___bytestring_prototype_trimLeft = (_this: string) => {
-  return ___bytestring_prototype_trimStart(_this);
+export const __ByteString_prototype_trimLeft = (_this: string) => {
+  return __ByteString_prototype_trimStart(_this);
 };
 
 
@@ -14,6 +13,6 @@ export const __String_prototype_trimRight = (_this: string) => {
   return __String_prototype_trimEnd(_this);
 };
 
-export const ___bytestring_prototype_trimEnd = (_this: string) => {
-  return ___bytestring_prototype_trimRight(_this);
+export const __ByteString_prototype_trimRight = (_this: string) => {
+  return __ByteString_prototype_trimEnd(_this);
 };

package/compiler/builtins/array.ts

@@ -1,10 +1,8 @@
-// @porf -funsafe-no-unlikely-proto-checks
-
 export const __Array_isArray = (x: unknown): boolean =>
-  // Porffor.wasm`local.get ${x+1}` == Porffor.TYPES._array;
-  Porffor.rawType(x) == Porffor.TYPES._array;
+  // Porffor.wasm`local.get ${x+1}` == Porffor.TYPES.array;
+  Porffor.rawType(x) == Porffor.TYPES.array;
 
-export const ___array_prototype_slice = (_this: any[], start: number, end: number) => {
+export const __Array_prototype_slice = (_this: any[], start: number, end: number) => {
   const len: i32 = _this.length;
   if (Porffor.rawType(end) == Porffor.TYPES.undefined) end = len;
 
@@ -44,7 +42,7 @@ export const ___array_prototype_slice = (_this: any[], start: number, end: numbe
   return out;
 };
 
-export const ___array_prototype_indexOf = (_this: any[], searchElement: any, position: number) => {
+export const __Array_prototype_indexOf = (_this: any[], searchElement: any, position: number) => {
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
@@ -58,7 +56,7 @@ export const ___array_prototype_indexOf = (_this: any[], searchElement: any, pos
   return -1;
 };
 
-export const ___array_prototype_lastIndexOf = (_this: any[], searchElement: any, position: number) => {
+export const __Array_prototype_lastIndexOf = (_this: any[], searchElement: any, position: number) => {
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
@@ -72,7 +70,7 @@ export const ___array_prototype_lastIndexOf = (_this: any[], searchElement: any,
   return -1;
 };
 
-export const ___array_prototype_includes = (_this: any[], searchElement: any, position: number) => {
+export const __Array_prototype_includes = (_this: any[], searchElement: any, position: number) => {
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
@@ -86,19 +84,17 @@ export const ___array_prototype_includes = (_this: any[], searchElement: any, po
   return false;
 };
 
-export const ___array_prototype_with = (_this: any[], index: number, value: any) => {
+export const __Array_prototype_with = (_this: any[], index: number, value: any) => {
   const len: i32 = _this.length;
   if (index < 0) {
     index = len + index;
     if (index < 0) {
-      // todo: throw RangeError: Invalid index
-      return null;
+      throw new RangeError('Invalid index');
     }
   }
 
   if (index > len) {
-    // todo: throw RangeError: Invalid index
-    return null;
+    throw new RangeError('Invalid index');
   }
 
   // todo: allocator is bad here?
@@ -111,7 +107,7 @@ export const ___array_prototype_with = (_this: any[], index: number, value: any)
   return out;
 };
 
-export const ___array_prototype_reverse = (_this: any[]) => {
+export const __Array_prototype_reverse = (_this: any[]) => {
   const len: i32 = _this.length;
 
   let start: i32 = 0;
@@ -127,7 +123,7 @@ export const ___array_prototype_reverse = (_this: any[]) => {
 };
 
 // todo: this has memory/allocation bugs so sometimes crashes :(
-export const ___array_prototype_toReversed = (_this: any[]) => {
+export const __Array_prototype_toReversed = (_this: any[]) => {
   const len: i32 = _this.length;
 
   let start: i32 = 0;
@@ -142,4 +138,8 @@ export const ___array_prototype_toReversed = (_this: any[]) => {
   }
 
   return out;
+};
+
+export const __Array_prototype_valueOf = (_this: any[]) => {
+  return _this;
 };

package/compiler/builtins/base64.ts

@@ -1,82 +1,4 @@
-// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
-
-// while (len >= 8) {
-//   Porffor.wasm`
-// local tmp i64
-// local.get ${i}
-// i64.load 0 4
-// local.set tmp
-
-// local k i64
-// i64.const 0
-// local.set k
-
-// loop 64
-// local.get ${j}
-
-// local.get ${keyStrPtr}
-
-// local.get tmp
-
-// ;; k * 6
-// i64.const 58
-
-// local.get k
-// i64.const 6
-// i64.mul
-
-// i64.sub
-
-// ;; tmp >> (58 - (k * 6))
-// i64.shr_u
-
-// ;; (tmp >> (58 - (k * 6))) & 0x3f
-// i64.const 63
-// i64.and
-
-// i32.wrap_i64
-
-// ;; keyStrPtr + ...
-// i32.add
-
-// ;; load character from keyStr
-// i32.load8_u 0 4
-
-// ;; store in output at j
-// i32.store8 0 4
-
-// local.get ${j}
-// i32.const 1
-// i32.add
-// local.set ${j}
-
-// local.get k
-// i64.const 1
-// i64.add
-// local.tee k
-
-// i64.const 8
-// i64.lt_s
-// br_if 0
-// end
-
-// `;
-
-//   // len -= 6;
-//   i += 6;
-// }
-
-//     // while (k < 8) {
-//     //   Porffor.wasm.i32.store8(j++, Porffor.wasm.i32.load8_u(keyStrPtr + Porffor.wasm.i32.wrap_i64(Porffor.wasm.i64.and(
-//     //     Porffor.wasm.i64.shr_u(tmp, Porffor.wasm.i64.extend_i32_u(58 - k * 6)),
-//     //     Porffor.wasm.i64.const(0x3f)
-//     //   )), 0, 4), 0, 4);
-//     //   k += 1;
-//     // }
-
-//     i += 6;
-//     len -= 6;
-//   }
+// @porf --valtype=i32
 
 export const btoa = (input: bytestring): bytestring => {
   const keyStr: bytestring = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -89,6 +11,8 @@ export const btoa = (input: bytestring): bytestring => {
   let i: i32 = Porffor.wasm`local.get ${input}`,
       j: i32 = Porffor.wasm`local.get ${output}`;
 
+  // todo/perf: add some per 6 char variant using bitwise magic
+
   const endPtr = i + len;
   while (i < endPtr) {
     const chr1: i32 = Porffor.wasm.i32.load8_u(i++, 0, 4);
@@ -116,6 +40,7 @@ export const btoa = (input: bytestring): bytestring => {
   return output;
 };
 
+// todo: impl atob by converting below to "porf ts"
 /* var atob = function (input) {
   const keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 

package/compiler/builtins/boolean.ts

@@ -0,0 +1,18 @@
+// 20.3.3.2 Boolean.prototype.toString ()
+// https://tc39.es/ecma262/#sec-boolean.prototype.tostring
+export const __Boolean_prototype_toString = (_this: boolean) => {
+  // 1. Let b be ? ThisBooleanValue(this value).
+  // 2. If b is true, return "true"; else return "false".
+  let out: bytestring = '';
+  if (_this) out = 'true';
+    else out = 'false';
+
+  return out;
+};
+
+// 20.3.3.3 Boolean.prototype.valueOf ()
+// https://tc39.es/ecma262/#sec-boolean.prototype.valueof
+export const __Boolean_prototype_valueOf = (_this: boolean) => {
+  // 1. Return ? ThisBooleanValue(this value).
+  return _this;
+};

package/compiler/builtins/crypto.ts

@@ -1,4 +1,4 @@
-// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+// @porf --valtype=i32
 
 export const __crypto_randomUUID = (): bytestring => {
   let bytes: bytestring = '................';