From d2bb577bfd57aa3492b407c8b90442a62e79bbac Mon Sep 17 00:00:00 2001
From: Jeff <Jeff@pcjs.org>
Date: Tue, 14 Mar 2017 17:44:37 -0700
Subject: [PATCH] Updated the PDP-10 debugger's loadBin() function

---
 apps/pdp10/tapes/diags/klad/dakad/README.md | 23 +++++++++++++++------
 modules/pdp10/lib/debugger.js               | 12 +++++++----
 versions/pdpjs/1.34.2/pdp10-dbg.js          |  4 ++--
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/apps/pdp10/tapes/diags/klad/dakad/README.md b/apps/pdp10/tapes/diags/klad/dakad/README.md
index 70bb8100c..dba01e0e0 100644
--- a/apps/pdp10/tapes/diags/klad/dakad/README.md
+++ b/apps/pdp10/tapes/diags/klad/dakad/README.md
@@ -2,18 +2,29 @@
 layout: page
 title: PDP-10 KA10 BASIC INSTRUCTION DIAGNOSTIC
 permalink: /apps/pdp10/tapes/diags/klad/dakad/
+machines:
+  - id: testka10
+    type: pdp10
+    config: /devices/pdp10/machine/ka10/test/debugger/machine.xml
+    debugger: true
 ---
 
 PDP-10 KA10 BASIC INSTRUCTION DIAGNOSTIC
 ----------------------------------------
 
-The **PDP-10 KA10 BASIC INSTRUCTION DIAGNOSTIC** (MAINDEC-10-DAKAD-B-D), as extracted from the
-[original file](http://pdp-10.trailing-edge.com/klad_sources/01/klad.sources/dakaam.mac.html), is shown below.
+The **PDP-10 KA10 BASIC INSTRUCTION DIAGNOSTIC** ([DAKAD.MAC](DAKAD.MAC)), as extracted from the
+[original file](http://pdp-10.trailing-edge.com/klad_sources/01/klad.sources/dakaam.mac.html), is shown below,
+along with a [PDP-10 Test Machine with Debugger](/devices/pdp10/machine/ka10/test/debugger/).
+
+The Debugger command `a 100 /apps/pdp10/tapes/diags/klad/dakad/TEST.MAC`
+can be used to test the new [MACRO-10](http://archive.pcjs.org/pubs/dec/pdp10/tops10/02_1973AsmRef_macro.pdf)
+work-alike assembler being added to the PDP-10 Emulator.
+
+{% include machine.html id="testka10" %}
+
+More information about MAINDEC-10-DAKAD-B-D:
+
 
-The Debugger command `a 100 http://archive.pcjs.org/apps/pdp10/tapes/diags/klad/dakadm.mac.html` can be used to test the
-new [MACRO-10](http://archive.pcjs.org/pubs/dec/pdp10/tops10/02_1973AsmRef_macro.pdf) work-alike assembler being added to
-the PDP-10 Emulator.
- 
 ```
 SUBTTL	DIAGNOSTIC PARAMETERS
 
diff --git a/modules/pdp10/lib/debugger.js b/modules/pdp10/lib/debugger.js
index 04565ac40..946fd0ba5 100644
--- a/modules/pdp10/lib/debugger.js
+++ b/modules/pdp10/lib/debugger.js
@@ -2461,21 +2461,25 @@ class DebuggerPDP10 extends Debugger {
     }
 
     /**
-     * loadBin(aWords, addr)
+     * loadBin(aWords, addrLoad)
      *
      * @this {DebuggerPDP10}
      * @param {Array.<number>} aWords
-     * @param {number|null} addr
+     * @param {number|null} addrLoad
      */
-    loadBin(aWords, addr)
+    loadBin(aWords, addrLoad)
     {
         /*
-         * TODO: Decide what to do about the load address (addr); either drop it or use it.
+         * TODO: Decide what to do about addrLoad; either drop it or use it.
          */
+        var nWords = 0;
         var bus = this.bus;
+        var dbg = this.dbg;
         aWords.forEach(function(w, addr) {
             bus.setWordDirect(addr, w);
+            nWords++;
         });
+        this.println(nWords + " words loaded at " + this.toStrBase(addrLoad) + '-' + this.toStrBase(addrLoad + nWords - (nWords?1:0)));
     }
 
     /**
diff --git a/versions/pdpjs/1.34.2/pdp10-dbg.js b/versions/pdpjs/1.34.2/pdp10-dbg.js
index b42594952..0f3c653fb 100644
--- a/versions/pdpjs/1.34.2/pdp10-dbg.js
+++ b/versions/pdpjs/1.34.2/pdp10-dbg.js
@@ -200,8 +200,8 @@ function hg(a,b){for(var c=1;c<b.length;c++)gg(a,b,c);return b.length-1}function
 function Vc(a,b,c,d,e){var f=!1;if(!a.sa++)for(var g=1;!f&&g<d.length;g++){var h=d[g];if(!e||h.ja)for(var k=Ve(h)&(d==a.b?65535:-1),n=0;n<c;n++)if(b+n==k){var p,f=!0;h.ja&&(eg(a,d,h,!0),e=!0);if(p=h.tb){for(var f=!1,t=0;t<p.length;t++)if(!ig(a,p[t],!0)){if(p[t].indexOf("if")){f=!0;break}for(var D=t+1;D<p.length&&p[D].indexOf("else");D++)t++;if(D==p.length){f=!0;break}}a.v.A.N||(f=!0)}if(f){e||gg(a,d,g,"hit");break}}}a.sa--;return f}
 function jg(a,b){b=void 0===b?!0:b;for(var c="",d=0;16>d;d++){!d||d&3||(c+="\n");var e=a,f=m(d,2);We(e.Ba,d);f+="="+J(e,e.Ha(e.Ba),36)+" ";c+=f}if(b){b="";for(d=0;d<df.length;d++)(e=df[d]||"")&&(e+="="+J(a,a.lb(d),d>=hf?1:d==ff?23:18)+" "),b+=e;c+="\n"+b}return c}l.zb=function(a,b){return a[0]>b[0]?1:a[0]<b[0]?-1:0};
 function Ae(a,b,c,d,e){var f=[],g;for(g in e){var h=e[g];"number"==typeof h&&(e[g]=h={o:h});var k=h.o,n=h.a;if(void 0!==k){var p=f,k=[k>>>0,g],t=Ea(p,k,a.zb);0>t&&p.splice(-(t+1),0,k)}n&&(h.a=n.replace(/''/g,'"'))}a.F.push({sd:b,B:c,Ob:d,U:e,ub:f})}function kg(a,b,c){var d=[],e=Ve(b)>>>0;for(b=0;b<a.F.length;b++){var f=a.F[b],g=f.B>>>0,h=f.Ob;if(e>=g&&e<g+h){e=Ea(f.ub,[e-g],a.zb);0<=e?lg(a,b,e,d):c&&(e=~e,lg(a,b,e-1,d),lg(a,b,e,d));break}}return d}
-function mg(a,b){var c=a.G;b.forEach(function(a,b){vc(c,b,a)})}function lg(a,b,c,d){var e={},f=a.F[b].ub,g=0,h=null;0<=c&&c<f.length&&(g=f[c][0],h=f[c][1]);h&&(e=a.F[b].U[h],h="."==h.charAt(0)?null:e.l||h);d.push(h);d.push(g);d.push(e.a);d.push(e.c)}
-function ng(a,b){var c=$e(a,b[1],a.ba);if(c){var d=b[2];if(void 0==d)a.j("begin assemble at "+J(a,c.B)),a.R=!0,I(a.H);else{var e=d.match(/^(['"]?)((\/|http:).*)\1$/);e?a.pa?a.j("assembly already in progress"):a.pa=new og(e[2],c.B,"",a,function(b,c){b?a.j("error ("+b+") processing "+c):mg(a,a.pa.w);a.pa=null}):(b.shift(),b.shift(),b.shift(),b=Cf(a,d,b.join(""),c.B||0),0<=b&&(a.rb(c,b),a.j(uf(a,c))))}}}
+function mg(a,b,c){var d=0,e=a.G;b.forEach(function(a,b){vc(e,b,a);d++});a.j(d+" words loaded at "+J(a,c)+"-"+J(a,c+d-(d?1:0)))}function lg(a,b,c,d){var e={},f=a.F[b].ub,g=0,h=null;0<=c&&c<f.length&&(g=f[c][0],h=f[c][1]);h&&(e=a.F[b].U[h],h="."==h.charAt(0)?null:e.l||h);d.push(h);d.push(g);d.push(e.a);d.push(e.c)}
+function ng(a,b){var c=$e(a,b[1],a.ba);if(c){var d=b[2];if(void 0==d)a.j("begin assemble at "+J(a,c.B)),a.R=!0,I(a.H);else{var e=d.match(/^(['"]?)((\/|http:).*)\1$/);if(e)if(a.pa)a.j("assembly already in progress");else{var f=c.B;a.pa=new og(e[2],f,"",a,function(b,c){b?a.j("error ("+b+") processing "+c):mg(a,a.pa.w,f);a.pa=null})}else b.shift(),b.shift(),b.shift(),b=Cf(a,d,b.join(""),c.B||0),0<=b&&(a.rb(c,b),a.j(uf(a,c)))}}}
 function pg(a,b){var c=b.match(/^\s*([A-Z_]?[A-Z0-9_]*)\s*(=?)\s*(.*)$/i);if(c){if(!c[1])return Qe(a)||a.j("no variables"),!0;if(!c[2])return Qe(a,c[1]);if(!c[3])return delete a.K[c[1]],!0;b=X(a,c[3]);return void 0!==b?(a.K[c[1]]=b,!0):!1}a.j("invalid assignment:"+b);return!1}
 function qg(a,b,c){var d=null;if(b=$e(a,b)){var e=kg(a,b,!0);if(e.length){var f,g;e[0]&&(g="",(f=b.B-e[1])&&(g=" + "+q(f,4,!0)),f=e[0]+" ("+J(a,e[1])+")"+g,c&&a.j(f),d=f);4<e.length&&e[4]&&(g="",(f=e[5]-b.B)&&(g=" - "+q(f,4,!0)),f=e[4]+" ("+J(a,e[5])+")"+g,c&&a.j(f),d||(d=f))}else c&&a.j("no symbols")}return d}
 function rf(a,b){var c;if(b&&"?"==b[1])a.j("register commands:"),a.j("\tr\tdump registers"),a.j("\trm\tdump misc registers"),a.j("\trx [#]\tset flag or register x to [#]");else{var d=a.v,e=void 0;null==c&&(c=!0);if(b&&1<b.length){var f=b[1];if("m"==f)e=!0;else{var g=f.indexOf("=");if(0<g)b=f.substr(g+1),f=f.substr(0,g);else if(2<b.length)b=b[2];else{a.j("missing value for "+b[1]);return}g=X(a,b);if(void 0===g)return;b=a.kb(f);if(0>b){a.j("unknown register: "+f);return}var f=0,h=a.v;switch(b){case ef:H(h,