From 49b5e34ba2f8ff7334f54f978bb1d23ecc60e4a7 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <jeff@pcjs.org>
Date: Sat, 22 Oct 2016 01:36:45 -0700
Subject: [PATCH] Remove all debugger.js files when running uncompiled without
 the Debugger, and some PDP-11 layout fixes

---
 devices/pdp11/panel/1170/debugger/front.xml    |  4 ++--
 devices/pdp11/panel/1170/front.xml             |  2 +-
 devices/pdp11/panel/test/debugger/terminal.xml |  2 +-
 devices/pdp11/panel/test/terminal.xml          |  2 +-
 modules/htmlout/lib/htmlout.js                 |  6 +++---
 modules/pdp11/lib/cpustate.js                  | 15 +++++++++++++--
 modules/pdp11/lib/device.js                    |  2 +-
 7 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/devices/pdp11/panel/1170/debugger/front.xml b/devices/pdp11/panel/1170/debugger/front.xml
index 55bcbb59b..bd940af42 100644
--- a/devices/pdp11/panel/1170/debugger/front.xml
+++ b/devices/pdp11/panel/1170/debugger/front.xml
@@ -93,7 +93,7 @@
 			<control type="button" binding="clear">Clear</control>
 		</control>
 	</control>
-	<control type="container" class="pcjs-registers" width="35%" padTop="8px" padLeft="8px">
+	<control type="container" class="pcjs-registers" width="35%" padding="8px">
 		<name>Registers</name>
 		<control type="register" label="R0" binding="R0" pos="left" width="60px" padRight="8px" padBottom="8px">0000</control>
 		<control type="register" label="R1" binding="R1" pos="left" width="60px" padRight="8px" padBottom="8px">0000</control>
@@ -111,7 +111,7 @@
 			<control type="flag" label="C" binding="CF" width="8px" padRight="4px" padBottom="8px">0</control>
 		</control>
 	</control>
-	<control type="container" padTop="8px" padBottom="8px">
+	<control type="container" class="pcjs-registers" width="35%" padding="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="step">Step</control>
 		<control type="button" binding="reset">Reset</control>
diff --git a/devices/pdp11/panel/1170/front.xml b/devices/pdp11/panel/1170/front.xml
index a4e4ef721..6c0c91ca5 100644
--- a/devices/pdp11/panel/1170/front.xml
+++ b/devices/pdp11/panel/1170/front.xml
@@ -88,7 +88,7 @@
 	<control type="container" class="pcjs-textarea" width="60%" padTop="8px" padBottom="8px">
 		<control type="textarea" binding="print" width="100%" height="252px" padRight="8px" pos="relative" style="resize:vertical;"/>
 	</control>
-	<control type="container" padTop="8px" padBottom="8px">
+	<control type="container" class="pcjs-registers" width="35%" padding="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Fast</control>
diff --git a/devices/pdp11/panel/test/debugger/terminal.xml b/devices/pdp11/panel/test/debugger/terminal.xml
index a9d56a0db..ec502d4eb 100644
--- a/devices/pdp11/panel/test/debugger/terminal.xml
+++ b/devices/pdp11/panel/test/debugger/terminal.xml
@@ -27,7 +27,7 @@
 			<control type="flag" label="C" binding="CF" width="8px" padRight="4px" padBottom="8px">0</control>
 		</control>
 	</control>
-	<control type="container" width="35%" padLeft="8px" padBottom="8px">
+	<control type="container" class="pcjs-registers" width="35%" padLeft="8px" padBottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="step">Step</control>
 		<control type="button" binding="reset">Reset</control>
diff --git a/devices/pdp11/panel/test/terminal.xml b/devices/pdp11/panel/test/terminal.xml
index fe89b180c..cc7286b6b 100644
--- a/devices/pdp11/panel/test/terminal.xml
+++ b/devices/pdp11/panel/test/terminal.xml
@@ -22,7 +22,7 @@
 			<control type="flag" label="C" binding="CF" width="8px" padRight="4px" padBottom="8px">0</control>
 		</control>
 	</control>
-	<control type="container" width="35%" padLeft="8px" padBottom="8px">
+	<control type="container" class="pcjs-registers" width="35%" padLeft="8px" padBottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Fast</control>
diff --git a/modules/htmlout/lib/htmlout.js b/modules/htmlout/lib/htmlout.js
index c7f69d4ef..8bdaabeeb 100644
--- a/modules/htmlout/lib/htmlout.js
+++ b/modules/htmlout/lib/htmlout.js
@@ -1929,13 +1929,13 @@ HTMLOut.prototype.processMachines = function(aMachines, buildOptions, done)
                     }
                 }
                 /*
-                 * Step 2: If there's a "debugger.js" source file in the list of uncompiled files, we need to remove
-                 * it, which we do by using the Array splice() method, removing the 1 matching element from the array.
+                 * Step 2: If there are "debugger.js" source files in the list of uncompiled files, we need to remove
+                 * them, which we do by using the Array splice() method, removing the matching element(s) from the array.
                  */
                 for (i = 0; i < asFiles.length; i++) {
                     if (asFiles[i].indexOf("/debugger.js") >= 0) {
                         asFiles.splice(i, 1);
-                        break;
+                        i--;
                     }
                 }
             }
diff --git a/modules/pdp11/lib/cpustate.js b/modules/pdp11/lib/cpustate.js
index f60c54c1b..75256ade6 100644
--- a/modules/pdp11/lib/cpustate.js
+++ b/modules/pdp11/lib/cpustate.js
@@ -332,6 +332,17 @@ CPUStatePDP11.prototype.getMMR1 = function()
     return result;
 };
 
+/**
+ * getMMR3()
+ *
+ * @this {CPUStatePDP11}
+ * @return {number}
+ */
+CPUStatePDP11.prototype.getMMR3 = function()
+{
+    return this.regMMR3;
+};
+
 /**
  * setMMR3()
  *
@@ -1133,7 +1144,7 @@ CPUStatePDP11.prototype.trap = function(vector, reason)
         doubleTrap = true;
     }
 
-    if (!(this.regMMR0 & 0xe000)) {
+    if (!(this.regMMR0 & PDP11.MMR0.ABORT)) {
         this.regMMR1 = 0xf6f6;
         this.regMMR2 = vector;
     }
@@ -2103,7 +2114,7 @@ CPUStatePDP11.prototype.stepCPU = function(nMinCycles)
 
     do {
         if (DEBUGGER && nDebugCheck) {
-            if (this.dbg.checkInstruction(this.getPC(), nDebugState)) {
+            if (this.dbg && this.dbg.checkInstruction(this.getPC(), nDebugState)) {
                 this.stopCPU();
                 break;
             }
diff --git a/modules/pdp11/lib/device.js b/modules/pdp11/lib/device.js
index d892c0e7f..ab4bc2101 100644
--- a/modules/pdp11/lib/device.js
+++ b/modules/pdp11/lib/device.js
@@ -290,7 +290,7 @@ DevicePDP11.prototype.writeMMR2 = function(data, addr)
  */
 DevicePDP11.prototype.readMMR3 = function(addr)
 {
-    return this.cpu.regMMR3;
+    return this.cpu.getMMR3();
 };
 
 /**