From df5eb664293d2b40d7b76598e856f72a12ee62c4 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <jeff@pcjs.org>
Date: Sat, 28 Jan 2017 23:39:03 -0800
Subject: [PATCH] Instead of hard-coding the 'resume' setting inside individual
 machine files, we now support a 'resume' setting inside a page's machine
 properties

---
 .../pc8080/machine/vt100/debugger/machine-right.xml  |  2 +-
 devices/pc8080/machine/vt100/debugger/machine.xml    |  2 +-
 devices/pc8080/machine/vt100/machine-right.xml       |  2 +-
 devices/pc8080/machine/vt100/machine.xml             |  2 +-
 devices/pdp11/machine/1170/vt100/README.md           |  2 ++
 devices/pdp11/machine/1170/vt100/debugger/README.md  |  2 ++
 .../machine/1170/vt100/debugger/machine-left.xml     |  2 +-
 devices/pdp11/machine/1170/vt100/machine-left.xml    |  2 +-
 modules/pc8080/lib/computer.js                       |  6 ++----
 modules/pcx86/lib/computer.js                        |  4 +---
 modules/pdp11/lib/computer.js                        |  6 ++----
 versions/pc8080/1.32.2/pc8080-dbg.js                 | 12 ++++++------
 versions/pc8080/1.32.2/pc8080.js                     |  4 ++--
 13 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/devices/pc8080/machine/vt100/debugger/machine-right.xml b/devices/pc8080/machine/vt100/debugger/machine-right.xml
index d531d7fd1..da0516814 100644
--- a/devices/pc8080/machine/vt100/debugger/machine-right.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine-right.xml
@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
 <machine id="vt100" class="pc8080 machine-right" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">VT100 Terminal</name>
-	<computer id="computer" busWidth="16" resume="1"/>
+	<computer id="computer" busWidth="16"/>
 	<cpu id="cpu8080" model="8080" cycles="2764800" autoStart="true"/>
 	<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
 	<ram id="ram" addr="0x2000" size="0x0C00"/>
diff --git a/devices/pc8080/machine/vt100/debugger/machine.xml b/devices/pc8080/machine/vt100/debugger/machine.xml
index f9c7c2590..4afc0c4cf 100644
--- a/devices/pc8080/machine/vt100/debugger/machine.xml
+++ b/devices/pc8080/machine/vt100/debugger/machine.xml
@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
 <machine id="vt100" class="pc8080" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">VT100 Terminal</name>
-	<computer id="computer" busWidth="16" resume="1"/>
+	<computer id="computer" busWidth="16"/>
 	<cpu id="cpu8080" model="8080" cycles="2764800" autoStart="true"/>
 	<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
 	<ram id="ram" addr="0x2000" size="0x0C00"/>
diff --git a/devices/pc8080/machine/vt100/machine-right.xml b/devices/pc8080/machine/vt100/machine-right.xml
index de6b4b084..d26541cdb 100644
--- a/devices/pc8080/machine/vt100/machine-right.xml
+++ b/devices/pc8080/machine/vt100/machine-right.xml
@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
 <machine id="vt100" class="pc8080 machine-right" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">VT100 Terminal</name>
-	<computer id="computer" busWidth="16" resume="1"/>
+	<computer id="computer" busWidth="16"/>
 	<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
 	<ram id="ram" addr="0x2000" size="0x0C00"/>
 	<video id="video" screenWidth="1600" screenHeight="960" smoothing="false" interruptRate="60"
diff --git a/devices/pc8080/machine/vt100/machine.xml b/devices/pc8080/machine/vt100/machine.xml
index 2e0329328..a595b1a6f 100644
--- a/devices/pc8080/machine/vt100/machine.xml
+++ b/devices/pc8080/machine/vt100/machine.xml
@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pc8080/1.32.2/machine.xsl"?>
 <machine id="vt100" class="pc8080" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">VT100 Terminal</name>
-	<computer id="computer" busWidth="16" resume="1"/>
+	<computer id="computer" busWidth="16"/>
 	<rom id="rom" addr="0x0000" size="0x2000" file="/devices/pc8080/rom/vt100/VT100.json"/>
 	<ram id="ram" addr="0x2000" size="0x0C00"/>
 	<video id="video" screenWidth="1600" screenHeight="960" smoothing="false" interruptRate="60"
diff --git a/devices/pdp11/machine/1170/vt100/README.md b/devices/pdp11/machine/1170/vt100/README.md
index 4836a9797..714230da0 100644
--- a/devices/pdp11/machine/1170/vt100/README.md
+++ b/devices/pdp11/machine/1170/vt100/README.md
@@ -7,10 +7,12 @@ machines:
     type: pdp11
     config: /devices/pdp11/machine/1170/vt100/machine-left.xml
     connection: dl11->vt100.serialPort
+    resume: 1
   - id: vt100
     type: pc8080
     config: /devices/pc8080/machine/vt100/machine-right.xml
     connection: serialPort->test1170.dl11
+    resume: 1
 ---
 
 This VT100 Terminal is connected to the PDP-11/70 below.
diff --git a/devices/pdp11/machine/1170/vt100/debugger/README.md b/devices/pdp11/machine/1170/vt100/debugger/README.md
index 397443bf6..519ecb630 100644
--- a/devices/pdp11/machine/1170/vt100/debugger/README.md
+++ b/devices/pdp11/machine/1170/vt100/debugger/README.md
@@ -8,11 +8,13 @@ machines:
     debugger: true
     config: /devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
     connection: dl11->vt100.serialPort
+    resume: 1
   - id: vt100
     type: pc8080
     debugger: true
     config: /devices/pc8080/machine/vt100/debugger/machine-right.xml
     connection: serialPort->test1170.dl11
+    resume: 1
 ---
 
 This VT100 Terminal is connected to the PDP-11/70 below.
diff --git a/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml b/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
index 022a412b8..7bb9395d8 100644
--- a/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
+++ b/devices/pdp11/machine/1170/vt100/debugger/machine-left.xml
@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pdpjs/1.32.2/machine.xsl"?>
 <machine id="test1170" class="pdp11 machine-left" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">PDP-11/70 with 256Kb, Front Panel, and Debugger</name>
-	<computer id="computer" busWidth="22" resume="1"/>
+	<computer id="computer" busWidth="22"/>
 	<cpu id="cpu" model="1170" cycles="6666667" autoStart="true"/>
 	<ram id="ram" addr="0x00000" size="0x40000" file="/apps/pdp11/boot/monitor/BOOTMON.json"/>
 	<device id="default" type="default"/>
diff --git a/devices/pdp11/machine/1170/vt100/machine-left.xml b/devices/pdp11/machine/1170/vt100/machine-left.xml
index a166a58f1..193a6af6c 100644
--- a/devices/pdp11/machine/1170/vt100/machine-left.xml
+++ b/devices/pdp11/machine/1170/vt100/machine-left.xml
@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pdpjs/1.32.2/machine.xsl"?>
 <machine id="test1170" class="pdp11 machine-left" border="1" pos="center" background="#FAEBD7">
 	<name pos="center">PDP-11/70 with 256Kb and Front Panel</name>
-	<computer id="computer" busWidth="22" resume="1"/>
+	<computer id="computer" busWidth="22"/>
 	<cpu id="cpu" model="1170" cycles="6666667" autoStart="true"/>
 	<ram id="ram" addr="0x00000" size="0x40000" file="/apps/pdp11/boot/monitor/BOOTMON.json"/>
 	<device id="default" type="default"/>
diff --git a/modules/pc8080/lib/computer.js b/modules/pc8080/lib/computer.js
index 50c938be8..2b36a14a2 100644
--- a/modules/pc8080/lib/computer.js
+++ b/modules/pc8080/lib/computer.js
@@ -206,12 +206,10 @@ class Computer8080 extends Component {
         }
 
         var sStatePath = null;
-        var sResume = parmsComputer['resume'];
+        var sResume = this.getMachineParm('resume', parmsComputer);
         if (sResume !== undefined) {
             /*
-             * DEPRECATE: This goofiness is a holdover from when the 'resume' property was a string (either a
-             * single-digit string or a path); now it's always a number, so it never has a 'length' property and
-             * the call to parseInt() is unnecessary.
+             * Decide whether the 'resume' property is a number or the path of a state file to resume.
              */
             if (sResume.length > 1) {
                 sStatePath = this.sResumePath = sResume;
diff --git a/modules/pcx86/lib/computer.js b/modules/pcx86/lib/computer.js
index 3e5391440..fc3346ae6 100644
--- a/modules/pcx86/lib/computer.js
+++ b/modules/pcx86/lib/computer.js
@@ -231,9 +231,7 @@ function Computer(parmsComputer, parmsMachine, fSuspended) {
     var sResume = parmsComputer['resume'];
     if (sResume !== undefined) {
         /*
-         * DEPRECATE: This goofiness is a holdover from when the 'resume' property was a string (either a
-         * single-digit string or a path); now it's always a number, so it never has a 'length' property and
-         * the call to parseInt() is unnecessary.
+         * Decide whether the 'resume' property is a number or the path of a state file to resume.
          */
         if (sResume.length > 1) {
             sStatePath = this.sResumePath = sResume;
diff --git a/modules/pdp11/lib/computer.js b/modules/pdp11/lib/computer.js
index 98e3c7822..c27c9300a 100644
--- a/modules/pdp11/lib/computer.js
+++ b/modules/pdp11/lib/computer.js
@@ -195,12 +195,10 @@ class ComputerPDP11 extends Component {
         }
 
         var sStatePath = null;
-        var sResume = this.getMachineParm('resume', parmsComputer);
+        var sResume = /** @type {string} */ (this.getMachineParm('resume', parmsComputer));
         if (sResume !== undefined) {
             /*
-             * DEPRECATE: This goofiness is a holdover from when the 'resume' property was a string (either a
-             * single-digit string or a path); now it's always a number, so it never has a 'length' property and
-             * the call to parseInt() is unnecessary.
+             * Decide whether the 'resume' property is a number or the path of a state file to resume.
              */
             if (sResume.length > 1) {
                 sStatePath = this.sResumePath = sResume;
diff --git a/versions/pc8080/1.32.2/pc8080-dbg.js b/versions/pc8080/1.32.2/pc8080-dbg.js
index e84fabf75..4f22760fb 100644
--- a/versions/pc8080/1.32.2/pc8080-dbg.js
+++ b/versions/pc8080/1.32.2/pc8080-dbg.js
@@ -57,7 +57,7 @@ function ab(a,b){try{return window.localStorage.setItem(a,b),!0}catch(c){}return
 function eb(a,b,c){function d(){--a;0<=a&&(b()||(a=0));0<a?setTimeout(d,0):c()}d()}function fb(a,b){function c(){b(100===d)&&(e=setTimeout(c,d),d=100)}var d=0,e=null,f=!1;a.onmousedown=function(){f||e||(d=500,c())};a.ontouchstart=function(){e||(d=500,c())};a.onmouseup=a.onmouseout=function(){e&&(clearTimeout(e),e=null)};a.ontouchend=a.ontouchcancel=function(){e&&(clearTimeout(e),e=null);f=!0}}function gb(a,b){if(window){var c=window[a];window[a]="function"!==typeof c?b:function(){c&&c();b()}}}
 function hb(a){ib.init.push(a)}function kb(a){if(lb)try{for(var b=0;b<a.length;b++)a[b]()}catch(c){ga("An unexpected exception occurred:\n\n"+c.message+"\n\nPlease send this information to support@pcjs.org. Thanks.",void 0,void 0)}}function mb(a){!lb&&a?(lb=!0,nb&&ob("init"),pb&&ob("show")):lb=a}function ob(a){ib[a]&&kb(ib[a])}var db=null,ib={init:[],show:[],exit:[]},nb=!1,pb=!1,lb=!0,Wa=null;gb("onload",function(){nb=!0;kb(ib.init)});gb("onpageshow",function(){pb=!0;kb(ib.show)});
 gb(bb("Opera")||bb("iOS")?"onunload":"onbeforeunload",function(){kb(ib.exit)});
-var qb="undefined"!==typeof ArrayBuffer,sb=[1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,
+var qb="undefined"!==typeof ArrayBuffer,rb=[1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,0,1,1,0,1,
 0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1],tb={cpu:1,bus:64,mem:128,port:256,nvr:16384,chipset:32768,keyboard:65536,key:131072,video:262144,fdc:524288,disk:2097152,serial:8388608,speaker:33554432,computer:67108864,log:268435456,warn:536870912,buffer:1073741824,halt:-2147483648};function ub(a){n.call(this,"Panel",a)}ba(ub,n);
 ub.prototype.ca=function(a,b,c,d){return this.S&&this.S.ca(a,b,c,d)||this.u&&this.u.ca(a,b,c,d)||this.B&&this.B.ca(a,b,c,d)||this.K&&this.K.ca(a,b,c,d)?!0:n.prototype.ca.call(this,a,b,c,d)};ub.prototype.Ea=function(a,b,c,d){this.S=a;this.H=b;this.u=c;this.K=d;this.B=vb(a,"Keyboard")};ub.prototype.va=function(a,b){b||wb();return!0};ub.prototype.ua=function(){return!0};
 function wb(){for(var a=!1,b=pa(document,"pc8080","panel"),c=0;c<b.length;c++){var d=b[c],e=na(d),f=ka(e.id);f||(a=!0,f=new ub(e));oa(f,d);a&&sa(f)}}hb(wb);
@@ -89,7 +89,7 @@ function Oc(a){var b=+a.model||8080;tc.call(this,a,1E6);this.tb=b;this.cb=Pc;wc(
 k.hc=function(){var a=this.g+this.w+this.A+this.B+this.C+this.D+this.F|0;return a=a+this.M+this.j+Uc(this)|0};k.save=function(){var a=new Vc(this);a.set(0,[this.g,this.w,this.A,this.B,this.C,this.D,this.F,this.M,this.j,Uc(this)]);a.set(1,[this.R,this.la,this.U]);a.set(2,Jb(this.H));return a.data()};
 k.restore=function(a){var b=a[0];this.g=b[0];this.w=b[1];this.A=b[2];this.B=b[3];this.C=b[4];this.D=b[5];this.F=b[6];this.M=b[7]&65535;C(this,b[8]);Sc(this,b[9]);b=a[1];this.R=b[0];this.la=b[1];Dc(this,b[3]);a:{b=this.H;a=a[2];var c;for(c=0;c<a.length-1;c+=2){var d=a[c],e=a[c+1];if(e&&e.length<b.O){for(var f=0,g=Array(b.O),h=0;h<e.length-1;)for(var l=e[h++],p=e[h++];l--;)g[f++]=p;e=g}f=b.b[d];if(!f||!f.restore(e)){q("Unable to restore memory block "+d);b=!1;break a}}b=!0}return b};
 k.ca=function(a,b,c){switch(b){case "A":case "B":case "C":case "BC":case "D":case "E":case "DE":case "H":case "L":case "HL":case "SP":case "PC":case "PS":case "IF":case "SF":case "ZF":case "AF":case "PF":case "CF":this.P[b]=c;this.fb++;a=!0;break;default:a=tc.prototype.ca.call(this,a,b,c)}return a};function hd(a){return a.w<<8|a.A}function id(a,b){a.w=b>>8&255;a.A=b&255}function jd(a){return a.B<<8|a.C}function kd(a,b){a.B=b>>8&255;a.C=b&255}function D(a){return a.D<<8|a.F}
-function ld(a,b){a.D=b>>8&255;a.F=b&255}function C(a,b){a.j=b&65535}function md(a){return a.I&256?1:0}function nd(a,b){a.I=a.I&255|b}function od(a){return sb[a.L&255]?4:0}function pd(a){return(a.L^a.O)&16?16:0}function qd(a){return a.I&255?0:64}function rd(a){return a.L&128?128:0}function Uc(a){return a.N&-214|rd(a)|qd(a)|pd(a)|od(a)|md(a)}function Sc(a,b){a.I=a.L=a.O=0;b&1&&(a.I|=256);b&4||(a.L|=1);b&16&&(a.O|=16);b&64||(a.I|=255);b&128&&(a.L^=192);a.N=a.N&-726|b&512|2}
+function ld(a,b){a.D=b>>8&255;a.F=b&255}function C(a,b){a.j=b&65535}function md(a){return a.I&256?1:0}function nd(a,b){a.I=a.I&255|b}function od(a){return rb[a.L&255]?4:0}function pd(a){return(a.L^a.O)&16?16:0}function qd(a){return a.I&255?0:64}function rd(a){return a.L&128?128:0}function Uc(a){return a.N&-214|rd(a)|qd(a)|pd(a)|od(a)|md(a)}function Sc(a,b){a.I=a.L=a.O=0;b&1&&(a.I|=256);b&4||(a.L|=1);b&16&&(a.O|=16);b&64||(a.I|=255);b&128&&(a.L^=192);a.N=a.N&-726|b&512|2}
 function sd(a,b){a.O=a.g^b;return a.L=(a.I=a.g+b)&255}function td(a,b){a.O=a.g^b;return a.L=(a.I=a.g+b+(a.I&256?1:0))&255}function ud(a,b){a.I=a.L=a.O=a.g&b;(a.g|b)&8&&(a.O^=16);return a.I}function vd(a,b){a.O=b^255;b=a.L=b+255&255;a.I=a.I&-256|b;return b}function wd(a,b){a.O=b;b=a.L=b+1&255;a.I=a.I&-256|b;return b}function xd(a,b){return a.L=a.I=a.O=a.g|b}function E(a,b){b^=255;a.O=a.g^b;return a.L=(a.I=a.g+b+1^256)&255}
 function yd(a,b){b^=255;a.O=a.g^b;return a.L=(a.I=a.g+b+(a.I&256?0:1)^256)&255}function zd(a,b){return a.L=a.I=a.O=a.g^b}function F(a,b){a=a.H;return a.b[(b&a.C)>>>a.g].Xa(b&a.j,b)}function Ad(a,b,c){a=a.H;a.b[(b&a.C)>>>a.g].Ya(b&a.j,c&255,b)}function G(a){var b=F(a,a.j);C(a,a.j+1);return b}function H(a){var b=Fb(a.H,a.j);C(a,a.j+2);return b}function Bd(a){var b=Fb(a.H,a.M);a.M=a.M+2&65535;return b}function I(a,b){a.M=a.M-2&65535;Ib(a.H,a.M,b)}
 function Cd(a){if(a.b&&a.R&255&&a.N&512){for(var b=0;8>b&&!(a.R&1<<b);b++);a.R&=~(0>b?255:1<<b);a.N&=-513;a.R&=-257;a.cb[199|b<<3].call(a)}return a.R&256?(Kc(a),!1):!0}function Dd(a,b){a.R|=1<<b;a.N&512&&Kc(a)}function J(a,b,c,d){d=d||2;a.P[b]&&(void 0===c&&(qa(a,"Value for "+b+" is invalid"),a.da()),c=!a.G.ka||a.G.ec?x(c,d):"--------".substr(0,d),a.P[b].textContent!=c&&(a.P[b].textContent=c))}
@@ -241,8 +241,8 @@ hc&&Ma!=a.T;){var qg=Xa[Ma++];if(null==qg.J)break;var ic=Wf(qg.J),ni=Aa--,rg=ih(
 sg="",ma=hg(Wc.J);for(kc=16;0<kc&&0<Zc;kc--){var ad=a.Ga(Wc,1),$c=$c|ad<<(me++<<3);me==Yc&&(ne+=x($c,2*Yc),ne+=1==Yc?9==kc?"-":" ":"  ",$c=me=0);sg+=32<=ad&&128>ad?String.fromCharCode(ad):".";Zc--}jc&&(jc+="\n");jc+=ma+"  "+ne+(kc?"":" "+sg)}jc&&a.i(jc);a.la=Wc}}}}break;case "e":if("else"==f[0])break;var bd=1,tg=255,ug=a.Ga,vg=a.Sb;"ew"==f[0]&&(bd=2,tg=65535,ug=a.Bb,vg=a.vc);var wg=bd<<1,xg=f[1];if(null==xg)a.i("edit memory commands:"),a.i("\teb [a] [...]  edit bytes at address a"),a.i("\tew [a] [...]  edit words at address a");
 else{var cd=bg(a,xg);if(cd)for(var dd=2;dd<f.length;dd++){var lc=Nf(a,f[dd]);if(void 0===lc){a.i("unrecognized value: "+f[dd]);break}lc&~tg&&a.i("warning: "+x(lc)+" exceeds "+bd+"-byte value");var pi=ug.call(a,cd);a.i("changing "+hg(cd.J)+" from "+x(pi,wg,!0)+" to "+x(lc,wg,!0));vg.call(a,cd,lc,bd)}}break;case "f":Eh(a,f[1]);break;case "g":a:{var yg=f[1],qi=b;if(void 0!==yg){var oe=bg(a,yg,!0);if(!oe)break a;gg(a,oe,qi);a.Pa(a.j,oe,!0)}$g(a,!0)||c||a.i("cpu busy or unavailable, run command ignored")}break;
 case "h":a:{var pe;if(a.G.ka)pe="halting",a.da();else{if(ua(a,!0))break a;pe="already halted"}c||a.i(pe)}break;case "i":if("if"==f[0]){var qe;var mc=b.substr(2),mc=Na(mc);Nf(a,mc)?(c||a.i("true: "+mc),qe=!0):(c||a.i("false: "+mc),qe=!1);qe||(d=!1);break}if("int"==f[0]){var ed;var ri=f[1];if(a.u.N&512){var re=Nf(a,ri);null==re?ed=!1:(a.i("requesting interrupt level "+re),Dd(a.u,re),ed=!0)}else a.i("interrupts disabled (use rif=1 to enable)"),ed=!1;ed||(d=!1);break}var se=f[1];if(se&&"?"!=se){var te=
-Pf(a,se);if(void 0!==te){var si=Ob(a.H,te);a.i(y(te)+": "+Da(si))}}else a.i("input commands:"),a.i("\ti [p]\tread port [p]"),a.i("warning: port accesses can affect hardware state");break;case "k":var ti=f[0];if("?"==f[1])a.i("stack trace commands:"),a.i("\tk\tshow frame addresses"),a.i("\tks\tshow symbol information");else{var ue=0,zg=Wf(),nc=Wf(a.u.M);for(a.i("stack trace for "+hg(nc.J));10>ue;){for(var rb=null,ui=256;65536>nc.J>>>0;){zg.J=a.Bb(nc,2);if(null==nc.J||!ui--)break;for(var vi=a,fd=zg,
-Ag=null,oc=fd.J,Bg=oc,ve=1;6>=ve&&oc;ve++){if(2<ve){fd.J=oc;var gd=ih(vi,fd);if(0<=gd.indexOf("CALL")){var Cg=gd.indexOf(" ");if(oc+(gd.indexOf(" ",Cg+1)-Cg-1)/2==Bg){Ag=gd;break}}}oc--}fd.J=Bg;if(rb=Ag)break}if(!rb||null==rb)break;var Dg=null;if("ks"==ti){var Eg=rb.match(/[0-9A-F]+$/);Eg&&(Dg=Gh(a,Eg[0]))}rb=Ka(rb,50)+"  ;"+(Dg||"stack="+hg(nc.J));a.i(rb);ue++}ue||a.i("no return addresses found")}break;case "l":"ln"==f[0]&&Gh(a,f[1],!0);break;case "m":a:{var Ya,Za=null,aa=f[1];"?"==aa&&(aa=void 0);
+Pf(a,se);if(void 0!==te){var si=Ob(a.H,te);a.i(y(te)+": "+Da(si))}}else a.i("input commands:"),a.i("\ti [p]\tread port [p]"),a.i("warning: port accesses can affect hardware state");break;case "k":var ti=f[0];if("?"==f[1])a.i("stack trace commands:"),a.i("\tk\tshow frame addresses"),a.i("\tks\tshow symbol information");else{var ue=0,zg=Wf(),nc=Wf(a.u.M);for(a.i("stack trace for "+hg(nc.J));10>ue;){for(var sb=null,ui=256;65536>nc.J>>>0;){zg.J=a.Bb(nc,2);if(null==nc.J||!ui--)break;for(var vi=a,fd=zg,
+Ag=null,oc=fd.J,Bg=oc,ve=1;6>=ve&&oc;ve++){if(2<ve){fd.J=oc;var gd=ih(vi,fd);if(0<=gd.indexOf("CALL")){var Cg=gd.indexOf(" ");if(oc+(gd.indexOf(" ",Cg+1)-Cg-1)/2==Bg){Ag=gd;break}}}oc--}fd.J=Bg;if(sb=Ag)break}if(!sb||null==sb)break;var Dg=null;if("ks"==ti){var Eg=sb.match(/[0-9A-F]+$/);Eg&&(Dg=Gh(a,Eg[0]))}sb=Ka(sb,50)+"  ;"+(Dg||"stack="+hg(nc.J));a.i(sb);ue++}ue||a.i("no return addresses found")}break;case "l":"ln"==f[0]&&Gh(a,f[1],!0);break;case "m":a:{var Ya,Za=null,aa=f[1];"?"==aa&&(aa=void 0);
 if(void 0!==aa){var jb=0;if("all"==aa)jb=1878917119,aa=null;else if("on"==aa)Za=!0,aa=null;else if("off"==aa)Za=!1,aa=null;else{"keys"==aa&&(aa="key");"kbd"==aa&&(aa="keyboard");for(Ya in tb)if(aa==Ya){jb=tb[Ya];Za=!!(a.ha&jb);break}if(!jb){a.i("unknown message category: "+aa);break a}}if(jb)if("on"==f[2])a.ha|=jb,Za=!0;else if("off"==f[2]&&(a.ha&=~jb,Za=!1,1073741824==jb)){for(var we=0;we<a.X.length;we++)a.i(a.X[we]);a.X=[]}}var wi=0,pc="";for(Ya in tb)if(!aa||aa==Ya){var xi=!!(a.ha&tb[Ya]);if(null===
 Za||Za==xi)pc&&(pc+=","),++wi%10||(pc+="\n\t"),"key"==Ya&&(Ya="keys"),pc+=Ya}void 0===aa&&a.i("message commands:\n\tm [category] [on|off]\tturn categories on/off");a.i((null!==Za?Za?"messages on:  ":"messages off: ":"message categories:\n\t")+(pc||"none"));Yf(a)}break;case "o":var xe=f[1],yi=f[2];if(xe&&"?"!=xe){var ye=Pf(a,xe,"port #"),ze=Pf(a,yi);void 0!==ye&&void 0!==ze&&(Sb(a.H,ye,ze),a.i(y(ye)+": "+Da(ze)))}else a.i("output commands:"),a.i("\to [p] [b]\twrite byte [b] to port [p]"),a.i("warning: port accesses can affect hardware state");
 break;case "p":if("print"==f[0]){Ih(a,b.substr(5));break}var Fg="pr"==f[0]?1:0,zi=1+Fg;if(a.M)a.i("step in progress");else{var Ae=Wf(a.u.j);switch(a.Ga(Ae)){case 205:a.M=zi,dg(Ae,3)}a.M?(a.Pa(a.j,Ae,!0),$g(a)||(a.S&&Hc(a.S),a.M=0)):Jh(a,Fg?"tr":"t")}break;case "r":if("reset"==b){a.S&&a.S.reset();break}bh(a,f);break;case "s":Hh(a,f);break;case "t":Jh(a,f[0],f[1]);break;case "u":ch(a,f[1],f[2],8);break;case "v":if("var"==f[0]){Fh(a,b.substr(3))||(d=!1);break}a.i("PC8080 version 1.32.2 ("+a.u.tb+",RELEASE"+
@@ -256,8 +256,8 @@ U],[43,R,V],[43,R,W],[43,R,X],[43,R,Y],[43,R,Z],[43,R,R],[3,R|O,T],[3,R|O,U],[3,
 O,V],[76,R|O,W],[76,R|O,X],[76,R|O,Y],[76,R|O,Z],[76,R|O,R],[46,R|O,T],[46,R|O,U],[46,R|O,V],[46,R|O,W],[46,R|O,X],[46,R|O,Y],[46,R|O,Z],[46,R|O,R],[18,R|O,T],[18,R|O,U],[18,R|O,V],[18,R|O,W],[18,R|O,X],[18,R|O,Y],[18,R|O,Z],[18,R|O,R],[58],[50,Mh],[34,51],[30,51],[11,51],[51,Mh],[4,R|O,P|Q],[65,xh],[62],[54],[38,51],[30,51|yh],[15,51],[7,51],[1,R|O,P|Q],[65,xh],[57],[50,Nh],[33,51],[48,P|Q,R|O],[10,51],[51,Nh],[74,R|O,P|Q],[65,xh],[55],[54,yh],[31,51],[27,R|O,P|Q],[8,51],[7,51|yh],[67,R|O,P|Q],[65,
 xh],[61],[50,Oh],[37,51],[78,Ph|uh|O,Oh|O],[14,51],[51,Oh],[6,R|O,P|Q],[65,xh],[60],[49,Oh],[36,51],[75,Oh|O,Nh|O],[13,51],[7,51|yh],[77,R|O,P|Q],[65,xh],[59],[50,Qh],[35,51],[24],[12,51],[51,Qh],[47,R|O,P|Q],[65,xh],[56],[69,Ph|O,Oh|O],[32,51],[25],[9,51],[7,51|yh],[19,R|O,P|Q],[65,xh]],Zg=1E3;hb(function(){for(var a=pa(document,"pc8080","debugger"),b=0;b<a.length;b++){var c=a[b],d=na(c),d=new Uf(d);oa(d,c)}});
 function Rh(a,b,c){n.call(this,"Computer",a,67108864);this.G.ja=!1;Sh(this,b);this.L=vc(this,"autoPower",a);this.j=0;this.T=a.busWidth||a.buswidth;this.b=Th;this.F=null;this.C=this.O=!1;this.U=vc(this,"url")||"";(Math.random()+.1).toString(36);this.g=Uh(this);if(this.u=la("CPU",this.id)){this.K=la("Debugger",this.id);this.A=[];for(b=null;b=vb(this,"Video",b);)this.A.push(b);this.H=new xb({id:this.ab+".bus",busWidth:this.T},this.u,this.K);var d,e=ja(this.id);if((this.B=la("Panel",this.id))&&this.B.ta)for(b=
-0;b<e.length;b++)d=e[b],d.aa=this.B.aa,d.i=this.B.i,d.ta=this.B.ta;this.i("PC8080 v1.32.2\nCopyright \u00a9 2012-2017 Jeff Parsons <Jeff@pcjs.org>\nLicense: GPL version 3 or later <http://gnu.org/licenses/gpl.html>");for(b=0;b<e.length;b++)d=e[b],d.Ea&&d.Ea(this,this.H,this.u,this.K);b=null;d=a.resume;void 0!==d&&(1<d.length?b=this.D=d:this.b=parseInt(d,10));var f;if(a=vc(this,"state")||(f=!0,a.state))b=this.M=a,f||(this.C=!0,this.b=Th),this.b&&(this.I=new Vc(this,"1.32.2"),Vh(this.I)?b=null:delete this.I);
-!b&&this.b&&(b=Wh(this))&&(this.C=!0);if(b){var g=this;Sa(b,null,!0,function(a,b,c){c?(g.D=null,g.C=!1,g.aa("Unable to load machine state from server (error "+c+(b?": "+Na(b):"")+")")):(g.F=b,g.O=!0);sa(g)})}else sa(this);this.P.power||(this.L=!0);!c&&this.L&&Xh(this,this.kb)}else q("Unable to find CPU component")}ba(Rh,n);function Sh(a,b){if(!b){var c;if("object"==typeof resources&&(c=resources.parms))try{b=eval("("+c+")")}catch(d){q(d.message+" ("+c+")")}}a.R=b}
+0;b<e.length;b++)d=e[b],d.aa=this.B.aa,d.i=this.B.i,d.ta=this.B.ta;this.i("PC8080 v1.32.2\nCopyright \u00a9 2012-2017 Jeff Parsons <Jeff@pcjs.org>\nLicense: GPL version 3 or later <http://gnu.org/licenses/gpl.html>");for(b=0;b<e.length;b++)d=e[b],d.Ea&&d.Ea(this,this.H,this.u,this.K);b=null;d=vc(this,"resume",a);void 0!==d&&(1<d.length?b=this.D=d:this.b=parseInt(d,10));var f;if(a=vc(this,"state")||(f=!0,a.state))b=this.M=a,f||(this.C=!0,this.b=Th),this.b&&(this.I=new Vc(this,"1.32.2"),Vh(this.I)?
+b=null:delete this.I);!b&&this.b&&(b=Wh(this))&&(this.C=!0);if(b){var g=this;Sa(b,null,!0,function(a,b,c){c?(g.D=null,g.C=!1,g.aa("Unable to load machine state from server (error "+c+(b?": "+Na(b):"")+")")):(g.F=b,g.O=!0);sa(g)})}else sa(this);this.P.power||(this.L=!0);!c&&this.L&&Xh(this,this.kb)}else q("Unable to find CPU component")}ba(Rh,n);function Sh(a,b){if(!b){var c;if("object"==typeof resources&&(c=resources.parms))try{b=eval("("+c+")")}catch(d){q(d.message+" ("+c+")")}}a.R=b}
 function vc(a,b,c){var d=b.toLowerCase(),d=cb(b)||cb(d);void 0===d&&a.R&&(d=a.R[b]);void 0===d&&c&&(d=c[b]);void 0===d&&"object"==typeof resources&&resources[b]&&(d=b);return d}function Xh(a,b,c){for(var d=ja(a.id),e=0;e<=d.length;e++){var f=e<d.length?d[e]:a;if(!ra(f)){ra(f,function(){Xh(a,b,c)});return}}b.call(a,c)}
 function Yh(a,b){var c=new Vc(a,"1.32.2",Zh);if(Vh(c)&&$h(c)){var d=c.get(ai),e=b?b.get(ai):"unknown";d!=e&&(a.aa("Machine state may be out-of-date\n("+d+" vs. "+e+")\nCheck your browser's local storage limits"),b||c.clear())}}k=Rh.prototype;
 k.kb=function(a){void 0===a&&(a=this.b||(this.F?bi:Th));if(!this.j){this.j++;var b=!1,c=!1;this.N=!1;var d=this.I||new Vc(this,"1.32.2");if(a==ci)b=!0;else if(a>Th){if(Vh(d,this.F)){this.w=new Vc(this,"1.32.2",di);Vh(this.w)&&(ei(this,d),a=fi,gi(this.w));this.w.set(ai,Qa());hi(this.w);var e=this.b&&!this.C;if(a==bi||ha("Click OK to restore the previous PC8080 machine state, or CANCEL to reset the machine.")){if(c=$h(d)){var f=d.get("code"),g=d.get("data");f&&("ok"==f?Vh(d,g):("error"==f&&"no machine state"!=
diff --git a/versions/pc8080/1.32.2/pc8080.js b/versions/pc8080/1.32.2/pc8080.js
index a17e21927..8fe27e71e 100644
--- a/versions/pc8080/1.32.2/pc8080.js
+++ b/versions/pc8080/1.32.2/pc8080.js
@@ -177,8 +177,8 @@ k.dd=function(a,b){this.C=b;this.T&=~(rc|Od);if(19==b)this.B=!0;else if(17==b)th
 this.f+=c}else if(null!=this.c){if(10==b||1024<=this.c.length)this.aa(this.c),this.c="";10!=b&&(this.c+=String.fromCharCode(b))}this.m&&Jb(this.m,this.R,Gd(this,Pd))};k.cd=function(a,b){this.o?(this.s&&(b^this.j)&(Qd|Rd)&&(a=0,this.l?(a|=b&Qd?32:0,a|=b&Rd?320:0):(a|=b&Qd?16:0,a|=b&Rd?1048576:0),this.s.call(this.a,a)),this.j=b,this.j&Sd&&(this.o=!1)):(this.h=b,this.o=!0)};k.bd=function(a,b){this.v=b};
 var Id=12,Jd=16,Kd=192,Rd=2,Qd=32,Sd=64,rc=1,Ld=2,Od=4,Nd=128,Md=15,Pd=240,Hd=[50,75,110,134.5,150,200,300,600,1200,1800,2E3,2400,3600,4800,9600,19200],Fd=[!1,0,0,133,142,39,238],Ad="buffer",Cd={0:zd.prototype.Vc,1:zd.prototype.Uc},Dd={0:zd.prototype.dd,1:zd.prototype.cd,2:zd.prototype.bd};Ha(function(){for(var a=y(document,"pc8080","serial"),b=0;b<a.length;b++){var c=a[b],d=w(c),d=new zd(d);ja(d,c)}});
 function Td(a,b,c){q.call(this,"Computer",a);this.i.U=!1;Ud(this,b);this.v=yb(this,"autoPower",a);this.c=0;this.H=a.busWidth||a.buswidth;this.a=Vd;this.o=null;this.j=this.C=!1;this.I=yb(this,"url")||"";(Math.random()+.1).toString(36);this.b=Wd(this);if(this.m=ia("CPU",this.id)){this.J=ia("Debugger",this.id);this.g=[];for(b=null;b=C(this,"Video",b);)this.g.push(b);this.u=new Ua({id:this.Ia+".bus",busWidth:this.H},this.m,this.J);var d,e=ga(this.id);if((this.h=ia("Panel",this.id))&&this.h.pa)for(b=0;b<
-e.length;b++)d=e[b],d.G=this.h.G,d.aa=this.h.aa,d.pa=this.h.pa;this.aa("PC8080 v1.32.2\nCopyright \u00a9 2012-2017 Jeff Parsons <Jeff@pcjs.org>\nLicense: GPL version 3 or later <http://gnu.org/licenses/gpl.html>");for(b=0;b<e.length;b++)d=e[b],d.qa&&d.qa(this,this.u,this.m,this.J);b=null;d=a.resume;void 0!==d&&(1<d.length?b=this.l=d:this.a=parseInt(d,10));var f;if(a=yb(this,"state")||(f=!0,a.state))b=this.A=a,f||(this.j=!0,this.a=Vd),this.a&&(this.s=new G(this,"1.32.2"),Xd(this.s)?b=null:delete this.s);
-!b&&this.a&&(b=Yd(this))&&(this.j=!0);if(b){var g=this;xa(b,null,!0,function(a,b,c){c?(g.l=null,g.j=!1,g.G("Unable to load machine state from server (error "+c+(b?": "+ua(b):"")+")")):(g.o=b,g.C=!0);z(g)})}else z(this);this.w.power||(this.v=!0);!c&&this.v&&Zd(this,this.Ra)}else u("Unable to find CPU component")}m(Td,q);function Ud(a,b){if(!b){var c;if("object"==typeof resources&&(c=resources.parms))try{b=eval("("+c+")")}catch(d){u(d.message+" ("+c+")")}}a.D=b}
+e.length;b++)d=e[b],d.G=this.h.G,d.aa=this.h.aa,d.pa=this.h.pa;this.aa("PC8080 v1.32.2\nCopyright \u00a9 2012-2017 Jeff Parsons <Jeff@pcjs.org>\nLicense: GPL version 3 or later <http://gnu.org/licenses/gpl.html>");for(b=0;b<e.length;b++)d=e[b],d.qa&&d.qa(this,this.u,this.m,this.J);b=null;d=yb(this,"resume",a);void 0!==d&&(1<d.length?b=this.l=d:this.a=parseInt(d,10));var f;if(a=yb(this,"state")||(f=!0,a.state))b=this.A=a,f||(this.j=!0,this.a=Vd),this.a&&(this.s=new G(this,"1.32.2"),Xd(this.s)?b=null:
+delete this.s);!b&&this.a&&(b=Yd(this))&&(this.j=!0);if(b){var g=this;xa(b,null,!0,function(a,b,c){c?(g.l=null,g.j=!1,g.G("Unable to load machine state from server (error "+c+(b?": "+ua(b):"")+")")):(g.o=b,g.C=!0);z(g)})}else z(this);this.w.power||(this.v=!0);!c&&this.v&&Zd(this,this.Ra)}else u("Unable to find CPU component")}m(Td,q);function Ud(a,b){if(!b){var c;if("object"==typeof resources&&(c=resources.parms))try{b=eval("("+c+")")}catch(d){u(d.message+" ("+c+")")}}a.D=b}
 function yb(a,b,c){var d=b.toLowerCase(),d=Ea(b)||Ea(d);void 0===d&&a.D&&(d=a.D[b]);void 0===d&&c&&(d=c[b]);void 0===d&&"object"==typeof resources&&resources[b]&&(d=b);return d}function Zd(a,b,c){for(var d=ga(a.id),e=0;e<=d.length;e++){var f=e<d.length?d[e]:a;if(!ka(f)){ka(f,function(){Zd(a,b,c)});return}}b.call(a,c)}
 function $d(a,b){var c=new G(a,"1.32.2",ae);if(Xd(c)&&be(c)){var d=c.get(ce),e=b?b.get(ce):"unknown";d!=e&&(a.G("Machine state may be out-of-date\n("+d+" vs. "+e+")\nCheck your browser's local storage limits"),b||c.clear())}}k=Td.prototype;
 k.Ra=function(a){void 0===a&&(a=this.a||(this.o?de:Vd));if(!this.c){this.c++;var b=!1,c=!1;this.B=!1;var d=this.s||new G(this,"1.32.2");if(a==ee)b=!0;else if(a>Vd){if(Xd(d,this.o)){this.f=new G(this,"1.32.2",fe);Xd(this.f)&&(ge(this,d),a=he,ie(this.f));this.f.set(ce,wa());je(this.f);var e=this.a&&!this.j;if(a==de||fa("Click OK to restore the previous PC8080 machine state, or CANCEL to reset the machine.")){if(c=be(d)){var f=d.get("code"),g=d.get("data");f&&("ok"==f?Xd(d,g):("error"==f&&"no machine state"!=