porffor 0.41.6 → 0.42.0

package/compiler/assemble.js

@@ -121,9 +121,10 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
 
   const nameSection = Prefs.d ? customSection('name', encodeNames(funcs)) : [];
 
+  const directFuncs = funcs.filter(x => !x.indirect);
   const tableSection = !funcs.table ? [] : createSection(
     Section.table,
-    encodeVector([ [ Reftype.funcref, 0x00, ...unsignedLEB128(funcs.length) ] ])
+    encodeVector([ [ Reftype.funcref, 0x00, ...unsignedLEB128(directFuncs.length) ] ])
   );
   time('table section');
 
@@ -132,13 +133,12 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
     encodeVector([ [
       0x00,
       Opcodes.i32_const, 0, Opcodes.end,
-      ...encodeVector(funcs.map(x => unsignedLEB128(x.asmIndex)))
+      ...encodeVector(directFuncs.map(x => unsignedLEB128((x.wrapperFunc ?? x).asmIndex)))
     ] ])
   );
   time('element section');
 
   if (pages.has('func lut')) {
-    const offset = pages.get('func lut').ind * pageSize;
     if (data.addedFuncArgcLut) {
       // remove existing data
       data = data.filter(x => x.page !== 'func lut');
@@ -146,21 +146,20 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
 
     // generate func lut data
     const bytes = [];
-    for (let i = 0; i < funcs.length; i++) {
-      const func = funcs[i];
+    for (let i = 0; i < directFuncs.length; i++) {
+      const func = directFuncs[i];
       let name = func.name;
 
-      // real argc
-      let argc = func.params.length;
-      if (func.constr) argc -= 4;
-      if (!func.internal || func.typedParams) argc = Math.floor(argc / 2);
-
-      bytes.push(argc % 256, (argc / 256 | 0) % 256);
-
       // userland exposed .length
-      let length = func.jsLength ?? argc;
-      // remove _this from internal prototype funcs
-      if (func.internal && name.includes('_prototype_')) length--;
+      let length = func.jsLength;
+      if (length == null) {
+        length = func.params.length;
+        if (func.constr) length -= 4;
+        if (!func.internal || func.typedParams) length = Math.floor(length / 2);
+
+        // remove _this from internal prototype funcs
+        if (func.internal && name.includes('_prototype_')) length--;
+      }
 
       bytes.push(length % 256, (length / 256 | 0) % 256);
 
@@ -174,9 +173,9 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
       // eg: __String_prototype_toLowerCase -> toLowerCase
       if (name.startsWith('__')) name = name.split('_').pop();
 
-      bytes.push(...new Uint8Array(new Int32Array([ name.length ]).buffer));
+      bytes.push(...new Uint8Array(new Int32Array([ Math.min(name.length, 48 - 5 - 4) ]).buffer));
 
-      for (let i = 0; i < (64 - 5 - 4); i++) {
+      for (let i = 0; i < (48 - 3 - 4); i++) {
         const c = name.charCodeAt(i);
         bytes.push((c || 0) % 256);
       }

package/compiler/builtins/_internal_object.ts

@@ -280,24 +280,7 @@ i32.const 128
 return`;
     }
 
-    const funcFlags: i32 = __Porffor_funcLut_flags(get);
-    if (funcFlags & 0b10) {
-      // constructor func, add new.target, this args
-      Porffor.wasm`
-f64.const 0
-i32.const 0
-local.get ${obj}
-f64.convert_i32_u
-local.get ${obj+1}
-local.get ${get}
-call_indirect 2 0
-return`;
-    } else {
-      Porffor.wasm`
-local.get ${get}
-call_indirect 0 0
-return`;
-    }
+    return get.call(obj);
   }
 
   // data descriptor
@@ -364,27 +347,7 @@ export const __Porffor_object_set = (obj: any, key: any, value: any): any => {
         return value;
       }
 
-      const funcFlags: i32 = __Porffor_funcLut_flags(set);
-      if (funcFlags & 0b10) {
-        // constructor func, add new.target, this args
-        Porffor.wasm`
-  f64.const 0
-  i32.const 0
-  local.get ${obj}
-  f64.convert_i32_u
-  i32.const 7
-  local.get ${value}
-  local.get ${value+1}
-  local.get ${set}
-  call_indirect 3 0`;
-      } else {
-        Porffor.wasm`
-  local.get ${value}
-  local.get ${value+1}
-  local.get ${set}
-  call_indirect 1 0`;
-      }
-
+      set.call(obj, value);
       return value;
     }
 
@@ -450,27 +413,7 @@ export const __Porffor_object_setStrict = (obj: any, key: any, value: any): any
         throw new TypeError('Cannot set property with no setter of object');
       }
 
-      const funcFlags: i32 = __Porffor_funcLut_flags(set);
-      if (funcFlags & 0b10) {
-        // constructor func, add new.target, this args
-        Porffor.wasm`
-  f64.const 0
-  i32.const 0
-  local.get ${obj}
-  f64.convert_i32_u
-  i32.const 7
-  local.get ${value}
-  local.get ${value+1}
-  local.get ${set}
-  call_indirect 3 0`;
-      } else {
-        Porffor.wasm`
-  local.get ${value}
-  local.get ${value+1}
-  local.get ${set}
-  call_indirect 1 0`;
-      }
-
+      set.call(obj, value);
       return value;
     }
 

package/compiler/builtins.js

@@ -1002,32 +1002,30 @@ export const BuiltinFuncs = function() {
     ]
   };
 
-  this.__Porffor_funcLut_flags = {
+  this.__Porffor_funcLut_length = {
     params: [ Valtype.i32 ],
     returns: [ Valtype.i32 ],
     returnType: TYPES.number,
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      ...number(64, Valtype.i32),
+      ...number(48, Valtype.i32),
       [ Opcodes.i32_mul ],
-      ...number(4, Valtype.i32),
-      [ Opcodes.i32_add ],
-      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ]
+      [ Opcodes.i32_load16_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ]
     ],
     table: true
   };
 
-  this.__Porffor_funcLut_length = {
+  this.__Porffor_funcLut_flags = {
     params: [ Valtype.i32 ],
     returns: [ Valtype.i32 ],
     returnType: TYPES.number,
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      ...number(64, Valtype.i32),
+      ...number(48, Valtype.i32),
       [ Opcodes.i32_mul ],
       ...number(2, Valtype.i32),
       [ Opcodes.i32_add ],
-      [ Opcodes.i32_load16_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ]
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ]
     ],
     table: true
   };
@@ -1038,9 +1036,9 @@ export const BuiltinFuncs = function() {
     returnType: TYPES.bytestring,
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      ...number(64, Valtype.i32),
+      ...number(48, Valtype.i32),
       [ Opcodes.i32_mul ],
-      ...number(5, Valtype.i32),
+      ...number(3, Valtype.i32),
       [ Opcodes.i32_add ],
       ...number(allocPage(scope, 'func lut'), Valtype.i32),
       [ Opcodes.i32_add ]