porffor 0.24.0 → 0.24.2

package/compiler/2c.js

@@ -675,6 +675,12 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
 
           break;
 
+        case Opcodes.call_indirect:
+          // stub, todo
+          vals.pop();
+          vals.push('0', '0');
+          break;
+
         case Opcodes.drop:
           // line(vals.pop());
           vals.pop();

package/compiler/allocators.js

@@ -39,7 +39,10 @@ export class StaticAllocator {
     if (globalThis.precompile && scopeName === 'main') scopeName = globalThis.precompile;
     const reason = `${this.allocType(itemType)}: ${Prefs.scopedPageNames ? (scopeName + '/') : ''}${name}`;
 
-    if (pages.has(reason)) return number(this.ptr(pages.get(reason).ind), Valtype.i32);
+    if (pages.has(reason)) {
+      const ptr = this.lastPtr = this.ptr(pages.get(reason).ind);
+      return number(ptr, Valtype.i32);
+    }
 
     if (reason.startsWith('array:')) pages.hasArray = true;
     if (reason.startsWith('string:')) pages.hasString = true;
@@ -52,7 +55,8 @@ export class StaticAllocator {
     scope.pages ??= new Map();
     scope.pages.set(reason, { ind, type: itemType });
 
-    return number(this.ptr(ind), Valtype.i32);
+    const ptr = this.lastPtr = this.ptr(ind);
+    return number(ptr, Valtype.i32);
   }
 }
 

package/compiler/assemble.js

@@ -72,8 +72,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     return typeCache[hash] = idx;
   };
 
-  let importFuncs = [];
-
+  let importFuncs = [], importDelta = 0;
   if (optLevel < 1 || !Prefs.treeshakeWasmImports || noTreeshake) {
     importFuncs = importedFuncs;
   } else {
@@ -92,45 +91,45 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
       }
     }
 
-    importFuncs = [...imports.values()];
+    importFuncs = globalThis.importFuncs = [...imports.values()];
+    importDelta = importedFuncs.length - importFuncs.length;
+  }
 
-    // fix call indexes for non-imports
-    // also fix call_indirect types
-    const delta = importedFuncs.length - importFuncs.length;
-    for (const f of funcs) {
-      f.originalIndex = f.index;
-      f.index -= delta;
+  // fix call indexes for non-imports
+  // also fix call_indirect types
+  for (const f of funcs) {
+    f.originalIndex = f.index;
+    f.index -= importDelta;
 
-      for (const inst of f.wasm) {
-        if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
-          inst[1] -= delta;
-        }
-
-        if (inst[0] === Opcodes.call_indirect) {
-          if (!funcs.table) funcs.table = true;
+    for (const inst of f.wasm) {
+      if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
+        inst[1] -= importDelta;
+      }
 
-          const params = [];
-          for (let i = 0; i < inst[1]; i++) {
-            params.push(valtypeBinary, Valtype.i32);
-          }
+      if (inst[0] === Opcodes.call_indirect) {
+        if (!funcs.table) funcs.table = true;
 
-          if (inst.at(-1) === 'constr') {
-            inst.pop();
-            params.unshift(Valtype.i32);
-          }
+        const params = [];
+        for (let i = 0; i < inst[1]; i++) {
+          params.push(valtypeBinary, Valtype.i32);
+        }
 
-          let returns = [ valtypeBinary, Valtype.i32 ];
-          if (inst.at(-1) === 'no_type_return') {
-            inst.pop();
-            returns = [ valtypeBinary ];
-          }
+        if (inst.at(-1) === 'constr') {
+          inst.pop();
+          params.unshift(Valtype.i32);
+        }
 
-          inst[1] = getType(params, returns);
+        let returns = [ valtypeBinary, Valtype.i32 ];
+        if (inst.at(-1) === 'no_type_return') {
+          inst.pop();
+          returns = [ valtypeBinary ];
         }
+
+        inst[1] = getType(params, returns);
       }
     }
   }
-  globalThis.importFuncs = importFuncs;
+
 
   if (Prefs.optLog) log('assemble', `treeshake: using ${importFuncs.length}/${importedFuncs.length} imports`);
 
@@ -160,7 +159,13 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     ] ])
   );
 
-  if (pages.has('func lut') && !data.addedFuncArgcLut) {
+  if (pages.has('func lut')) {
+    const offset = pages.get('func lut').ind * pageSize;
+    if (data.addedFuncArgcLut) {
+      // remove existing data
+      data = data.filter(x => x.offset !== offset);
+    }
+
     // generate func lut data
     const bytes = [];
     for (let i = 0; i < funcs.length; i++) {
@@ -192,7 +197,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     }
 
     data.push({
-      offset: pages.get('func lut').ind * pageSize,
+      offset,
       bytes
     });
     data.addedFuncArgcLut = true;

package/compiler/builtins_objects.js

@@ -104,7 +104,12 @@ export default function({ builtinFuncs }, Prefs) {
   };
 
   const builtinFuncKeys = Object.keys(builtinFuncs);
-  const autoFuncs = name => builtinFuncKeys.filter(x => x.startsWith('__' + name + '_')).map(x => x.slice(name.length + 3));
+  const autoFuncKeys = name => builtinFuncKeys.filter(x => x.startsWith('__' + name + '_')).map(x => x.slice(name.length + 3));
+  const autoFuncs = name => props({
+    writable: true,
+    enumerable: false,
+    configurable: true
+  }, autoFuncKeys(name));
 
   object('Math', {
     ...props({
@@ -126,13 +131,22 @@ export default function({ builtinFuncs }, Prefs) {
       DEG_PER_RAD: 180 / Math.PI
     }),
 
-    ...props({
-      writable: true,
-      enumerable: false,
-      configurable: true
-    }, autoFuncs('Math'))
+    ...autoFuncs('Math')
   });
 
+  object('Reflect', autoFuncs('Reflect'));
+
+  // automatically generate objects for prototypes
+  for (const x of builtinFuncKeys.reduce((acc, x) => {
+    const ind = x.indexOf('_prototype_');
+    if (ind === -1) return acc;
+
+    acc.add(x.slice(0, ind + 10));
+    return acc;
+  }, new Set())) {
+    object(x, autoFuncs(x));
+  }
+
 
   // todo: support when existing func
   // object('Number', {
@@ -150,7 +164,7 @@ export default function({ builtinFuncs }, Prefs) {
   // });
 
 
-  // technically not spec compliant as it should be a navigator class but bleh
+  // these technically not spec compliant as it should be classes or non-enumerable but eh
   object('navigator', {
     ...props({
       writable: false,
@@ -161,20 +175,34 @@ export default function({ builtinFuncs }, Prefs) {
     })
   });
 
+  for (const x of [
+    'console',
+    'crypto',
+    'performance',
+  ]) {
+    object(x, {
+      ...props({
+        writable: true,
+        enumerable: true,
+        configurable: true
+      }, autoFuncKeys(x).slice(0, 12))
+    });
+  }
+
   if (Prefs.logMissingObjects) for (const x of Object.keys(builtinFuncs).concat(Object.keys(this))) {
     if (!x.startsWith('__')) continue;
 
-    const name = x.split('_').slice(2, -1).join('_').replaceAll('_', '.');
+    const name = x.split('_').slice(2, -1).join('_');
 
     let t = globalThis;
-    for (const x of name.split('.')) {
+    for (const x of name.split('_')) {
       t = t[x];
       if (!t) break;
     }
     if (!t) continue;
 
-    if (!done.has(name)) {
-      console.log(name);
+    if (!done.has(name) && !done.has('__' + name)) {
+      console.log(name.replaceAll('_', '.'), !!builtinFuncs[name]);
       done.add(name);
     }
   }