porffor 0.2.0-6aff0fa → 0.2.0-75bc012

package/rhemyn/test/parse.js

@@ -1,59 +1,59 @@
-import util from 'node:util';
-
-import parse from '../parse.js';
-
-const tests = {
-  'a': {},
-  'a(b)': {},
-  'a(b(c))': {},
-  'ab': {},
-  '[ab]': {},
-  '[a-z]': {},
-  'a*': {},
-  'a+': {},
-  'a?': {},
-  'a(b)+': {},
-  '[^a]': {},
-  '[a^]': {},
-  '[^ab]': {},
-  '.': {},
-
-  // not range
-  '[-]': {},
-  '[0-]': {},
-  '[-0]': {},
-  '[\\s-\\S]': {},
-  '[\\s-.]': {},
-
-  '[\\S]': {},
-
-  '\\c': {},
-  '\\c0': {},
-  '\\cJ': {},
-
-  '\\x': {},
-  '\\x0': {},
-  '\\x0g': {},
-  '\\x0a': {},
-
-  '\\u': {},
-  '\\u0': {},
-  '\\u000': {},
-  '\\u000g': {},
-  '\\u000a': {},
-
-  /*
-  // email regexes
-  '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$': {},
-
-  // input type=email from HTML spec
-  // https://html.spec.whatwg.org/multipage/input.html#email-state-(type=email)
-  // simpler form
-  '^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$': {},
-  // full/complex form
-  '^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$': {}*/
-};
-
-for (const str in tests) {
-  console.log(str, util.inspect(parse(str), false, null, true));
+import util from 'node:util';
+
+import parse from '../parse.js';
+
+const tests = {
+  'a': {},
+  'a(b)': {},
+  'a(b(c))': {},
+  'ab': {},
+  '[ab]': {},
+  '[a-z]': {},
+  'a*': {},
+  'a+': {},
+  'a?': {},
+  'a(b)+': {},
+  '[^a]': {},
+  '[a^]': {},
+  '[^ab]': {},
+  '.': {},
+
+  // not range
+  '[-]': {},
+  '[0-]': {},
+  '[-0]': {},
+  '[\\s-\\S]': {},
+  '[\\s-.]': {},
+
+  '[\\S]': {},
+
+  '\\c': {},
+  '\\c0': {},
+  '\\cJ': {},
+
+  '\\x': {},
+  '\\x0': {},
+  '\\x0g': {},
+  '\\x0a': {},
+
+  '\\u': {},
+  '\\u0': {},
+  '\\u000': {},
+  '\\u000g': {},
+  '\\u000a': {},
+
+  /*
+  // email regexes
+  '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$': {},
+
+  // input type=email from HTML spec
+  // https://html.spec.whatwg.org/multipage/input.html#email-state-(type=email)
+  // simpler form
+  '^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$': {},
+  // full/complex form
+  '^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$': {}*/
+};
+
+for (const str in tests) {
+  console.log(str, util.inspect(parse(str), false, null, true));
 }

package/runner/compare.js

@@ -1,35 +1,35 @@
-import { execSync } from 'node:child_process';
-import { pathToFileURL } from 'node:url';
-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`);
+import { execSync } from 'node:child_process';
+import { pathToFileURL } from 'node:url';
+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/debug.js

@@ -0,0 +1,122 @@
+#!/usr/bin/env node
+
+import compile from '../compiler/wrap.js';
+import fs from 'node:fs';
+
+import Byg from '../byg/index.js';
+
+const file = process.argv.slice(2).find(x => x[0] !== '-');
+let source = fs.readFileSync(file, 'utf8');
+
+const originalLines = source.split('\n');
+
+let funcs = {}, funcId = 0;
+source = source.replace(/^\s*(function|const)\s*([a-zA-Z0-9]+)(\s*=\s*)?\([^)]*\)\s*(=>)?\s*\{$/gm, (x, _, n) => {
+  const id = funcId++;
+  funcs[funcId] = n;
+  return `${x}profile2(Porffor.wasm.i32.const(${id}))`;
+});
+
+const lines = source.split('\n');
+for (let i = 0; i < lines.length; i++) {
+  // lines[line] = lines[line].replace(/^[^\n}]*;$/, _ => `profile(${line});${_}`);
+  if (lines[i].trim().replace('}', '') !== '') lines[i] = `profile1(Porffor.wasm.i32.const(${i}));` + lines[i];
+}
+source = lines.join('\n');
+
+const breakpoints = new Array(lines.length);
+
+let paused = true;
+const byg = Byg({
+  lines: originalLines,
+  pause: () => { paused = true; },
+  breakpoint: (line, breakpoint) => {
+    breakpoints[line] = breakpoint;
+  }
+});
+
+// console.log(source);
+
+let stepIn = false, stepOut = false;
+const callStack = [];
+
+let _paused;
+let callStarts = [];
+let lastLine;
+
+let output = '';
+
+try {
+  const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {
+    y: n => {
+      if (callStarts[callStarts.length - 1] === n - 1) {
+        // end of call
+
+        callStarts.pop();
+        callStack.pop();
+
+        paused = _paused;
+      }
+
+      lastLine = n;
+
+      if (breakpoints[n]) paused = true;
+
+      if (paused) {
+        stepIn = false; stepOut = false;
+
+        switch (byg(
+          paused,
+          n,
+          `\x1b[1mporffor debugger\x1b[22m: ${file}@${n + 1}    ${callStack.join('->')}`,
+          [
+            {
+              x: termWidth - 1 - 40 - 6,
+              // y: () => termHeight - 20 - 1 - 4,
+              y: () => 4,
+              width: 40,
+              height: 20,
+              title: 'console',
+              content: output.split('\n')
+            }
+          ]
+        )) {
+          case 'resume': {
+            paused = false;
+            break;
+          }
+
+          case 'stepOver': {
+            break;
+          }
+
+          case 'stepIn': {
+            stepIn = true;
+            // paused = false;
+            break;
+          }
+
+          case 'stepOut': {
+            stepOut = true;
+            paused = false;
+            break;
+          }
+        }
+      }
+    },
+    z: n => {
+      // start of call
+      callStack.push(funcs[n]);
+
+      callStarts.push(lastLine);
+
+      _paused = paused;
+      if (!stepIn) paused = false;
+        else paused = true;
+    }
+  }, s => output += s);
+
+  exports.main();
+} catch (e) {
+  console.error(e);
+}

package/runner/index.js

@@ -5,7 +5,7 @@ import fs from 'node:fs';
 
 const start = performance.now();
 
-if (process.argv.includes('-compile-hints')) {
+if (process.argv.includes('--compile-hints')) {
   const v8 = await import('node:v8');
   v8.setFlagsFromString(`--experimental-wasm-compilation-hints`);
 
@@ -17,16 +17,67 @@ if (process.argv.includes('-compile-hints')) {
   // --experimental-wasm-return-call (on by default)
 }
 
+if (process.argv.includes('--help')) {
+  // description + version
+  console.log(`\x1B[1m\x1B[35mPorffor\x1B[0m is a JavaScript engine/runtime/compiler. \x1B[90m(${(await import('./version.js')).default})\x1B[0m`);
+
+  // basic usage
+  console.log(`Usage: \x1B[1mporf [command] path/to/script.js [...prefs] [...args]\x1B[0m`);
+
+  // commands
+  console.log(`\n\u001b[4mCommands\x1B[0m`);
+  for (const [ cmd, [ color, desc ] ] of Object.entries({
+    run: [ 34, 'Run a JS file' ],
+    wasm: [ 34, 'Compile a JS file to a Wasm binary\n' ],
+    c: [ 31, 'Compile a JS file to C source code' ],
+    native: [ 31, 'Compile a JS file to a native binary\n' ],
+    profile: [ 33, 'Profile a JS file' ],
+    debug: [ 33, 'Debug a JS file' ],
+    'debug-wasm': [ 33, 'Debug the compiled Wasm of a JS file' ]
+  })) {
+    console.log(`  \x1B[1m\x1B[${color}m${cmd}\x1B[0m${' '.repeat(20 - cmd.length - (desc.startsWith('🧪') ? 3 : 0))}${desc}`);
+  }
+
+  // console.log();
+
+  // // options
+  // console.log(`\n\u001b[4mCommands\x1B[0m`);
+  // for (const [ cmd, [ color, desc ] ] of Object.entries({
+  //   run: [ 34, 'Run a JS file' ],
+  //   wasm: [ 34, 'Compile a JS file to a Wasm binary\n' ],
+  //   c: [ 31, 'Compile a JS file to C source code' ],
+  //   native: [ 31, 'Compile a JS file to a native binary\n' ],
+  //   profile: [ 33, 'Profile a JS file' ],
+  //   debug: [ 33, 'Debug a JS file' ],
+  //   'debug-wasm': [ 33, 'Debug the compiled Wasm of a JS file' ]
+  // })) {
+  //   console.log(`  \x1B[1m\x1B[${color}m${cmd}\x1B[0m${' '.repeat(20 - cmd.length - (desc.startsWith('🧪') ? 3 : 0))}${desc}`);
+  // }
+
+  console.log();
+  process.exit(0);
+}
+
 let file = process.argv.slice(2).find(x => x[0] !== '-');
-if (['run', 'wasm', 'native', 'c', 'profile'].includes(file)) {
+if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
   if (file === 'profile') {
     process.argv.splice(process.argv.indexOf(file), 1);
     await import('./profiler.js');
-    await new Promise(() => {});
+    await new Promise(() => {}); // do nothing for the rest of this file
   }
 
   if (['wasm', 'native', 'c'].includes(file)) {
-    process.argv.push(`-target=${file}`);
+    process.argv.push(`--target=${file}`);
+  }
+
+  if (file === 'debug-wasm') {
+    process.argv.push('--asur', '--wasm-debug');
+  }
+
+  if (file === 'debug') {
+    process.argv.splice(process.argv.indexOf(file), 1);
+    await import('./debug.js');
+    await new Promise(() => {}); // do nothing for the rest of this file
   }
 
   file = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
@@ -46,9 +97,7 @@ if (!file) {
 
   // run repl if no file given
   await import('./repl.js');
-
-  // do nothing for the rest of this file
-  await new Promise(() => {});
+  await new Promise(() => {}); // do nothing for the rest of this file
 }
 
 const source = fs.readFileSync(file, 'utf8');
@@ -66,13 +115,21 @@ const print = str => {
 };
 
 try {
-  const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
+  if (process.argv.includes('-b')) {
+    const { wasm, exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
-  if (!process.argv.includes('-no-run')) exports.main();
-  if (cache) process.stdout.write(cache);
+    if (!process.argv.includes('--no-run')) exports.main();
+
+    console.log(`\n\nwasm size: ${wasm.byteLength} bytes`);
+  } else {
+    const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
+
+    if (!process.argv.includes('-no-run')) exports.main();
+  }
+  // if (cache) process.stdout.write(cache);
 } catch (e) {
-  if (cache) process.stdout.write(cache);
+  // if (cache) process.stdout.write(cache);
   console.error(process.argv.includes('-i') ? e : `${e.constructor.name}: ${e.message}`);
 }
 
-if (process.argv.includes('-t')) console.log(`\n\ntotal time: ${(performance.now() - start).toFixed(2)}ms`);
+if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms`);

package/runner/profiler.js

@@ -5,17 +5,22 @@ import fs from 'node:fs';
 
 import Prefs from '../compiler/prefs.js';
 
-const fast = Prefs.profiler === 'fast';
+// const fast = Prefs.profiler === 'fast';
+const fast = !Prefs.experimentalProfiler;
 
 const file = process.argv.slice(2).find(x => x[0] !== '-');
 let source = fs.readFileSync(file, 'utf8');
 
 let profileId = 0;
-source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});${_}profile(${profileId++});`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
+// source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});${_}profile(${profileId++});`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
+// source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(Porffor.wasm.i32.const(${profileId++}));${_}profile(Porffor.wasm.i32.const(${profileId++}));`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
+source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile1(Porffor.wasm.i32.const(${profileId}));${_}profile2(Porffor.wasm.i32.const(${profileId++}));`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
 
 // console.log(source);
 
+// let tmp = new Array(profileId).fill(0);
 let tmp = new Array(profileId).fill(0);
+let times = new Array(profileId).fill(0);
 let samples = 0;
 
 const percents = process.argv.includes('-%');
@@ -26,25 +31,31 @@ let last = 0;
 
 try {
   const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {
+    y: fast ? n => {
+      tmp[n] = performance.now();
+    } : n => { /* todo */ },
     z: fast ? n => {
-      if (n % 2) {
-        tmp[n] += performance.now() - tmp[n - 1];
-      } else {
-        tmp[n] = performance.now();
-      }
-    } : n => {
-      if (n % 3 === 2) {
-        tmp[n] += (performance.now() - tmp[n - 1]) - (tmp[n - 1] - tmp[n - 2]);
-        samples++;
-
-        if (performance.now() > last) {
-          process.stdout.write(`\r${spinner[spin++ % 4]} running: collected ${samples} samples...`);
-          last = performance.now() + 100;
-        }
-      } else {
-        tmp[n] = performance.now();
-      }
-    }
+      times[n] += performance.now() - tmp[n];
+    } : n => { /* todo */ }
+    // z: fast ? n => {
+    //   if (n % 2) {
+    //     tmp[n] += performance.now() - tmp[n - 1];
+    //   } else {
+    //     tmp[n] = performance.now();
+    //   }
+    // } : n => {
+    //   if (n % 3 === 2) {
+    //     tmp[n] += (performance.now() - tmp[n - 1]) - (tmp[n - 1] - tmp[n - 2]);
+    //     samples++;
+
+    //     if (performance.now() > last) {
+    //       process.stdout.write(`\r${spinner[spin++ % 4]} running: collected ${samples} samples...`);
+    //       last = performance.now() + 100;
+    //     }
+    //   } else {
+    //     tmp[n] = performance.now();
+    //   }
+    // }
   });
 
   const start = performance.now();
@@ -53,30 +64,38 @@ try {
 
   const total = performance.now() - start;
 
-  console.log(`\nsamples: ${fast ? 'not measured' : samples}\ntotal: ${total}ms\n\n` + source.split('\n').map(x => {
+  console.log(`\n${fast ? '' : `samples: ${samples}\n`}total: ${total}ms\n\n` + source.split('\n').map(x => {
     let time = 0;
     if (x.startsWith('profile')) {
-      const id = parseInt(x.slice(8, x.indexOf(')')));
-      time = fast ? tmp[id + 1] : tmp[id + 2];
+      // const id = parseInt(x.slice(8, x.indexOf(')')));
+      // const id = parseInt(x.slice(31, x.indexOf(')') + 1));
+      const id = parseInt(x.slice(32, x.indexOf(')')));
+      // time = fast ? tmp[id + 1] : tmp[id + 2];
+      time = fast ? times[id] : tmp[id + 2];
     }
 
     let color = [ 0, 0, 0 ];
     if (time) {
-      const relativeTime = Math.sqrt(time / total);
+      let relativeTime = time / total;
       if (percents) time = relativeTime;
 
+      relativeTime = Math.sqrt(relativeTime);
       color = [ (relativeTime * 250) | 0, (Math.sin(relativeTime * Math.PI) * 50) | 0, 0 ];
     }
 
     const ansiColor = `2;${color[0]};${color[1]};${color[2]}m`;
 
-    if (percents) return `\x1b[48;${ansiColor}\x1b[97m${time ? ((time * 100).toFixed(0).padStart(4, ' ') + '%') : '     '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${x.replace(/profile\([0-9]+\);/g, '')}`;
+    // const line = x.replace(/profile\([0-9]+\);/g, '');
+    // const line = x.replace(/profile\(Porffor.wasm.i32.const\([0-9]+\)\);/g, '');
+    const line = x.replace(/profile[0-9]\(Porffor.wasm.i32.const\([0-9]+\)\);/g, '');
+
+    if (percents) return `\x1b[48;${ansiColor}\x1b[97m${time ? ((time * 100).toFixed(0).padStart(4, ' ') + '%') : '     '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${line}`;
 
     let digits = 2;
     if (time >= 100) digits = 1;
     if (time >= 1000) digits = 0;
 
-    return `\x1b[48;${ansiColor}\x1b[97m${time ? time.toFixed(digits).padStart(6, ' ') : '      '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${x.replace(/profile\([0-9]+\);/g, '')}`;
+    return `\x1b[48;${ansiColor}\x1b[97m${time ? time.toFixed(digits).padStart(6, ' ') : '      '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${line}`;
   }).join('\n'));
 } catch (e) {
   console.error(e);

package/runner/repl.js

@@ -1,17 +1,39 @@
 import compile from '../compiler/wrap.js';
 import rev from './version.js';
 
-import repl from 'node:repl';
+// import repl from 'node:repl';
+// import repl from '../../node-repl-polyfill/index.js';
+
+let repl;
+try {
+  // try importing node:repl
+  repl = await import('node:repl');
+
+  // check it is not just a mock with REPLServer prototype
+  if (repl.REPLServer.prototype.defineCommand == null)
+    throw 'mock node:repl detected';
+} catch {
+  // it failed, import the polyfill
+  repl = (await import('node-repl-polyfill')).default;
+}
 
 // process.argv.push('-O0'); // disable opts
 
 globalThis.valtype = 'f64';
 
-const valtypeOpt = process.argv.find(x => x.startsWith('-valtype='));
+const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
 if (valtypeOpt) valtype = valtypeOpt.split('=')[1];
 
-console.log(`welcome to porffor rev ${rev.slice(0, 7)}`);
-console.log(`info: using opt ${process.argv.find(x => x.startsWith('-O')) ?? '-O1'} and valtype ${valtype}`);
+let host = globalThis?.navigator?.userAgent;
+if (typeof process !== 'undefined' && process.argv0 === 'node') host = 'Node/' + process.versions.node;
+host ??= 'Unknown';
+
+if (host.startsWith('Node')) host = '\x1B[92m' + host;
+if (host.startsWith('Deno')) host = '\x1B[97m' + host;
+if (host.startsWith('Bun')) host = '\x1B[93m' + host;
+
+console.log(`Welcome to \x1B[1m\x1B[35mPorffor\x1B[0m \x1B[90m(${rev.slice(0, 7)})\x1B[0m running on \x1B[1m${host.replace('/', ' \x1B[0m\x1B[90m(')})\x1B[0m`);
+console.log(`\x1B[90musing opt ${process.argv.find(x => x.startsWith('-O')) ?? '-O1'}, parser ${parser}, valtype ${valtype}\x1B[0m`);
 console.log();
 
 let lastMemory, lastPages;
@@ -21,16 +43,27 @@ const memoryToString = mem => {
   const pages = lastPages.length;
   const wasmPages = mem.buffer.byteLength / PageSize;
 
-  out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KB\x1B[0m for ${pages} thing${pages === 1 ? '' : 's'} using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'}\n`;
+  out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KB\x1B[0m for ${pages} thing${pages === 1 ? '' : 's'} using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'}\n\n`;
 
   const buf = new Uint8Array(mem.buffer);
 
+  let longestType = 0, longestName = 0;
+  for (const x of lastPages) {
+    const [ type, name ] = x.split(': ');
+    if (type.length > longestType) longestType = type.length;
+    if (name.length > longestName) longestName = name.length;
+  }
+
+  out += `\x1B[0m\x1B[1m  name${' '.repeat(longestName - 4)} \x1B[0m\x1B[90m│\x1B[0m\x1B[1m type${' '.repeat(longestType - 4)} \x1B[0m\x1B[90m│\x1B[0m\x1B[1m memory\x1B[0m\n`; // ─
   for (let i = 0; i < pages; i++) {
-    out += `\x1B[36m${lastPages[i]}\x1B[2m | \x1B[0m`;
+    const [ type, name ] = lastPages[i].split(': ');
+    // out += `\x1B[36m${lastPages[i].replace(':', '\x1B[90m:\x1B[34m')}\x1B[90m${' '.repeat(longestName - lastPages[i].length)} | \x1B[0m`;
+    out += `  \x1B[34m${name}${' '.repeat(longestName - name.length)} \x1B[90m│\x1B[0m \x1B[36m${type}${' '.repeat(longestType - type.length)} \x1B[90m│\x1B[0m `;
 
-    for (let j = 0; j < 50; j++) {
+    for (let j = 0; j < 40; j++) {
       const val = buf[i * pageSize + j];
-      if (val === 0) out += '\x1B[2m';
+      // if (val === 0) out += '\x1B[2m';
+      if (val === 0) out += '\x1B[90m';
       out += val.toString(16).padStart(2, '0');
       if (val === 0) out += '\x1B[0m';
       out += ' ';
@@ -83,7 +116,7 @@ replServer.defineCommand('asm', {
     this.clearBufferedCommand();
 
     try {
-      process.argv.push('-opt-funcs');
+      process.argv.push('--opt-funcs');
       await run('', null, null, () => {}, false);
       process.argv.pop();
     } catch { }