1 files changed, 24 insertions, 28 deletions

diff --git a/src/js/extract_lsp.js b/src/js/extract_lsp.js
index 14ee279..bdbcb3c 100644
--- a/src/js/extract_lsp.js
+++ b/src/js/extract_lsp.js
@@ -1,13 +1,12 @@
-// writes the language server's javascript image: the genome build/lsp/genome.h,
-// made by src/tools/mklsp.sh, and the map it was built for, read from
-// build/lsp/map/memmap.h. the vm needs the layout, because the server's map is
-// not the compiler's. the image is generated, so it goes to build/js/ and
-// nothing is left in the tree.
+// writes the language server's javascript image: build/js/lsp.bin, the server's
+// genome (build/lsp/lsp_genome.bin, made by src/tools/mklsp.sh), and
+// build/js/lsp.json, the map it was built for, read from build/lsp/memmap.h. the
+// vm needs the layout, because the server's map is not the compiler's. the image
+// is generated, so it goes to build/js/ and nothing is left in the tree.
 //
-//   node src/js/extract_lsp.js [--out PATH]
+//   node src/js/extract_lsp.js [--lsp DIR] [--out DIR]
 //
-// build the lsp first (`make lsp`, or src/tools/mklsp.sh); it needs
-// build/lsp/genome.h.
+// build the lsp first (`make lsp`, or src/tools/mklsp.sh).
 const fs = require('fs');
 const path = require('path');
 const root = path.join(__dirname, '..', '..');
@@ -15,42 +14,39 @@ const root = path.join(__dirname, '..', '..');
 const args = process.argv.slice(2);
 if (args.includes('--help') || args.includes('-h')) {
     console.log([
-        'usage: node src/js/extract_lsp.js [--out PATH]',
-        'converts the language server genome and its memory map into a javascript image.',
+        'usage: node src/js/extract_lsp.js [--lsp DIR] [--out DIR]',
+        'copies the language server genome beside a json description of its memory map.',
         'options:',
-        '  --out PATH   where to write; defaults to build/js/lsp.json',
+        '  --lsp DIR    the language server build to read; defaults to build/lsp',
+        '  --out DIR    where to write lsp.bin and lsp.json; defaults to build/js',
         '  --help, -h   show this help and exit',
     ].join('\n'));
     process.exit(0);
 }
-let out = path.join(root, 'build', 'js', 'lsp.json');
+let out = path.join(root, 'build', 'js'), lsp = path.join(root, 'build', 'lsp');
 for (let i = 0; i < args.length; i++) {
-    if (args[i] === '--out' && args[i + 1]) out = args[i + 1];
+    if (args[i] === '--out' && args[i + 1]) out = args[++i];
+    else if (args[i] === '--lsp' && args[i + 1]) lsp = args[++i];
     else {
         console.error('extract_lsp: unexpected arguments; use --help for usage');
         process.exit(2);
     }
 }
 
-const genomePath = path.join(root, 'build', 'lsp', 'genome.h');
-const mapPath = path.join(root, 'build', 'lsp', 'map', 'memmap.h');
+const genomePath = path.join(lsp, 'lsp_genome.bin');
+const mapPath = path.join(lsp, 'memmap.h');
 if (!fs.existsSync(genomePath)) {
     console.error('extract_lsp: no language server image at ' + genomePath + '; run `make lsp` first');
     process.exit(1);
 }
-const genome = fs.readFileSync(genomePath, 'utf8');
-
 const { mapValues } = require('./mapvalues.js');
 const layout = mapValues(mapPath, ['GORG', 'DS0', 'DSLIM', 'RS0', 'RSLIM', 'SYSGATE', 'ZFP', 'HEAP_LO', 'HEAP_HI']);
+const image = fs.readFileSync(genomePath);
+if (image.length % 8) throw new Error(genomePath + ' is not a whole number of words');
+const glen = image.length / 8;
 
-const gorg = parseInt(genome.match(/#define\s+GORG\s+(\d+)/)[1], 10);
-const glen = parseInt(genome.match(/#define\s+GLEN\s+(\d+)/)[1], 10);
-const arr = genome.match(/genome\[\]\s*=\s*\{([\s\S]*?)\};/);
-const words = arr[1].split(',').map(s => s.trim()).filter(s => s.length > 0);
-if (words.length !== glen) throw new Error('genome has ' + words.length + ' words, GLEN says ' + glen);
-if (gorg !== layout.GORG) throw new Error('genome GORG ' + gorg + ' is not the map GORG ' + layout.GORG);
-
-fs.mkdirSync(path.dirname(out), { recursive: true });
-fs.writeFileSync(out, JSON.stringify({ gorg, glen, layout, words }));
-console.log('wrote ' + path.relative(root, out) + ': genome ' + glen + ' words at ' + gorg +
-    ', heap ' + layout.HEAP_LO + '..' + layout.HEAP_HI);
\ No newline at end of file
+fs.mkdirSync(out, { recursive: true });
+fs.copyFileSync(genomePath, path.join(out, 'lsp.bin'));
+fs.writeFileSync(path.join(out, 'lsp.json'), JSON.stringify({ gorg: layout.GORG, glen, layout }));
+console.log('wrote ' + path.relative(root, path.join(out, 'lsp.bin')) + ': genome ' + glen + ' words at ' + layout.GORG +
+    ', heap ' + layout.HEAP_LO + '..' + layout.HEAP_HI);