Merge branch 'next-release'

devices/pdp11/machine/1170/panel/README.md

@@ -7,10 +7,20 @@ machines:
     type: pdp11
 ---
 
+PDP-11/70 with 256Kb and Front Panel
+---
+
+The machine below is a PDP-11/70 includes our stylized Front Panel and a "teletype" I/O window connected to the
+PDP-11/70's serial port.  If you want a Debugger, see our collection of similar [PDP-11/70 Machines with Debugger](debugger/).
+
+Other attached I/O devices include:
+
+- [PC11 Paper Tape Reader](/devices/pdp11/pc11/)
+- [RX11 Disk Controller](/devices/pdp11/rx11/)
+- [RK11 Disk Controller](/devices/pdp11/rk11/)
+- [RL11 Disk Controller](/devices/pdp11/rl11/)
+
+Our [PDP-11 Boot Monitor](/apps/pdp11/boot/monitor/) is preloaded at address 140000, and the
+[M9312 ROM](/devices/pdp11/rom/M9312/) is installed at address 165000. 
+
 {% include machine.html id="test1170" %}
-
-This machine is also available with our built-in [Debugger](debugger/).
-
-Other interesting things to know about this machine:
-
-* It includes an [M9312 ROM](/devices/pdp11/rom/M9312/) at address 165000.  The exact ROM is [23-616F1](/devices/pdp11/rom/M9312/23-616F1.txt).

devices/pdp11/machine/1170/panel/debugger/README.md

@@ -10,12 +10,26 @@ machines:
     sticky: top
 ---
 
+PDP-11/70 with 256Kb, Front Panel, and Debugger
+---
+
+The machine below is a PDP-11/70 with a stripped-down interface that includes our stylized Front Panel and
+a "teletype" I/O window connected to the PDP-11/70's serial port.  The I/O window is shared with the built-in
+PDPjs Debugger.
+
+To make it easier to interact with the Front Panel [Toggle-In Demos](#toggle-ins) below, we've kept this machine's UI
+simple, so there are no other I/O devices attached.  Our [PDP-11 Boot Monitor](/apps/pdp11/boot/monitor/) is preloaded
+at address 140000, and the [M9312 ROM](/devices/pdp11/rom/M9312/) is installed at address 165000. 
+
+For more full-featured PDP-11/70 machines that also include a Debugger, see:
+
+- [PDP-11/70 running CPU Exerciser](cpuexer/)
+- [PDP-11/70 ready to boot RSTS/E](rsts/)
+- [PDP-11/70 ready to boot RT-11](rt11/)
+- [PDP-11/70 ready to boot XXDP+ Diagnostics](xxdp/)
+
 {% include machine.html id="test1170" %}
 
-Other interesting things to know about this machine:
-
-* It includes an [M9312 ROM](/devices/pdp11/rom/M9312/) at address 165000.  The exact ROM is [23-616F1](/devices/pdp11/rom/M9312/23-616F1.txt).
-
 Toggle-Ins
 ----------
 

devices/pdp11/machine/1170/panel/debugger/rt11/README.md

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: PDP-11/70 with Front Panel and Debugger
-permalink: /devices/pdp11/machine/1170/panel/debugger/xxdp/
+permalink: /devices/pdp11/machine/1170/panel/debugger/rt11/
 machines:
   - id: test1170
     type: pdp11
@@ -17,7 +17,9 @@ machines:
         path: /apps/pdp11/tapes/absloader/DEC-11-L2PC-PO.json
 ---
 
-This machine is ready to boot [XXDP+ Diagnostics](/disks/dec/rl02k/xxdp/) ("BOOT RL0") and run
+This machine is ready to boot [RT-11 v4.0](/disks/dec/rk03/rtl11v4/) ("BOOT RK0").
+
+Alternatively, you can also boot [XXDP+ Diagnostics](/disks/dec/rl02k/xxdp/) ("BOOT RL0") and run
 diagnostics (e.g., "R EKBEE1"):
 
 - [EKBAD0: 11/70 CPU DIAGNOSTIC (PART 1)](/disks/dec/rl02k/xxdp/ekbad0/)
@@ -27,7 +29,3 @@ diagnostics (e.g., "R EKBEE1"):
 For more information about booting and running these diagnostics, see [XXDP+ Diagnostics](/disks/dec/rl02k/xxdp/).
 
 {% include machine.html id="test1170" %}
-
-Other interesting things to know about this machine:
-
-* It includes an [M9312 ROM](/devices/pdp11/rom/M9312/) at address 165000.  The exact ROM is [23-616F1](/devices/pdp11/rom/M9312/23-616F1.txt).

devices/pdp11/panel/1170/front.xml

@@ -204,7 +204,7 @@
 		</control>
 	</control>
 	<control type="container" class="pcjs-textarea" width="60%" padTop="8px" padBottom="8px">
-		<control type="textarea" binding="print" width="100%" height="280px" padRight="8px" pos="relative" style="resize:vertical;"/>
+		<control type="textarea" binding="print" width="100%" height="400px" padRight="8px" pos="relative" style="resize:vertical;"/>
 	</control>
 	<control type="container" class="pcjs-registers" width="35%" padding="8px">
 		<control type="button" binding="run">Run</control>

modules/pdp11/lib/cpustate.js

@@ -505,8 +505,13 @@ class CPUStatePDP11 extends CPUPDP11 {
         /*
          * If updates to MMR1 have not been shut off (ie, MMR0.ABORT bits are clear), then we are allowed
          * to sync MMR1 with its real-time counterpart in opLast.
+         *
+         * UPDATE: Apparently, I was mistaken that this register would only be updated when the MMR0 ENABLED
+         * bit was set.
+         *
+         *      if ((this.regMMR0 & (PDP11.MMR0.ABORT | PDP11.MMR0.ENABLED)) == PDP11.MMR0.ENABLED)
          */
-        if ((this.regMMR0 & (PDP11.MMR0.ABORT | PDP11.MMR0.ENABLED)) == PDP11.MMR0.ENABLED) {
+        if (!(this.regMMR0 & PDP11.MMR0.ABORT)) {
             this.regMMR1 = (this.opLast >> 16) & 0xffff;
         }
         var result = this.regMMR1;
@@ -527,8 +532,13 @@ class CPUStatePDP11 extends CPUPDP11 {
         /*
          * If updates to MMR2 have not been shut off (ie, MMR0.ABORT bits are clear), then we are allowed
          * to sync MMR2 with its real-time counterpart in opLast.
+         *
+         * UPDATE: Apparently, I was mistaken that this register would only be updated when the MMR0 ENABLED
+         * bit was set.
+         *
+         *      if ((this.regMMR0 & (PDP11.MMR0.ABORT | PDP11.MMR0.ENABLED)) == PDP11.MMR0.ENABLED)
          */
-        if ((this.regMMR0 & (PDP11.MMR0.ABORT | PDP11.MMR0.ENABLED)) == PDP11.MMR0.ENABLED) {
+        if (!(this.regMMR0 & PDP11.MMR0.ABORT)) {
             this.regMMR2 = this.opLast & 0xffff;
         }
         return this.regMMR2;

pubs/dec/pdp11/papers/README.md

@@ -7,7 +7,7 @@ permalink: /pubs/dec/pdp11/papers/
 Assorted PDP-11 Research Papers
 ---
 
-The following is an assortment of research papers by [Gordon Bell](research.microsoft.com/~gbell/) and others:
+The following is an assortment of research papers by [Gordon Bell](http://research.microsoft.com/~gbell/) and others:
 
 - A New Architecture for Mini-Computers: The DEC PDP-11 [[Original PDF](http://research.microsoft.com/en-us/um/people/gbell/CGB%20Files/New%20Architecture%20PDP11%20SJCC%201970%20c.pdf)]
 - PMS (Processor-Memory-Switch) and ISP (Instruction Set Processor) Descriptive Systems for Computer Structure [[Original PDF](http://research.microsoft.com/en-us/um/people/gbell/CGB%20Files/PMS%20and%20ISP%20Descriptive%20Systems%201970%20c.pdf)]