porffor 0.34.5 → 0.34.7

package/compiler/assemble.js

@@ -21,7 +21,7 @@ const chHint = (topTier, baselineTier, strategy) => {
   return (strategy | (baselineTier << 2) | (topTier << 4));
 };
 
-const encodeNames = (funcs) => {
+const encodeNames = funcs => {
   const encodeSection = (id, section) => [
     id,
     ...unsignedLEB128(section.length),
@@ -30,11 +30,11 @@ const encodeNames = (funcs) => {
 
   const moduleSection = encodeString('js'); // TODO: filename?
   const functionsSection = encodeVector(
-    funcs.map((x) => unsignedLEB128(x.index).concat(encodeString(x.name))),
+    funcs.map(x => unsignedLEB128(x.asmIndex).concat(encodeString(x.name))),
   );
   const localsSection = encodeVector(
-    funcs.map((x) =>
-      unsignedLEB128(x.index).concat(
+    funcs.map(x =>
+      unsignedLEB128(x.asmIndex).concat(
         encodeVector(
           Object.entries(x.locals).map(([name, local]) =>
             unsignedLEB128(local.idx).concat(encodeString(name)),
@@ -99,10 +99,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
   // also fix call_indirect types
   // also encode call indexes
   for (const f of funcs) {
-    if (f.originalIndex == null) {
-      f.originalIndex = f.index;
-      f.index -= importDelta;
-    }
+    f.asmIndex = f.index - importDelta;
   }
 
 
@@ -130,7 +127,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     encodeVector([ [
       0x00,
       Opcodes.i32_const, 0, Opcodes.end,
-      ...encodeVector(funcs.map(x => unsignedLEB128(x.index)))
+      ...encodeVector(funcs.map(x => unsignedLEB128(x.asmIndex)))
     ] ])
   );
 
@@ -173,7 +170,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
 
       bytes.push(...new Uint8Array(new Int32Array([ name.length ]).buffer));
 
-      for (let i = 0; i < (128 - 5 - 4); i++) {
+      for (let i = 0; i < (64 - 5 - 4); i++) {
         const c = name.charCodeAt(i);
         bytes.push((c || 0) % 256);
       }
@@ -238,7 +235,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
   //   };
   // }
 
-  const exports = funcs.filter(x => x.export).map((x, i) => [ ...encodeString(x.name === 'main' ? 'm' : x.name), ExportDesc.func, ...unsignedLEB128(x.index) ]);
+  const exports = funcs.filter(x => x.export).map((x, i) => [ ...encodeString(x.name === 'main' ? 'm' : x.name), ExportDesc.func, ...unsignedLEB128(x.asmIndex) ]);
 
   if (Prefs.alwaysMemory && pages.size === 0) pages.set('--always-memory', 0);
   if (optLevel === 0) pages.set('O0 precaution', 0);
@@ -358,11 +355,14 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
   const dataSection = data.length === 0 ? [] : createSection(
     Section.data,
     encodeVector(data.map(x => {
+      if (Prefs.d && x.bytes.length > PageSize) log.warning('assemble', `data (${x.page}) has more bytes than Wasm page size! (${x.bytes.length})`);
+
       const bytes = encodeVector(x.bytes);
 
       if (x.page != null) {
         // type: active
-        const offset = pages.get(x.page).ind * pageSize;
+        let offset = pages.get(x.page).ind * pageSize;
+        if (offset === 0) offset = 16;
         bytes.unshift(0x00, Opcodes.i32_const, ...signedLEB128(offset), Opcodes.end);
       } else {
         // type: passive

package/compiler/builtins/__internal_string.ts

@@ -0,0 +1,48 @@
+// @porf --valtype=i32
+import type {} from './porffor.d.ts';
+
+export const __Porffor_strcmp = (a: any, b: any): boolean => {
+  // a and b must be string or bytestring
+  // fast path: check if pointers are equal
+  if (Porffor.wasm`local.get ${a}` == Porffor.wasm`local.get ${b}`) return true;
+
+  const al: i32 = Porffor.wasm.i32.load(a, 0, 0);
+  const bl: i32 = Porffor.wasm.i32.load(b, 0, 0);
+
+  // fast path: check if lengths are inequal
+  if (al != bl) return false;
+
+  if (Porffor.wasm`local.get ${a+1}` == Porffor.TYPES.bytestring) {
+    if (Porffor.wasm`local.get ${b+1}` == Porffor.TYPES.bytestring) {
+      // bytestring, bytestring
+      for (let i: i32 = 0; i < al; i++) {
+        if (Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${a}` + i, 0, 4) !=
+            Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${b}` + i, 0, 4)) return false;
+      }
+      return true;
+    } else {
+      // bytestring, string
+      for (let i: i32 = 0; i < al; i++) {
+        if (Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${a}` + i, 0, 4) !=
+            Porffor.wasm.i32.load16_u(Porffor.wasm`local.get ${b}` + i*2, 0, 4)) return false;
+      }
+      return true;
+    }
+  } else {
+    if (Porffor.wasm`local.get ${b+1}` == Porffor.TYPES.bytestring) {
+      // string, bytestring
+      for (let i: i32 = 0; i < al; i++) {
+        if (Porffor.wasm.i32.load16_u(Porffor.wasm`local.get ${a}` + i*2, 0, 4) !=
+            Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${b}` + i, 0, 4)) return false;
+      }
+      return true;
+    } else {
+      // string, string
+      for (let i: i32 = 0; i < al; i++) {
+        if (Porffor.wasm.i32.load16_u(Porffor.wasm`local.get ${a}` + i*2, 0, 4) !=
+            Porffor.wasm.i32.load16_u(Porffor.wasm`local.get ${b}` + i*2, 0, 4)) return false;
+      }
+      return true;
+    }
+  }
+};

package/compiler/builtins/_internal_object.ts

@@ -199,11 +199,10 @@ return`;
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
-    const protoKey: bytestring = '__proto__';
-
     if (Porffor.wasm`local.get ${obj+1}` == Porffor.TYPES.object) {
       // check prototype chain
-      let lastProto = obj;
+      const protoKey: bytestring = '__proto__';
+      let lastProto: any = obj;
       if (key != protoKey) {
         while (true) {
           obj = __Porffor_object_get(obj, protoKey);

package/compiler/builtins/_internal_string.ts

@@ -0,0 +1,38 @@
+import type {} from './porffor.d.ts';
+
+export const __Porffor_compareStrings = (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
+    // check if it is bad type or value
+    if (Porffor.fastOr(
+      a == null,
+
+      at == Porffor.TYPES.symbol,
+      at == Porffor.TYPES.boolean
+    )) return false;
+
+    // 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
+    // check if it is bad type or value
+    if (Porffor.fastOr(
+      b == null,
+
+      bt == Porffor.TYPES.symbol,
+      bt == Porffor.TYPES.boolean
+    )) return false;
+
+    // todo/perf: just use b.toString()?
+    b = ecma262.ToString(b);
+    bt = Porffor.rawType(b);
+  }
+
+  return Porffor.strcmp(a, b);
+};

package/compiler/builtins/crypto.ts

@@ -118,4 +118,15 @@ export const __crypto_randomUUID = (): bytestring => {
 
 
   return output;
-};
+};
+
+export const __crypto_getRandomValues = (buffer: Uint8Array): Uint8Array => {
+  let i: i32 = 0;
+  let endPtr: i32 = buffer.length;
+  while (i < endPtr) {
+    buffer[i] = Porffor.randomByte();
+    i++;
+  }
+
+  return buffer;
+};

package/compiler/builtins/object.ts

@@ -651,6 +651,12 @@ export const __Object_setPrototypeOf = (obj: any, proto: any) => {
   return obj;
 };
 
+export const __Object_prototype_isPrototypeOf = (_this: any, obj: any) => {
+  if (_this == null) throw new TypeError('This is nullish, expected object');
+
+  return _this == obj.__proto__;
+};
+
 
 export const __Object_prototype_toString = (_this: any) => {
   let out: bytestring = Porffor.allocate();

package/compiler/builtins/promise.ts

@@ -1,7 +1,7 @@
 import type {} from './porffor.d.ts';
 
 export const __ecma262_NewPromiseReactionJob = (reaction: any[], argument: any): any[] => {
-  const job: any[] = Porffor.allocateBytes(22); // 2 length
+  const job: any[] = Porffor.allocateBytes(32);
   job[0] = reaction;
   job[1] = argument;
 
@@ -118,7 +118,7 @@ export const __Porffor_promise_reject = (promise: any, reason: any): any => {
 
 export const __Porffor_promise_create = (): any[] => {
   // Promise [ result, state, fulfillReactions, rejectReactions ]
-  const obj: any[] = Porffor.allocateBytes(40); // 4 length
+  const obj: any[] = Porffor.allocateBytes(64);
 
   // result = undefined
   obj[0] = undefined;
@@ -128,11 +128,11 @@ export const __Porffor_promise_create = (): any[] => {
   obj[1] = 0;
 
   // fulfillReactions = []
-  const fulfillReactions: any[] = Porffor.allocateBytes(256); // max length: 28
+  const fulfillReactions: any[] = Porffor.allocateBytes(512);
   obj[2] = fulfillReactions;
 
   // rejectReactions = []
-  const rejectReactions: any[] = Porffor.allocateBytes(256); // max length: 28
+  const rejectReactions: any[] = Porffor.allocateBytes(512);
   obj[3] = rejectReactions;
 
   return obj;
@@ -140,7 +140,7 @@ export const __Porffor_promise_create = (): any[] => {
 
 export const __Porffor_promise_newReaction = (handler: Function, promise: any, type: i32): any[] => {
   // enum ReactionType { then = 0, finally = 1 }
-  const out: any[] = Porffor.allocateBytes(31); // 3 length
+  const out: any[] = Porffor.allocateBytes(32);
   out[0] = handler;
   out[1] = promise;
   out[2] = type;

package/compiler/builtins.js

@@ -1012,7 +1012,7 @@ export const BuiltinFuncs = function() {
     returnType: TYPES.number,
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      ...number(128, Valtype.i32),
+      ...number(64, Valtype.i32),
       [ Opcodes.i32_mul ],
       ...number(4, Valtype.i32),
       [ Opcodes.i32_add ],
@@ -1027,7 +1027,7 @@ export const BuiltinFuncs = function() {
     returnType: TYPES.number,
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      ...number(128, Valtype.i32),
+      ...number(64, Valtype.i32),
       [ Opcodes.i32_mul ],
       ...number(2, Valtype.i32),
       [ Opcodes.i32_add ],
@@ -1042,7 +1042,7 @@ export const BuiltinFuncs = function() {
     returnType: TYPES.bytestring,
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      ...number(128, Valtype.i32),
+      ...number(64, Valtype.i32),
       [ Opcodes.i32_mul ],
       ...number(5, Valtype.i32),
       [ Opcodes.i32_add ],
@@ -1057,7 +1057,7 @@ export const BuiltinFuncs = function() {
     returns: [],
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      ...number(128, Valtype.i32),
+      ...number(64, Valtype.i32),
       [ Opcodes.i32_mul ],
       ...number(2, Valtype.i32),
       [ Opcodes.i32_add ],
@@ -1076,7 +1076,7 @@ export const BuiltinFuncs = function() {
     returns: [],
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      ...number(128, Valtype.i32),
+      ...number(64, Valtype.i32),
       [ Opcodes.i32_mul ],
       ...number(5, Valtype.i32),
       [ Opcodes.i32_add ],