porffor 0.37.30 → 0.37.32

package/compiler/codegen.js

@@ -1733,7 +1733,7 @@ const aliasPrimObjsBC = bc => {
 const createThisArg = (scope, decl) => {
   const name = mapName(decl.callee?.name);
   if (decl._new) {
-    // if precompiling or builtin func, just make empty object
+    // if precompiling or builtin func, just make it null as unused
     if (globalThis.precompile || Object.hasOwn(builtinFuncs, name)) return [
       ...number(NULL),
       ...number(TYPES.object, Valtype.i32)
@@ -1793,11 +1793,12 @@ const createThisArg = (scope, decl) => {
       ];
     }
 
-    // do not generate globalThis now,
+    // undefined do not generate globalThis now,
     // do it dynamically in generateThis in the func later
+    // (or not for strict mode)
     return [
-      ...number(NULL),
-      ...number(TYPES.object, Valtype.i32)
+      ...number(UNDEFINED),
+      ...number(TYPES.undefined, Valtype.i32)
     ];
   }
 };
@@ -2597,27 +2598,22 @@ const generateThis = (scope, decl) => {
     ];
   }
 
-  // opt: do not check for pure constructors
-  if (scope._onlyConstr || scope._onlyThisMethod || decl._noGlobalThis) return [
+  // opt: do not check for pure constructors or strict mode
+  if ((!globalThis.precompile && scope.strict) || scope._onlyConstr || scope._onlyThisMethod || decl._noGlobalThis) return [
     [ Opcodes.local_get, scope.locals['#this'].idx ],
     ...setLastType(scope, [ [ Opcodes.local_get, scope.locals['#this#type'].idx ] ])
   ];
 
   return [
     // default this to globalThis
-    [ Opcodes.local_get, scope.locals['#this'].idx ],
-    Opcodes.i32_to_u,
-    [ Opcodes.i32_eqz ],
+    [ Opcodes.local_get, scope.locals['#this#type'].idx ],
+    ...number(TYPES.undefined, Valtype.i32),
+    [ Opcodes.i32_eq ],
     [ Opcodes.if, Blocktype.void ],
-      [ Opcodes.local_get, scope.locals['#this#type'].idx ],
-      ...number(TYPES.object, Valtype.i32),
-      [ Opcodes.i32_eq ],
-      [ Opcodes.if, Blocktype.void ],
-        ...generate(scope, { type: 'Identifier', name: 'globalThis' }),
-        [ Opcodes.local_set, scope.locals['#this'].idx ],
-        ...getType(scope, 'globalThis'),
-        [ Opcodes.local_set, scope.locals['#this#type'].idx ],
-      [ Opcodes.end ],
+      ...generate(scope, { type: 'Identifier', name: 'globalThis' }),
+      [ Opcodes.local_set, scope.locals['#this'].idx ],
+      ...getType(scope, 'globalThis'),
+      [ Opcodes.local_set, scope.locals['#this#type'].idx ],
     [ Opcodes.end ],
 
     [ Opcodes.local_get, scope.locals['#this'].idx ],
@@ -4707,7 +4703,7 @@ const generateLabel = (scope, decl) => {
 const generateThrow = (scope, decl) => {
   scope.throws = true;
 
-  const exceptionMode = Prefs.exceptionMode ?? 'lut';
+  const exceptionMode = Prefs.exceptionMode ?? 'stack';
   if (exceptionMode === 'lut') {
     let message = decl.argument.value, constructor = null;
 

package/compiler/index.js

@@ -52,7 +52,9 @@ const progressClear = () => {
   progressLines = 0;
 };
 
-export default (code, flags) => {
+export default (code, module = undefined) => {
+  if (module !== undefined) Prefs.module = module;
+
   const optLevel = parseInt(process.argv.find(x => x.startsWith('-O'))?.[2] ?? 1);
 
   let target = Prefs.target ?? 'wasm';
@@ -82,7 +84,7 @@ export default (code, flags) => {
 
   if (logProgress) progressStart('parsing...');
   const t0 = performance.now();
-  const program = parse(code, flags);
+  const program = parse(code);
   if (logProgress) progressDone('parsed', t0);
 
   if (logProgress) progressStart('generating wasm...');
@@ -98,7 +100,7 @@ export default (code, flags) => {
 
   if (Prefs.pgo) {
     if (Prefs.pgoLog) {
-      const oldSize = assemble(funcs, globals, tags, pages, data, flags, true).byteLength;
+      const oldSize = assemble(funcs, globals, tags, pages, data, true).byteLength;
       const t = performance.now();
 
       pgo.run({ funcs, globals, tags, exceptions, pages, data });
@@ -106,7 +108,7 @@ export default (code, flags) => {
 
       console.log(`PGO total time: ${(performance.now() - t).toFixed(2)}ms`);
 
-      const newSize = assemble(funcs, globals, tags, pages, data, flags, true).byteLength;
+      const newSize = assemble(funcs, globals, tags, pages, data, true).byteLength;
       console.log(`PGO size diff: ${oldSize - newSize} bytes (${oldSize} -> ${newSize})\n`);
     } else {
       pgo.run({ funcs, globals, tags, exceptions, pages, data });
@@ -116,7 +118,7 @@ export default (code, flags) => {
 
   if (Prefs.cyclone) {
     if (Prefs.cycloneLog) {
-      const oldSize = assemble(funcs, globals, tags, pages, data, flags, true).byteLength;
+      const oldSize = assemble(funcs, globals, tags, pages, data, true).byteLength;
       const t = performance.now();
 
       for (const x of funcs) {
@@ -129,7 +131,7 @@ export default (code, flags) => {
 
       console.log(`cyclone total time: ${(performance.now() - t).toFixed(2)}ms`);
 
-      const newSize = assemble(funcs, globals, tags, pages, data, flags, true).byteLength;
+      const newSize = assemble(funcs, globals, tags, pages, data, true).byteLength;
       console.log(`cyclone size diff: ${oldSize - newSize} bytes (${oldSize} -> ${newSize})\n`);
     } else {
       for (const x of funcs) {
@@ -171,7 +173,7 @@ export default (code, flags) => {
   const out = { funcs, globals, tags, exceptions, pages, data, times: [ t0, t1, t2, t3 ] };
   if (globalThis.precompile) return out;
 
-  const wasm = out.wasm = assemble(funcs, globals, tags, pages, data, flags);
+  const wasm = out.wasm = assemble(funcs, globals, tags, pages, data);
   if (logProgress) progressDone('assembled', t3);
 
   if (Prefs.optFuncs || Prefs.f) logFuncs(funcs, globals, exceptions);

package/compiler/parse.js

@@ -25,7 +25,7 @@ await loadParser(types ? '@babel/parser' : undefined);
 
 if (types && !['@babel/parser', 'hermes-parser'].includes(parser)) log.warning('parse', `passed -parse-types with a parser (${parser}) which does not support`);
 
-export default (input, flags) => {
+export default input => {
   try {
     const ast = parse(input, {
       // acorn
@@ -33,14 +33,14 @@ export default (input, flags) => {
 
       // meriyah
       next: true,
-      module: flags.includes('module'),
+      module: Prefs.module,
       webcompat: true,
 
       // babel
-      plugins: types || flags.includes('typed') ? ['estree', 'typescript'] : ['estree'],
+      plugins: types ? ['estree', 'typescript'] : ['estree'],
 
       // multiple
-      sourceType: flags.includes('module') ? 'module' : 'script',
+      sourceType: Prefs.module ? 'module' : 'script',
       ranges: false,
       tokens: false,
       comments: false,

package/compiler/pgo.js

@@ -81,12 +81,12 @@ export const run = obj => {
 
   let activeFunc = null, abort = false;
   try {
-    obj.wasm = assemble(obj.funcs, obj.globals, obj.tags, obj.pages, obj.data, obj.flags, true);
+    obj.wasm = assemble(obj.funcs, obj.globals, obj.tags, obj.pages, obj.data, true);
 
     Prefs._profileCompiler = Prefs.profileCompiler;
     Prefs.profileCompiler = false;
 
-    const { exports } = wrap(obj, [], {
+    const { exports } = wrap(obj, undefined, {
       y: n => {
         activeFunc = n;
       },

package/compiler/precompile.js

@@ -25,7 +25,7 @@ const compile = async (file, _funcs) => {
     first = source.slice(0, source.indexOf('\n'));
   }
 
-  let args = ['--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', '--exception-mode=lut'];
+  let args = ['--module', '--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', '--exception-mode=lut'];
   if (first.startsWith('// @porf')) {
     args = first.slice('// @porf '.length).split(' ').concat(args);
   }
@@ -34,7 +34,7 @@ const compile = async (file, _funcs) => {
 
   const porfCompile = (await import(`./index.js?_=${Date.now()}`)).default;
 
-  let { funcs, globals, data, exceptions, times } = porfCompile(source, ['module', 'typed']);
+  let { funcs, globals, data, exceptions, times } = porfCompile(source);
 
   timing.parse ??= 0;
   timing.parse += times[1] - times[0];

package/compiler/wrap.js

@@ -325,16 +325,14 @@ ${flags & 0b0001 ? `    get func idx: ${get}
   }
 };
 
-export default (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
+export default (source, module = undefined, customImports = {}, print = str => process.stdout.write(str)) => {
   const times = [];
 
   const t1 = performance.now();
-  const { wasm, funcs, globals, tags, exceptions, pages, c } = typeof source === 'object' ? source : compile(source, flags);
+  const { wasm, funcs, globals, tags, exceptions, pages, c } = typeof source === 'object' ? source : compile(source, module);
 
   globalThis.porfDebugInfo = { funcs, globals };
 
-  // if (process.argv[1].includes('/runner') && source.includes?.('export ')) flags.push('module');
-
   // fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
   times.push(performance.now() - t1);
@@ -504,7 +502,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
         return porfToJSValue({ memory, funcs, pages }, ret[0], ret[1]);
       } catch (e) {
         if (e.is && e.is(exceptTag)) {
-          const exceptionMode = Prefs.exceptionMode ?? 'lut';
+          const exceptionMode = Prefs.exceptionMode ?? 'stack';
           if (exceptionMode === 'lut') {
             const exceptId = e.getArg(exceptTag, 0);
             const exception = exceptions[exceptId];
@@ -541,7 +539,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
     };
   }
 
-  if (flags.includes('decomp')) {
+  if (Prefs.decomp) {
     return { exports, wasm, times, decomps: funcs.map(x => decompile(x.wasm, x.name, x.index, x.locals, x.params, x.returns, funcs, globals, exceptions)), c };
   }
 

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.37.30+d663c99a2",
+  "version": "0.37.32+fde2c20c4",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/rhemyn/compile.js

@@ -12,15 +12,17 @@ const Length = 4;
 const Tmp = 5;
 const QuantifierTmp = 6; // the temporary variable used for quanitifers
 
-const doesSucceedZero = (node) => {
+const doesSucceedZero = node => {
   for (const n of node.body) {
-    if (n.type === "Group") {
-      if (!doesSucceedZero(node)) return false;
+    if (n.type === 'Group') {
+      if (!doesSucceedZero(n)) return false;
     }
+
     if (!n.quantifier || n.quantifier[0] > 0) {
       return false;
     }
   }
+
   return true;
 }
 

package/runner/debug.js

@@ -43,7 +43,7 @@ let lastLine;
 let output = '';
 
 try {
-  const { exports } = compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {
+  const { exports } = compile(source, undefined, {
     y: n => {
       if (callStarts[callStarts.length - 1] === n - 1) {
         // end of call

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.37.30+d663c99a2';
+globalThis.version = '0.37.32+fde2c20c4';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
@@ -158,7 +158,7 @@ const compile = (await import('../compiler/wrap.js')).default;
 let runStart;
 let ret;
 try {
-  const out = compile(source, process.argv.includes('--module') ? [ 'module' ] : []);
+  const out = compile(source);
   runStart = performance.now();
   if (!process.argv.includes('--no-run')) ret = out.exports.main();
 

package/runner/profile.js

@@ -20,7 +20,7 @@ let spin = 0;
 let last = 0;
 
 try {
-  const { exports } = compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {
+  const { exports } = compile(source, undefined, {
     y: n => {
       tmp[n] = performance.now();
     },

package/runner/repl.js

@@ -89,7 +89,7 @@ const run = (source, _context, _filename, callback, run = true) => {
 
   let shouldPrint = !prev;
   try {
-    const { exports, pages } = compile(toRun, process.argv.includes('--module') ? [ 'module' ] : [], {}, str => {
+    const { exports, pages } = compile(toRun, undefined, {}, str => {
       if (shouldPrint) process.stdout.write(str);
       if (str === '-4919') shouldPrint = true;
     });

package/runner/compare.js

@@ -1,34 +0,0 @@
-import { execSync } from 'node:child_process';
-import fs from 'node:fs';
-
-const [ commitsAgo, file ] = process.argv.slice(2);
-const source = fs.readFileSync(file, 'utf8');
-
-const compileNow = (await import('../compiler/index.js')).default;
-const wasmNow = compileNow(source).byteLength;
-
-execSync(`git checkout HEAD~${commitsAgo}`);
-
-let failed = false;
-
-fs.writeFileSync('tmp.js', source);
-try {
-  execSync(`node runner/index.js tmp.js`);
-} catch {
-  failed = true;
-} finally {
-  fs.rmSync('tmp.js');
-  execSync(`git checkout main`);
-}
-
-console.log();
-
-if (failed) {
-  console.log(`!! failed to compile then`);
-  process.exit();
-}
-
-const wasmThen = Buffer.byteLength(fs.readFileSync('out.wasm'));
-
-console.log(`now: ${wasmNow} bytes`);
-console.log(`${commitsAgo} commit${commitsAgo > 1 ? 's' : ''} ago: ${wasmThen} bytes`);

package/runner/sizes.js

@@ -1,38 +0,0 @@
-import compile from '../compiler/index.js';
-import fs from 'node:fs';
-
-// deno compat
-const textEncoder = new TextEncoder();
-if (typeof process === 'undefined') globalThis.process = { argv: ['', '', ...Deno.args], stdout: { write: str => Deno.writeAllSync(Deno.stdout, textEncoder.encode(str)) } };
-
-let csv = `file,porffor i32 -O0,porffor i32 -O1,porffor i32 -O2,porffor i32 -O3,porffor i64 -O0,porffor i64 -O1,porffor i64 -O2,porffor i64 -O3,porffor f64 -O0, porffor f64 -O1, porffor f64 -O2, porffor f64 -O3\n`;
-const perform = async (file, args) => {
-  process.argv = process.argv.slice(0, 2).concat(args);
-  const source = fs.readFileSync(file, 'utf8');
-
-  const { wasm } = compile(source, []);
-  const size = wasm.byteLength;
-
-  const label = `${file} ${args.join(' ')}`;
-  csv += `${size},`;
-  console.log(label, ' '.repeat(40 - label.length), `${size}b`);
-};
-
-const argsValtypes = [ '--valtype=i32', '--valtype=f64' ];
-const argsOptlevels = [ '-O0', '-O1', '-O2', '-O3' ];
-
-for (const file of [ 'bench/prime_basic.js', 'bench/fib_iter.js', 'test/math_1.js', 'test/math_3.js', 'test/while_1.js', 'test/for_2.js', 'test/unary_3.js', 'test/updateexp_1.js', 'test/eq_3.js', 'test/empty.js' ]) {
-  const niceFile = file.split('/')[1].slice(0, -3);
-  csv += `${niceFile},`;
-
-  for (const x of argsValtypes) {
-    for (const y of argsOptlevels) {
-      await perform(file, [ x, y ]);
-    }
-  }
-
-  csv = csv.slice(0, -1) + '\n';
-}
-
-fs.writeFileSync('sizes.csv', csv);
-console.log(csv);