From 00621bdf16263220856495723f7d9fbef5c74dbb Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Fri, 14 Sep 2018 09:10:41 -0400
Subject: [PATCH] tigervision debugging; started verilog_bar; astrocade new
 header

---
 doc/notes.txt                    |   4 ++++
 index.html                       |   4 ++++
 presets/astrocade/acheader.s     |  16 +++++++---------
 presets/astrocade/acmenu.s       |  12 ++++++++++++
 src/baseplatform.ts              |  10 ++++++++--
 src/platform/astrocade.ts        |  13 +++++++++----
 src/platform/vcs.ts              |  10 ++++++++--
 src/platform/verilog.ts          |   9 +++++++--
 src/ui.ts                        |  11 ++++++++---
 test/cli/testplatforms.js        |   9 +++++++++
 test/roms/astrocade/cosmic.c.rom | Bin 0 -> 8192 bytes
 11 files changed, 76 insertions(+), 22 deletions(-)
 create mode 100644 presets/astrocade/acmenu.s
 create mode 100644 test/roms/astrocade/cosmic.c.rom

diff --git a/doc/notes.txt b/doc/notes.txt
index 49127078..e04bcd6a 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -66,6 +66,10 @@ TODO:
 - debug bankswitching for funky formats
 - "invalid ROM" error should show up better
 - spaces in filename don't parse code listing (DASM, maybe more)
+- zmac: item_lookup needs better hash function
+- 'undefined' for bitmap replacer
+- astrocade: run to cursor in hello world messes up emulation
+- requestInterrupt needs to be disabled after breakpoint?
 
 
 WEB WORKER FORMAT
diff --git a/index.html b/index.html
index d9b15971..7400d8d7 100644
--- a/index.html
+++ b/index.html
@@ -149,6 +149,10 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
     <button id="dbg_bitmap" type="submit" title="Edit Bitmap"><span class="glyphicon glyphicon-camera" aria-hidden="true"></span></button>
     <button id="dbg_record" type="submit" title="Start/Stop Replay Recording" style="display:none"><span class="glyphicon glyphicon-record" aria-hidden="true"></span></button>
   </span>
+  <span id="verilog_bar" style="display:none">
+    <span class="label"><span id="settle_label"></span> evals/clk</span>
+  </span>
+  
   <span class="dropdown" style="float:right">
     <a class="btn btn-secondary dropdown-toggle" id="booksMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
       GET BOOKS <span class="caret"></span>
diff --git a/presets/astrocade/acheader.s b/presets/astrocade/acheader.s
index 78020bce..a988634e 100644
--- a/presets/astrocade/acheader.s
+++ b/presets/astrocade/acheader.s
@@ -1,11 +1,9 @@
-
+
 ; Minimal header file for use with Astrocade C programs
 
-            .area _CODE
-            
-            .byte      0x55            ; ... with the code for a normal menued cartridge
-            .word      0x0218          ; Initialize menu
-            .word      PrgName         ; ... with string at PrgName
-            .word      _main           ; ... such that selecting the program enters PrgStart
-PrgName:    .ascii     "8BITWORKSHOP"  ; String
-            .byte      0               ; ... which must be followed by 0
+	.area _CODE
+
+	jp	start		; jump to main()
+start:
+	ld	sp,#0x4fce
+	jp	_main
diff --git a/presets/astrocade/acmenu.s b/presets/astrocade/acmenu.s
new file mode 100644
index 00000000..b32e8faf
--- /dev/null
+++ b/presets/astrocade/acmenu.s
@@ -0,0 +1,12 @@
+
+; Minimal header file for use with Astrocade C programs
+
+	.area _CODE
+
+	.byte	0x55            ; ... with the code for a normal menued cartridge
+	.word	0x0218          ; Initialize menu
+	.word	PrgName         ; ... with string at PrgName
+	.word	_main           ; ... such that selecting the program enters PrgStart
+PrgName:
+	.ascii	"8BITWORKSHOP"  ; String
+	.byte	0               ; ... which must be followed by 0
diff --git a/src/baseplatform.ts b/src/baseplatform.ts
index f6c13970..492b5973 100644
--- a/src/baseplatform.ts
+++ b/src/baseplatform.ts
@@ -15,7 +15,10 @@ export interface OpcodeMetadata {
 }
 
 export interface CpuState {
-  PC:number, T?:number, o?:number,/*opcode*/
+  PC:number;
+  EPC?:number; // effective PC (for bankswitching)
+  T?:number;
+  o?:number;/*opcode*/
   SP?:number
   /*
   A:number, X:number, Y:number, SP:number, R:boolean, 
@@ -425,7 +428,6 @@ export abstract class BaseZ80Platform extends BaseDebugPlatform {
     var targetTstates = cpu.getTstates() + cycles;
     if (debugCond) { // || trace) {
       while (cpu.getTstates() < targetTstates) {
-        //_trace(); // TODO
         if (debugCond && debugCond()) {
           debugCond = null;
           break;
@@ -437,6 +439,10 @@ export abstract class BaseZ80Platform extends BaseDebugPlatform {
     }
     return cpu.getTstates() - targetTstates;
   }
+  requestInterrupt(cpu, data) {
+    if (!this.wasBreakpointHit())
+      cpu.requestInterrupt(data);
+  }
   postFrame() {
     if (this.debugCondition && !this.debugBreakState) {
       this.debugSavedState = this.saveState();
diff --git a/src/platform/astrocade.ts b/src/platform/astrocade.ts
index c82b809b..dd88d4e9 100644
--- a/src/platform/astrocade.ts
+++ b/src/platform/astrocade.ts
@@ -86,6 +86,10 @@ const _BallyAstrocadePlatform = function(mainElement, arcade) {
   
   function ramwrite(a:number, v:number) {
     ram.mem[a] = v;
+    ramupdate(a, v);
+  }
+  
+  function ramupdate(a:number, v:number) {
     var ofs = a*4+3; // 4 pixels per byte
     for (var i=0; i<4; i++) {
       var lr = ((a % swbytes) >= (horcb & 0x3f)) ? 0 : 4;
@@ -97,7 +101,7 @@ const _BallyAstrocadePlatform = function(mainElement, arcade) {
   function refreshline(y:number) {
     var ofs = y*swidth/4;
     for (var i=0; i<swidth/4; i++)
-      ramwrite(ofs+i, ram.mem[ofs+i]);
+      ramupdate(ofs+i, ram.mem[ofs+i]);
   }
   
   function magicwrite(a:number, v:number) {
@@ -295,9 +299,10 @@ const _BallyAstrocadePlatform = function(mainElement, arcade) {
   
   advance(novideo : boolean) {
     for (var sl=0; sl<sheight; sl++) {
+      //console.log(sl, hex(cpu.getPC(),4), cpu.saveState());
       this.runCPU(cpu, cpuCyclesPerLine);
       if (sl == inlin && (inmod & 0x8)) {
-        cpu.requestInterrupt(infbk);
+        this.requestInterrupt(cpu, infbk);
       }
       if (refreshlines>0) {
         refreshline(sl);
@@ -326,7 +331,7 @@ const _BallyAstrocadePlatform = function(mainElement, arcade) {
   }
 
   loadState(state) {
-    cpu.loadState(state.c);
+    cpu.loadState(state.c); // TODO: this causes problems on reset+debug
     ram.mem.set(state.b);
     palette.set(state.palette);
     magicop = state.magicop;
@@ -339,6 +344,7 @@ const _BallyAstrocadePlatform = function(mainElement, arcade) {
     infbk = state.infbk;
     verbl = state.verbl;
     this.loadControlsState(state);
+    refreshall();
   }
   saveState() {
     return {
@@ -408,7 +414,6 @@ class AstrocadeAudio extends AY38910_Audio {
         var j = val*2+1;
         this.psg.writeRegisterAY(i, j&0xff); // freq lo
         this.psg.writeRegisterAY(i+1, (j>>8)&0xff); // freq hi
-        console.log(i,j);
         break;
       case 5:
         this.psg.writeRegisterAY(10, val & 0xf); // tone c vol
diff --git a/src/platform/vcs.ts b/src/platform/vcs.ts
index cd47cfd6..0aed75dd 100644
--- a/src/platform/vcs.ts
+++ b/src/platform/vcs.ts
@@ -156,7 +156,10 @@ class VCSPlatform extends BasePlatform {
     return state;
   }
   fixState(state) {
-    state.c.EPC = state.c.PC + (state.ca.bo || 0); // effective PC for ROM
+    var ofs = state.ca.bo || 0;
+    if (state.ca.fo && (state.c.PC & 0xfff) >= 2048)
+      ofs = state.ca.fo; // 3E/3F fixed-slice formats
+    state.c.EPC = state.c.PC + ofs; // ofs = effective PC for ROM
   }
   loadState(state) {
     return Javatari.room.console.loadState(state);
@@ -216,12 +219,15 @@ class VCSPlatform extends BasePlatform {
   }
   getDebugInfo(category, state) {
     switch (category) {
-      case 'CPU':    return (state.ca.bo ? ("BankOffset "+hex(state.ca.bo)+"\n"):"") + this.cpuStateToLongString(state.c);
+      case 'CPU':    return this.cpuStateToLongString(state.c) + this.bankSwitchStateToString(state);
       case 'Stack':	 return dumpStackToString(this, this.getRAMForState(state), 0x100, 0x1ff, 0x100+state.c.SP, 0x20);
       case 'PIA':    return this.ramStateToLongString(state) + "\n" + this.piaStateToLongString(state.p);
       case 'TIA':    return this.tiaStateToLongString(state.t);
     }
   }
+  bankSwitchStateToString(state) {
+    return (state.ca.bo !== undefined ? ("BankOffset "+hex(state.ca.bo,4)+"\n"):"");
+  }
   piaStateToLongString(p) {
     return "Timer  " + p.t + "/" + p.c + "\nINTIM  $" + hex(p.IT,2) + " (" + p.IT + ")\nINSTAT $" + hex(p.IS,2) + "\n";
   }
diff --git a/src/platform/verilog.ts b/src/platform/verilog.ts
index 4120f7a1..08490f2e 100644
--- a/src/platform/verilog.ts
+++ b/src/platform/verilog.ts
@@ -124,7 +124,7 @@ export function VL_RANDOM_I(bits) { return 0 | Math.floor(Math.random() * (1<<bi
 abstract class VerilatorBase {
 
   totalTicks = 0;
-  maxVclockLoop = 1;
+  maxVclockLoop = 0;
   clk = 0;
   reset = 0;
 
@@ -182,7 +182,11 @@ abstract class VerilatorBase {
     }
     if (__VclockLoop > this.maxVclockLoop) {
       this.maxVclockLoop = __VclockLoop;
-      console.log("Graph took " + this.maxVclockLoop + " iterations to stabilize");
+      if (this.maxVclockLoop > 1) {
+        console.log("Graph took " + this.maxVclockLoop + " iterations to stabilize");
+        $("#verilog_bar").show();
+        $("#settle_label").text(this.maxVclockLoop+"");
+      }
     }
     this.totalTicks++;
   }
@@ -666,6 +670,7 @@ var VerilogPlatform = function(mainElement, options) {
     trace_index = 0;
     if (trace_buffer) trace_buffer.fill(0);
     if (video) video.setRotate(gen.rotate ? -90 : 0);
+    $("#verilog_bar").hide();
   }
   tick() {
     gen.tick2();
diff --git a/src/ui.ts b/src/ui.ts
index bd713201..43679915 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -224,8 +224,12 @@ function getSkeletonFile(fileid:string, callback) {
 
 function _createNewFile(e) {
   // TODO: support spaces
-  var filename = prompt("Create New File (no spaces)", "newfile" + platform.getDefaultExtension());
+  var filename = prompt("Create New File", "newfile" + platform.getDefaultExtension());
   if (filename && filename.length) {
+    if (filename.indexOf(" ") >= 0) {
+      alert("No spaces, please.");
+      return;
+    }
     if (filename.indexOf(".") < 0) {
       filename += platform.getDefaultExtension();
     }
@@ -828,8 +832,9 @@ function setupDebugControls(){
   $("#dbg_reset").click(resetAndDebug);
   $("#dbg_pause").click(pause);
   $("#dbg_go").click(resume);
-  Mousetrap.bindGlobal('ctrl+alt+p', togglePause);
-  Mousetrap.bindGlobal('ctrl+alt+r', resetAndDebug);
+  Mousetrap.bindGlobal('ctrl+alt+p', pause);
+  Mousetrap.bindGlobal('ctrl+alt+r', resume);
+  Mousetrap.bindGlobal('ctrl+alt+.', resetAndDebug);
 
   if (platform.step) {
     $("#dbg_step").click(singleStep).show();
diff --git a/test/cli/testplatforms.js b/test/cli/testplatforms.js
index 8b13e47e..e3edfbce 100644
--- a/test/cli/testplatforms.js
+++ b/test/cli/testplatforms.js
@@ -39,6 +39,7 @@ var _galaxian = require('gen/platform/galaxian.js');
 var _vector = require('gen/platform/vector.js');
 var _williams = require('gen/platform/williams.js');
 var _sound_williams = require('gen/platform/sound_williams.js');
+var _astrocade = require('gen/platform/astrocade.js');
 
 //
 
@@ -211,6 +212,14 @@ describe('Platform Replay', () => {
     });
   });
 */
+
+  it('Should run astrocade', () => {
+    var platform = testPlatform('astrocade', 'cosmic.c.rom', 92, (platform, frameno) => {
+      if (frameno == 62) {
+        keycallback(Keys.VK_SPACE.c, Keys.VK_SPACE.c, 1);
+      }
+    });
+  });
 });
 
 
diff --git a/test/roms/astrocade/cosmic.c.rom b/test/roms/astrocade/cosmic.c.rom
new file mode 100644
index 0000000000000000000000000000000000000000..5b4237377c6a1af1a025412b2170dac33ee8d7e8
GIT binary patch
literal 8192
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
HIRgI%z_*mW

literal 0
HcmV?d00001