porffor 0.0.0-44bc2d8 → 0.0.0-48403fd

package/runner/info.js

@@ -36,7 +36,7 @@ const print = str => {
 };
 
 const t0 = performance.now();
-const { wasm, exports } = await compile(source, raw ? [ 'module' ] : [ 'module', 'info' ], {}, print);
+const { wasm, exports, pages } = await compile(source, raw ? [ 'module' ] : [ 'module', 'info' ], {}, print);
 
 if (!raw && typeof Deno === 'undefined') fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
@@ -51,4 +51,39 @@ if (!process.argv.includes('-no-run')) {
 }
 
 if (!raw) console.log(bold(`wasm binary is ${wasm.byteLength} bytes`));
-if (!raw) console.log(`total: ${(performance.now() - t0).toFixed(2)}ms`);
+if (!raw) console.log(`total: ${(performance.now() - t0).toFixed(2)}ms`);
+
+if (!raw && process.argv.includes('-mem') && exports.$) {
+  console.log();
+
+  let lastMemory, lastPages;
+  const PageSize = 65536;
+  const memoryToString = mem => {
+    let out = '';
+    const pages = lastPages.length;
+    const wasmPages = mem.buffer.byteLength / PageSize;
+
+    out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KiB\x1B[0m for ${pages} things using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'}\n`;
+
+    const buf = new Uint8Array(mem.buffer);
+
+    for (let i = 0; i < pages; i++) {
+      out += `\x1B[36m${lastPages[i]}\x1B[2m | \x1B[0m`;
+
+      for (let j = 0; j < 50; j++) {
+        const val = buf[i * pageSize + j];
+        if (val === 0) out += '\x1B[2m';
+        out += val.toString(16).padStart(2, '0');
+        if (val === 0) out += '\x1B[0m';
+        out += ' ';
+      }
+      out += '\n';
+    }
+
+    return out;
+  };
+
+  lastPages = [...pages.keys()];
+  lastMemory = exports.$;
+  console.log(memoryToString(lastMemory));
+}

package/runner/repl.js

@@ -1,14 +1,7 @@
 import compile from '../compiler/wrap.js';
+import rev from './version.js';
 
 import repl from 'node:repl';
-import fs from 'node:fs';
-
-let rev = 'unknown';
-try {
-  rev = fs.readFileSync(new URL('../.git/refs/heads/main', import.meta.url), 'utf8').trim().slice(0, 7);
-} catch {
-  rev = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version.split('-')[1];
-}
 
 // process.argv.push('-O0'); // disable opts
 
@@ -28,7 +21,7 @@ const memoryToString = mem => {
   const pages = lastPages.length;
   const wasmPages = mem.buffer.byteLength / PageSize;
 
-  out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KiB\x1B[0m for ${pages} things 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`;
 
   const buf = new Uint8Array(mem.buffer);
 
@@ -48,7 +41,7 @@ const memoryToString = mem => {
   return out;
 };
 
-const alwaysPrev = process.argv.includes('-always-prev');
+const alwaysPrev = process.argv.includes('-prev');
 
 let prev = '';
 const run = async (source, _context, _filename, callback, run = true) => {
@@ -56,7 +49,7 @@ const run = async (source, _context, _filename, callback, run = true) => {
   if (alwaysPrev) prev = toRun + ';\n';
 
   const { exports, wasm, pages } = await compile(toRun, []);
-  fs.writeFileSync('out.wasm', Buffer.from(wasm));
+  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
   if (run && exports.$) {
     lastMemory = exports.$;