From 7c26b05602372d9e2c524ff55c2e9e85a5457e20 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Sun, 25 Nov 2018 13:42:23 -0500
Subject: [PATCH] nicer TMS9918 debug info

---
 index.html            |  2 +-
 package-lock.json     |  2 +-
 src/video/tms9918a.ts | 27 +++++++++++++++++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 5b0185be..307a19c8 100644
--- a/index.html
+++ b/index.html
@@ -171,7 +171,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
     <span class="logo-gradient hidden-xs hidden-sm">8bitworkshop</span>
     &nbsp;
     <a class="btn btn-secondary dropdown-toggle" id="booksMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      GET BOOKS <span class="caret"></span>
+      &gt;GET BOOKS <span class="caret"></span>
     </a>
     <ul class="dropdown-menu pull-right" aria-labelledby="dropdownMenuButton">
       <li>
diff --git a/package-lock.json b/package-lock.json
index bbd5685b..abfc8345 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "8bitworkshop",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/video/tms9918a.ts b/src/video/tms9918a.ts
index 9fe7b621..50135207 100644
--- a/src/video/tms9918a.ts
+++ b/src/video/tms9918a.ts
@@ -10,7 +10,7 @@
  * GNU General Public License v2.0
  */
 
- import { hex } from "../util";
+import { hex, lpad } from "../util";
 
 enum TMS9918A_Mode {
   GRAPHICS = 0,
@@ -558,13 +558,28 @@ export class TMS9918A {
     }
 
     getRegsString() : string {
-        var s = "";
+        const w = 20;
+        var s = "Registers:";
         for (var i = 0; i < this.registers.length; i++) {
-            s += "VR" + i + ":" + hex(this.registers[i],2) + " ";
+            s += " " + hex(this.registers[i],2);
         }
-        s += "\nSIT:" + hex(this.nameTable,4) + " PDT:" + hex(this.charPatternTable,4) + " (" + hex(this.patternTableSize(),4) + ")" +
-             " CT:" + hex(this.colorTable,4) + " (" + hex(this.colorTableSize(),4) + ") SDT:" + hex(this.spritePatternTable,4) +
-             " SAL:" + hex(this.spriteAttributeTable,4) + "\nVDP: " + hex(this.addressRegister,4);
+        s += "\n\n";
+        var tables : [string,number,number][] = [
+            ["Pattern Table", this.charPatternTable, this.patternTableSize()],
+            ["Image Table", this.nameTable, 0x300],
+            ["Color Table", this.colorTable, this.colorTableSize()],
+            ["Sprite Patterns", this.spritePatternTable, 64*32],
+            ["Sprite Attributes", this.spriteAttributeTable, 4*32],
+        ];
+        for (var row of tables) {
+            if (row[2] > 0)
+                s += lpad(row[0], w) + ": $" + hex(row[1],4) + " - $" + hex(row[1]+row[2]-1,4) + "\n";
+        }
+        s += lpad("Address Register",w) + ": $" + hex(this.addressRegister,4) + "\n";
+        s += lpad("Screen Mode",w) + ":  " + this.screenMode + "\n";
+        s += lpad("Display On",w) + ":  " + this.displayOn + "\n";
+        if (this.ramMask != 0x3fff)
+            s += lpad("RAM Mask",w) + ":  " + this.ramMask + "\n";
         return s;
     }