porffor 0.2.0-15592d6 → 0.2.0-181627c

package/compiler/precompile.js

@@ -1,3 +1,5 @@
+import { Opcodes } from './wasmSpec.js';
+
 import fs from 'node:fs';
 import { join } from 'node:path';
 
@@ -20,11 +22,6 @@ const compile = async (file, [ _funcs, _globals ]) => {
   }
   process.argv = argv.concat(args);
 
-  // globalThis.optLog = process.argv.includes('-opt-log');
-  // globalThis.codeLog = process.argv.includes('-code-log');
-  // globalThis.allocLog = process.argv.includes('-alloc-log');
-  // globalThis.regexLog = process.argv.includes('-regex-log');
-
   // const porfParse = (await import(`./parse.js?_=${Date.now()}`)).default;
   // const porfCodegen = (await import(`./codeGen.js?_=${Date.now()}`)).default;
 
@@ -34,17 +31,29 @@ const compile = async (file, [ _funcs, _globals ]) => {
 
   let { funcs, globals, data, exceptions } = porfCompile(source, ['module']);
 
-  funcs = funcs.filter(x => x.export);
-  for (const x of funcs) {
+  const exports = funcs.filter(x => x.export);
+  for (const x of exports) {
     if (x.data) x.data = x.data.map(x => data[x]);
     if (x.exceptions) x.exceptions = x.exceptions.map(x => {
       const obj = exceptions[x];
       if (obj) obj.exceptId = x;
       return obj;
     }).filter(x => x);
+
+    for (const y of x.wasm) {
+      if (y[0] === Opcodes.call) {
+        const f = funcs.find(x => x.index === y[1]);
+        if (!f) continue;
+
+        if (!f.internal) throw 'todo';
+
+        x.used ??= [];
+        x.used.push(f.name);
+      }
+    }
   }
 
-  _funcs.push(...funcs);
+  _funcs.push(...exports);
   _globals.push(...Object.values(globals));
 };
 
@@ -59,7 +68,7 @@ const precompile = async () => {
 
   // todo: globals, exceptions, pages per func
 
-  return `// autogenerated by precompile.js
+  return `// autogenerated by compiler/precompile.js
 
 export const BuiltinFuncs = function() {
 ${funcs.map(x => `  this.${x.name} = {
@@ -72,6 +81,7 @@ ${funcs.map(x => `  this.${x.name} = {
 ${x.pages && x.pages.size > 0 ? `    pages: ${JSON.stringify(Object.fromEntries(x.pages.entries()))},` : ''}
 ${x.data && x.data.length > 0 ? `    data: ${JSON.stringify(x.data)},` : ''}
 ${x.exceptions && x.exceptions.length > 0 ? `    exceptions: ${JSON.stringify(x.exceptions)},` : ''}
+${x.used && x.used.length > 0 ? `    used: ${JSON.stringify(x.used)},` : ''}
   };`.replaceAll('\n\n', '\n')).join('\n')}
 }`;
 };

package/compiler/prefs.js

@@ -0,0 +1,22 @@
+const cache = {};
+const obj = new Proxy({}, {
+  get(_, p) {
+    // intentionally misses with undefined values cached
+    if (cache[p]) return cache[p];
+
+    return cache[p] = (() => {
+      // fooBar -> foo-bar
+      const name = p[0] === '_' ? p : p.replace(/[A-Z]/g, c => `-${c.toLowerCase()}`);
+      if (process.argv.includes('-' + name)) return true;
+
+      const valArg = process.argv.find(x => x.startsWith(`-${name}=`));
+      if (valArg) return valArg.slice(name.length + 2);
+
+      return undefined;
+    })();
+  }
+});
+
+obj.uncache = () => cache = {};
+
+export default obj;

package/compiler/prototype.js

@@ -2,6 +2,7 @@ import { Opcodes, Blocktype, Valtype, ValtypeSize, PageSize } from "./wasmSpec.j
 import { number } from "./embedding.js";
 import { unsignedLEB128 } from "./encoding.js";
 import { UNDEFINED } from "./builtins.js";
+import Prefs from './prefs.js';
 
 // todo: do not duplicate this
 const TYPES = {
@@ -23,9 +24,10 @@ const TYPES = {
 // todo: turn these into built-ins once arrays and these become less hacky
 
 export const PrototypeFuncs = function() {
-  const noUnlikelyChecks = process.argv.includes('-funsafe-no-unlikely-proto-checks');
-  let zeroChecks = process.argv.find(x => x.startsWith('-funsafe-zero-proto-checks='));
-  if (zeroChecks) zeroChecks = zeroChecks.split('=')[1].split(',').reduce((acc, x) => { acc[x.toLowerCase()] = true; return acc; }, {});
+  const noUnlikelyChecks = Prefs.funsafeNoUnlikelyProtoChecks;
+
+  let zeroChecks;
+  if (Prefs.zeroChecks) zeroChecks = Prefs.zeroChecks.split('=')[1].split(',').reduce((acc, x) => { acc[x.toLowerCase()] = true; return acc; }, {});
     else zeroChecks = {};
 
   this[TYPES._array] = {
@@ -489,10 +491,10 @@ export const PrototypeFuncs = function() {
   this[TYPES.string].isWellFormed.local2 = Valtype.i32;
   this[TYPES.string].isWellFormed.returnType = TYPES.boolean;
 
-  if (process.argv.includes('-bytestring')) {
+  if (Prefs.bytestring) {
     this[TYPES._bytestring] = {
       at: (pointer, length, wIndex, iTmp, _, arrayShell) => {
-        const [ newOut, newPointer ] = arrayShell(1, 'i16');
+        const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
         return [
           // setup new/out array
@@ -548,7 +550,7 @@ export const PrototypeFuncs = function() {
 
       // todo: out of bounds properly
       charAt: (pointer, length, wIndex, _1, _2, arrayShell) => {
-        const [ newOut, newPointer ] = arrayShell(1, 'i16');
+        const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
         return [
           // setup new/out array

package/compiler/sections.js

@@ -3,6 +3,7 @@ import { encodeVector, encodeString, encodeLocal, unsignedLEB128, signedLEB128 }
 import { number } from './embedding.js';
 import { importedFuncs } from './builtins.js';
 import { log } from "./log.js";
+import Prefs from './prefs.js';
 
 const createSection = (type, data) => [
   type,
@@ -26,12 +27,12 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   const optLevel = parseInt(process.argv.find(x => x.startsWith('-O'))?.[2] ?? 1);
 
-  const compileHints = process.argv.includes('-compile-hints');
+  const compileHints = Prefs.compileHints;
   if (compileHints) log.warning('sections', 'compile hints is V8 only w/ experimental arg! (you used -compile-hints)');
 
   const getType = (params, returns) => {
     const hash = `${params.join(',')}_${returns.join(',')}`;
-    if (optLog) log('sections', `getType(${JSON.stringify(params)}, ${JSON.stringify(returns)}) -> ${hash} | cache: ${typeCache[hash]}`);
+    if (Prefs.optLog) log('sections', `getType(${JSON.stringify(params)}, ${JSON.stringify(returns)}) -> ${hash} | cache: ${typeCache[hash]}`);
     if (optLevel >= 1 && typeCache[hash] !== undefined) return typeCache[hash];
 
     const type = [ FuncType, ...encodeVector(params), ...encodeVector(returns) ];
@@ -79,7 +80,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
   }
   globalThis.importFuncs = importFuncs;
 
-  if (optLog) log('sections', `treeshake: using ${importFuncs.length}/${importedFuncs.length} imports`);
+  if (Prefs.optLog) log('sections', `treeshake: using ${importFuncs.length}/${importedFuncs.length} imports`);
 
   const importSection = importFuncs.length === 0 ? [] : createSection(
     Section.import,
@@ -106,7 +107,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   const exports = funcs.filter(x => x.export).map((x, i) => [ ...encodeString(x.name === 'main' ? 'm' : x.name), ExportDesc.func, x.index ]);
 
-  if (process.argv.includes('-always-memory') && pages.size === 0) pages.set('-always-memory', 0);
+  if (Prefs.alwaysMemory && pages.size === 0) pages.set('-always-memory', 0);
   if (optLevel === 0) pages.set('O0 precaution', 0);
 
   const usesMemory = pages.size > 0;
@@ -169,7 +170,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
     unsignedLEB128(data.length)
   );
 
-  if (process.argv.includes('-sections')) console.log({
+  if (Prefs.sections) console.log({
     typeSection: typeSection.map(x => x.toString(16)),
     importSection: importSection.map(x => x.toString(16)),
     funcSection: funcSection.map(x => x.toString(16)),

package/demo.js

@@ -1,3 +1,3 @@
-foo();
+// foo();
 
-// console.log('Hello, World!');
+console.log('Hello, World!');

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.2.0-15592d6",
+  "version": "0.2.0-181627c",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {

package/rhemyn/compile.js

@@ -2,6 +2,7 @@ import { Blocktype, Opcodes, Valtype, PageSize, ValtypeSize } from '../compiler/
 import { number } from '../compiler/embedding.js';
 import { signedLEB128, unsignedLEB128 } from '../compiler/encoding.js';
 import parse from './parse.js';
+import Prefs from '../compiler/prefs.js';
 
 // local indexes
 const BasePointer = 0; // base string pointer
@@ -80,7 +81,7 @@ const generate = (node, negated = false, get = true, func = 'test') => {
         })[func], Valtype.i32)
       ];
 
-      if (globalThis.regexLog) {
+      if (Prefs.regexLog) {
         const underline = x => `\u001b[4m\u001b[1m${x}\u001b[0m`;
         console.log(`\n${underline('ast')}`);
         console.log(node);