porffor 0.24.1 → 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

@@ -136,6 +136,17 @@ export default function({ builtinFuncs }, Prefs) {
 
   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', {
@@ -153,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,
@@ -164,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, !!builtinFuncs[name]);
+    if (!done.has(name) && !done.has('__' + name)) {
+      console.log(name.replaceAll('_', '.'), !!builtinFuncs[name]);
       done.add(name);
     }
   }

package/compiler/codegen.js

@@ -4378,7 +4378,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
       return [ out, pointer ];
     }
   } else {
-    const rawPtr = read_signedLEB128(pointer[0].slice(1));
+    const rawPtr = allocator.lastPtr;
 
     scope.arrays ??= new Map();
     const firstAssign = !scope.arrays.has(uniqueName);
@@ -4386,14 +4386,34 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
 
     const local = global ? globals[name] : scope.locals?.[name];
     if (
-      Prefs.data && firstAssign && useRawElements &&
+      Prefs.data && useRawElements &&
       name !== '#member_prop' && name !== '#member_prop_assign' &&
       (!globalThis.precompile || !global)
     ) {
-      makeData(scope, elements, rawPtr, itemType, initEmpty);
+      if (Prefs.activeData && firstAssign) {
+        makeData(scope, elements, rawPtr, itemType, initEmpty);
 
-      // local value as pointer
-      return [ number(rawPtr, intOut ? Valtype.i32 : valtypeBinary), pointer ];
+        // local value as pointer
+        return [ number(rawPtr, intOut ? Valtype.i32 : valtypeBinary), pointer ];
+      }
+
+      if (Prefs.passiveData) {
+        const data = makeData(scope, elements, null, itemType, initEmpty);
+        if (data) {
+          // init data
+          out.push(
+            ...pointer,
+            ...number(0, Valtype.i32),
+            ...number(data.size, Valtype.i32),
+            [ ...Opcodes.memory_init, ...unsignedLEB128(data.idx), 0 ]
+          );
+        }
+
+        // return pointer in out
+        out.push(...number(rawPtr, intOut ? Valtype.i32 : valtypeBinary));
+
+        return [ out, pointer ];
+      }
     }
 
     if (local != null) {

package/compiler/index.js

@@ -41,8 +41,12 @@ export default (code, flags) => {
   const pageSizeOpt = process.argv.find(x => x.startsWith('--page-size='));
   if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
 
-  // enable pgo by default for c/native
-  if (target !== 'wasm') Prefs.pgo = Prefs.pgo === false ? false : true;
+  // change some prefs by default for c/native
+  if (target !== 'wasm') {
+    Prefs.pgo = Prefs.pgo === false ? false : true;
+    Prefs.passiveData = false;
+  }
+
   if (Prefs.pgo) pgo.setup();
 
   if (Prefs.profileCompiler) console.log(`0. began compilation (host runtime startup) in ${performance.now().toFixed(2)}ms`);
@@ -104,8 +108,11 @@ export default (code, flags) => {
 
   if (Prefs.profileCompiler) console.log(`3. optimized in ${(performance.now() - t2).toFixed(2)}ms`);
 
+  const out = { funcs, globals, tags, exceptions, pages, data };
+  if (globalThis.precompile) return out;
+
   const t3 = performance.now();
-  const wasm = assemble(funcs, globals, tags, pages, data, flags);
+  const wasm = out.wasm = assemble(funcs, globals, tags, pages, data, flags);
   if (Prefs.profileCompiler) console.log(`4. assembled in ${(performance.now() - t3).toFixed(2)}ms`);
 
   if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
@@ -117,8 +124,6 @@ export default (code, flags) => {
     console.log([...pages.keys()].map(x => `\x1B[36m - ${x}\x1B[0m`).join('\n') + '\n');
   }
 
-  const out = { wasm, funcs, globals, tags, exceptions, pages, data };
-
   if (target === 'wasm' && outFile) {
     fs.writeFileSync(outFile, Buffer.from(wasm));
 

package/compiler/precompile.js

@@ -24,7 +24,7 @@ const compile = async (file, _funcs) => {
     first = source.slice(0, source.indexOf('\n'));
   }
 
-  let args = ['--bytestring', '--todo-time=compile', '--truthy=no_nan_negative', '--no-treeshake-wasm-imports', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--fast-length', '--parse-types', '--opt-types'];
+  let args = ['--bytestring', '--todo-time=compile', '--truthy=no_nan_negative', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--fast-length', '--parse-types', '--opt-types', '--no-passive-data', '--active-data'];
   if (first.startsWith('// @porf')) {
     args = first.slice('// @porf '.length).split(' ').concat(args);
   }

package/compiler/prefs.js

@@ -1,4 +1,4 @@
-const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused', 'data', 'rmUnusedTypes' ];
+const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused', 'data', 'passiveData', 'rmUnusedTypes' ];
 
 let cache = {};
 const obj = new Proxy({}, {

package/compiler/wrap.js

@@ -116,8 +116,12 @@ ${flags & 0b0001 ? `    get func idx: ${get}
 
       if (!func) return function () {};
 
+      let name = func.name;
+      // eg: __String_prototype_toLowerCase -> toLowerCase
+      if (name.startsWith('__')) name = name.split('_').pop();
+
       // make fake empty func for repl/etc
-      return {[func.name]() {}}[func.name];
+      return {[name]() {}}[name];
     }
 
     case TYPES.string: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.24.1+355a35a99",
+  "version": "0.24.2+c071f9a2f",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.24.1+355a35a99';
+globalThis.version = '0.24.2+c071f9a2f';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {