porffor 0.34.7 → 0.34.8

package/compiler/assemble.js

@@ -102,7 +102,6 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     f.asmIndex = f.index - importDelta;
   }
 
-
   if (Prefs.optLog) log('assemble', `treeshake: using ${importFuncs.length}/${importedFuncs.length} imports`);
 
   const importSection = importFuncs.length === 0 ? [] : createSection(
@@ -135,7 +134,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     const offset = pages.get('func lut').ind * pageSize;
     if (data.addedFuncArgcLut) {
       // remove existing data
-      data = data.filter(x => x.offset !== offset);
+      data = data.filter(x => x.page !== 'func lut');
     }
 
     // generate func lut data
@@ -149,8 +148,6 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
       if (func.constr) argc -= 4;
       if (!func.internal || func.typedParams) argc = Math.floor(argc / 2);
 
-      if (name.startsWith('#')) name = '';
-
       bytes.push(argc % 256, (argc / 256 | 0) % 256);
 
       // userland exposed .length
@@ -165,6 +162,8 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
       if (func.constr) flags |= 0b10;
       bytes.push(flags);
 
+      if (name.startsWith('#')) name = '';
+
       // eg: __String_prototype_toLowerCase -> toLowerCase
       if (name.startsWith('__')) name = name.split('_').pop();
 
@@ -281,8 +280,6 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
 
       if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
 
-      // todo: move const, call transforms here too?
-
       const makeAssembled = Prefs.d;
       let wasm = [], wasmNonFlat = [];
       for (let i = 0; i < x.wasm.length; i++) {
@@ -294,26 +291,25 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
           o[1] > 127
         ) {
           const n = o[1];
-          o = [...o];
-          o.pop();
+          o = [ o[0] ];
           unsignedLEB128_into(n, o);
         }
 
         // encode f64.const ops as ieee754 from raw number
         if (o[0] === Opcodes.f64_const) {
           const n = o[1];
-          o = [...o];
-          o.pop();
+          o = [ o[0] ];
           ieee754_binary64_into(n, o);
         }
 
+        // encode call ops as unsigned leb128 from raw number
         if ((o[0] === Opcodes.call || o[0] === Opcodes.return_call) && o[1] >= importedFuncs.length) {
           const n = o[1] - importDelta;
-          o = [...o];
-          o.pop();
+          o = [ o[0] ];
           unsignedLEB128_into(n, o);
         }
 
+        // encode call indirect ops as types from info
         if (o[0] === Opcodes.call_indirect) {
           o = [...o];
           const params = [];

package/compiler/builtins.js

@@ -1016,7 +1016,7 @@ export const BuiltinFuncs = function() {
       [ Opcodes.i32_mul ],
       ...number(4, Valtype.i32),
       [ Opcodes.i32_add ],
-      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize) ]
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ]
     ],
     table: true
   };
@@ -1031,7 +1031,7 @@ export const BuiltinFuncs = function() {
       [ Opcodes.i32_mul ],
       ...number(2, Valtype.i32),
       [ Opcodes.i32_add ],
-      [ Opcodes.i32_load16_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize) ]
+      [ Opcodes.i32_load16_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ]
     ],
     table: true
   };
@@ -1046,7 +1046,7 @@ export const BuiltinFuncs = function() {
       [ Opcodes.i32_mul ],
       ...number(5, Valtype.i32),
       [ Opcodes.i32_add ],
-      ...number(allocPage(scope, 'func lut') * pageSize, Valtype.i32),
+      ...number(allocPage(scope, 'func lut'), Valtype.i32),
       [ Opcodes.i32_add ]
     ],
     table: true
@@ -1062,11 +1062,11 @@ export const BuiltinFuncs = function() {
       ...number(2, Valtype.i32),
       [ Opcodes.i32_add ],
       ...number(0, Valtype.i32),
-      [ Opcodes.i32_store16, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize) ],
+      [ Opcodes.i32_store16, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ],
 
       [ Opcodes.local_get, 0 ],
       ...number(1, Valtype.i32),
-      [ Opcodes.i32_store8, 0, ...unsignedLEB128(allocPage(scope, 'func length deletion table') * pageSize) ]
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(allocPage(scope, 'func length deletion table')) ]
     ],
     table: true
   };
@@ -1081,11 +1081,11 @@ export const BuiltinFuncs = function() {
       ...number(5, Valtype.i32),
       [ Opcodes.i32_add ],
       ...number(0, Valtype.i32),
-      [ Opcodes.i32_store, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize) ],
+      [ Opcodes.i32_store, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ],
 
       [ Opcodes.local_get, 0 ],
       ...number(1, Valtype.i32),
-      [ Opcodes.i32_store8, 0, ...unsignedLEB128(allocPage(scope, 'func name deletion table') * pageSize) ],
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(allocPage(scope, 'func name deletion table')) ],
     ],
     table: true
   };
@@ -1096,7 +1096,7 @@ export const BuiltinFuncs = function() {
     returnType: TYPES.boolean,
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func length deletion table') * pageSize) ]
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func length deletion table')) ]
     ],
     table: true
   };
@@ -1107,7 +1107,7 @@ export const BuiltinFuncs = function() {
     returnType: TYPES.boolean,
     wasm: (scope, { allocPage }) => [
       [ Opcodes.local_get, 0 ],
-      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func name deletion table') * pageSize) ]
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func name deletion table')) ]
     ],
     table: true
   };

package/compiler/builtins_objects.js

@@ -29,8 +29,7 @@ export default function({ builtinFuncs }, Prefs) {
         if (existingFunc) {
           ptr = 1;
         } else {
-          const page = allocPage(scope, `builtin object: ${name}`);
-          ptr = page === 0 ? 16 : page * PageSize;
+          ptr = allocPage(scope, `builtin object: ${name}`);
         }
 
         const out = [