From 436a476affba9be0331071108c43344ab43b5f11 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Mon, 25 Jun 2018 17:47:40 -0600
Subject: [PATCH] working on cc65 listing parse

---
 doc/notes.txt            |  4 ++
 src/ui.js                |  2 +-
 src/worker/nodemain.js   | 14 +++++-
 src/worker/workermain.js | 98 +++++++++++++++++++++++++---------------
 test/cli/testworker.js   |  4 ++
 5 files changed, 84 insertions(+), 38 deletions(-)

diff --git a/doc/notes.txt b/doc/notes.txt
index 8359f5c5..e33a060c 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -20,6 +20,7 @@ TODO:
 - multiple breakpoints, expression breakpoints
 - use localForage (https://github.com/localForage/localForage)
 
+- run apple CPU until boot
 - cc65 listing file parsing
 - better disasm/listing selection
 - disasm for z80
@@ -51,3 +52,6 @@ implicit rules
 only build files that have changed
 
 build options
+
+build project files
+
diff --git a/src/ui.js b/src/ui.js
index 06decdf3..86d58560 100644
--- a/src/ui.js
+++ b/src/ui.js
@@ -498,7 +498,7 @@ function setCompileOutput(data) {
     div.appendChild(tooltip);
     editor.setGutterMarker(line, "gutter-info", div);
   }
-  if (data.errors.length > 0) {
+  if (data.errors && data.errors.length > 0) {
     // TODO: move cursor to error line if offscreen?
     toolbar.addClass("has-errors");
     editor.clearGutter("gutter-info");
diff --git a/src/worker/nodemain.js b/src/worker/nodemain.js
index 7d7b04b6..a9b83c01 100644
--- a/src/worker/nodemain.js
+++ b/src/worker/nodemain.js
@@ -1,4 +1,6 @@
 
+// TODO: merge with workertestutils
+
 var assert = require('assert');
 var fs = require('fs');
 var vm = require('vm');
@@ -69,6 +71,16 @@ if (require.main == module) {
   var msgs = JSON.parse(data);
   for (var i=0; i<msgs.length; i++) {
     var result = handleMessage(msgs[i]);
-    console.log(result);
+    //console.log(result);
+    if (result && result.intermediate) {
+      for (var fn in result.intermediate) {
+        console.log("==="+fn);
+        console.log(result.intermediate[fn]);
+      }
+    }
+    for (var fn in workfs) {
+      if (fn.endsWith('.lstxxx'))
+        console.log(workfs[fn].data);
+    }
   }
 }
diff --git a/src/worker/workermain.js b/src/worker/workermain.js
index 5a4ce04d..011d7105 100644
--- a/src/worker/workermain.js
+++ b/src/worker/workermain.js
@@ -570,32 +570,57 @@ function compilePLASMA(code) {
   return assembleACME(outstr);
 }
 
-function parseCA65Listing(code, mapfile) {
-  // CODE                  00603E  00637C  00033F  00001
-  var mapMatch = /^CODE\s+([0-9A-F]+)/m.exec(mapfile);
-  var codeofs = 0x6000; // TODO
-  if (mapMatch) {
-    var codeofs = parseInt(mapMatch[1], 16);
-  }
+    /*
+    000000r 1               .segment        "CODE"
+    000000r 1               ; int main() { return mul2(2); }
+    000000r 1                       .dbg    line, "main.c", 3
+    000000r 1  A2 00                ldx     #$00
+    */
+function parseCA65Listing(code, symbols, dbg) {
+  var segofs = 0;
   // .dbg	line, "main.c", 1
-  var dbgLineMatch = /([0-9a-fA-F]+)([r]?)\s+(\d+)\s+[.]dbg\s+line,\s+\S+,\s+(\d+)/;
-  var errors = [];
+  var segLineMatch = /[.]segment\s+"(\w+)"/;
+  //var dbgLineMatch = /^([0-9A-F]+)([r]?)\s+(\d+)\s+[.]dbg\s+line,\s+\S+,\s+(\d+)/;
+  var dbgLineMatch = /^([0-9A-F]+)([r]?)\s+(\d+)\s+[.]dbg\s+line,\s+"(\w+[.]c)", (\d+)/;
+  var insnLineMatch = /^([0-9A-F]+)([r]?)\s+(\d+)\s+([0-9A-F][0-9A-F ]*[0-9A-F])\s+/;
   var lines = [];
-  var lastlinenum = 0;
+  var linenum = 0;
   for (var line of code.split(/\r?\n/)) {
-    var linem = dbgLineMatch.exec(line);
-    if (linem && linem[1]) {
-      var offset = parseInt(linem[1], 16);
-      var linenum = parseInt(linem[4]);
-      lines.push({
-        line:linenum,
-        offset:offset + codeofs,
-        insns:null
-      });
-      //console.log(linem, lastlinenum, lines[lines.length-1]);
+    linenum++;
+    var segm = segLineMatch.exec(line);
+    if (segm) {
+      var segname = segm[1];
+      var segsym = '__'+segname+'_RUN__';
+      // TODO: doesn't work on apple2, needs __MAIN_START__?
+      segofs = parseInt(symbols[segsym])|0;
+    }
+    if (dbg) {
+      var linem = dbgLineMatch.exec(line);
+      if (linem && linem[1]) {
+        var offset = parseInt(linem[1], 16);
+        lines.push({
+          // TODO: sourcefile
+          line:parseInt(linem[5]),
+          offset:offset + segofs,
+          insns:null
+        });
+      }
+    } else {
+      var linem = insnLineMatch.exec(line);
+      if (linem && linem[1]) {
+        var offset = parseInt(linem[1], 16);
+        var insns = linem[4].trim();
+        if (insns.length) {
+          lines.push({
+            line:linenum,
+            offset:offset + segofs,
+            insns:insns
+          });
+        }
+      }
     }
   }
-  return {lines:lines, errors:errors};
+  return lines;
 }
 
 function assembleCA65(step) {
@@ -665,12 +690,6 @@ function linkLD65(step) {
     var aout = FS.readFile("main", {encoding:'binary'});
     var mapout = FS.readFile("main.map", {encoding:'utf8'});
     var viceout = FS.readFile("main.vice", {encoding:'utf8'});
-    // TODO: multiple listing files
-    var lstout = FS.readFile("main.lst", {encoding:'utf8'});
-    var listing = parseCA65Listing(lstout, mapout);
-    //console.log(lstout);
-    //console.log(mapout);
-    var srclines = parseSourceLines(lstout, /[.]dbg\s+line, "main[.]c", (\d+)/i, /^\s*([0-9A-F]+)r/i, params.code_offset);
     // parse symbol map (TODO: omit segments, constants)
     var symbolmap = {};
     for (var s of viceout.split("\n")) {
@@ -679,14 +698,21 @@ function linkLD65(step) {
         symbolmap[toks[2].substr(1)] = parseInt(toks[1], 16);
       }
     }
+    // TODO: multiple listing files
+    var lstout = FS.readFile("main.lst", {encoding:'utf8'});
+    var asmlines = parseCA65Listing(lstout, symbolmap, false);
+    var srclines = parseCA65Listing(lstout, symbolmap, true);
     putWorkFile("main", aout);
+    putWorkFile("main.lst", lstout);
+    putWorkFile("main.map", mapout);
+    putWorkFile("main.vice", viceout);
     return {
-      output:aout.slice(0),
-      lines:listing.lines,
-      srclines:srclines,
-      errors:listing.errors,
+      output:aout, //.slice(0),
+      asmlines:srclines.length?asmlines:null,
+      lines:srclines.length?srclines:asmlines,
+      errors:errors,
       symbolmap:symbolmap,
-      intermediate:{listing:lstout+"\n"+mapout+"\n"+viceout, map:mapout, symbols:viceout}, // TODO
+      intermediate:{listing:lstout, map:mapout, symbols:viceout},
     };
   }
 }
@@ -781,7 +807,7 @@ l_main00101                     = 0003, L: test
 */
     var amap = FS.readFile(step.prefix+".map", {'encoding':'utf8'}); // TODO
     var aout = FS.readFile(step.prefix+".bin", {'encoding':'binary'});
-    var asmlines = parseListing(alst, /^(\d+)\s+([0-9A-F]+)\s+([0-9A-F][0-9A-F ]*[0-9A-F])\s+/i, 1, 2, 3); // TODO: , params.rom_start|0);
+    var asmlines = parseListing(alst, /^(\d+)\s+([0-9A-F]+)\s+([0-9A-F][0-9A-F ]*[0-9A-F])\s+/i, 1, 2, 3);
     var srclines = parseListing(alst, /^(\d+)\s+([0-9A-F]+)\s+;[(]null[)]:(\d+)/i, 3, 2, 1);
     return {
       output:aout,
@@ -984,7 +1010,7 @@ function linkSDLDZ80(step)
     //var dbgout = FS.readFile("main.cdb", {encoding:'utf8'});
     //   0000 21 02 00      [10]   52 	ld	hl, #2
     // TODO: use -u flag to find code_offset
-    var asmlines = parseListing(rstout, /^\s*([0-9A-F]+)\s+([0-9A-F][0-9A-F r]*[0-9A-F])\s+\[([0-9 ]+)\]\s+(\d+) (.*)/i, 4, 1, 2); //, 5, 3);
+    var asmlines = parseListing(rstout, /^\s*([0-9A-F]+)\s+([0-9A-F][0-9A-F r]*[0-9A-F])\s+\[([0-9 ]+)\]\s+(\d+) (.*)/i, 4, 1, 2);
     var srclines = parseSourceLines(rstout, /^\s+\d+ ;<stdin>:(\d+):/i, /^\s*([0-9A-F]{4})/i);
     // parse symbol map
     var symbolmap = {};
@@ -1102,7 +1128,7 @@ function assembleXASM6809(code, platform) {
     return {errors:errors};
   var aout = FS.readFile("main.bin", {encoding:'binary'});
   // 00001    0000 [ 2] 1048                asld
-  var asmlines = parseListing(alst, /^\s*([0-9A-F]+)\s+([0-9A-F]+)\s+\[([0-9 ]+)\]\s+(\d+) (.*)/i, 1, 2, 4, params.code_offset); //, 5, 3);
+  var asmlines = parseListing(alst, /^\s*([0-9A-F]+)\s+([0-9A-F]+)\s+\[([0-9 ]+)\]\s+(\d+) (.*)/i, 1, 2, 4);
   return {
       output:aout,
       errors:errors,
@@ -1179,7 +1205,7 @@ function assembleNAKEN(code, platform) {
   var alst = FS.readFile("out.lst", {encoding:'utf8'});
   //console.log(alst);
   // 0x0000: 77        ld (hl),a                                cycles: 4
-  var asmlines = parseListing(alst, /^0x([0-9a-f]+):\s+([0-9a-f]+)\s+(.+)cycles: (\d+)/i, 0, 1, 2); //, 3);
+  var asmlines = parseListing(alst, /^0x([0-9a-f]+):\s+([0-9a-f]+)\s+(.+)cycles: (\d+)/i, 0, 1, 2);
   return {
     output:aout,
     errors:errors,
diff --git a/test/cli/testworker.js b/test/cli/testworker.js
index e2931715..3d7cc6fe 100644
--- a/test/cli/testworker.js
+++ b/test/cli/testworker.js
@@ -4,6 +4,7 @@ var fs = require('fs');
 var wtu = require('./workertestutils.js');
 
 global.onmessage({data:{preload:'cc65', platform:'nes'}});
+global.onmessage({data:{preload:'ca65', platform:'nes'}});
 global.onmessage({data:{preload:'sdcc'}});
 
 //
@@ -64,6 +65,9 @@ describe('Worker', function() {
   it('should NOT compile CC65', function(done) {
     compile('cc65', 'int main() {\nint x=1;\nprintf("%d",x);\nreturn x+2;\n}', 'nes-conio', done, 0, 0, 1);
   });
+  it('should assemble CA65', function(done) {
+    compile('ca65', '\t.segment "HEADER"\n\t.segment "STARTUP"\n\t.segment "CHARS"\n\t.segment "VECTORS"\n\tlda #0\n\tsta $1\n', 'nes-conio', done, 40976, 2);
+  });
   /*
   it('should assemble Z80ASM', function(done) {
     compile('z80asm', '\tMODULE test\n\tEXTERN _puts\n\tld	hl,$0000\n\tret\n', 'mw8080bw', done, 4, 2, 0);