Merge branch 'master' into gh-pages

jeffpar · Nov 14, 2023 · 05338ef · 05338ef
2 parents 7203273 + afd632c
commit 05338ef
Show file tree

Hide file tree

Showing 21 changed files with 361 additions and 240 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -490,6 +490,7 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
+        "disks/msdos"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
@@ -511,12 +512,13 @@
       "program": "${workspaceFolder}/tools/pc/pc.js",
       // The arguments to pass to the program, if any.
       "args": [
+        "disks/msdos",
         "--target=32M",
         "--sys=msdos:3.31",
         "--halt"
       ],
       // The working directory of the program.
-      "cwd": "${workspaceFolder}/tools/pc/disks/msdos",
+      "cwd": "${workspaceFolder}/tools/pc",
       // The environment variables to pass to the program.
       "env": {},
       // If the environment variables should not be inherited from the parent process.
@@ -541,15 +543,39 @@
       }
     },
     {
-      "name": "PC.js for BASIC-DOS",
+      "name": "PC.js BASIC-DOS build",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/tools/pc/pc.js",
+      "args": [
+        "--disk=tools.json",
+        "--dir=%basicdos/software/pcx86/src",
+        "--normalize"
+      ],
+      "cwd": "${workspaceFolder}/tools/pc",
+      "stopOnEntry": false,
+      "console": "integratedTerminal",
+      "outFiles": [
+        "${workspaceFolder}/none/**/*.js"
+      ],
+      "presentation": {
+        "hidden": false,
+        "group": "machines",
+        "order": 15
+      }
+    },
+    {
+      "name": "PC.js BASIC-DOS boot",
       "type": "node",
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
         "ibm5160",
+        "%basicdos/software/pcx86/src/configs/200A",
+        "--system=bd",
+        "--version=2.00A",
         "--floppy",
-        "--system=bd:2.00A",
-        "--dir=disks/empty"
+        "--serial"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
@@ -581,7 +607,12 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
-        "ibm5150"
+        "ibm5150",
+        "disks/empty",
+        "--floppy",
+        "--system=pcdos",
+        "--version=1.0",
+        "--halt"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
@@ -602,11 +633,12 @@
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
         "ibm5160",
+        "disks/msdos",
         "load a: pc dos 2.0 disk 1",
         "--sys=pcdos",
         "--ver=2.00"
       ],
-      "cwd": "${workspaceFolder}/tools/pc/disks/msdos",
+      "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
       "console": "integratedTerminal",
       "outFiles": [
@@ -713,34 +745,12 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
+        "disks/msdos",
         "--sys=compaq",
         "--ver=3.31",
         "--target=40M"
       ],
-      "cwd": "${workspaceFolder}/tools/pc/disks/msdos",
-      "stopOnEntry": false,
-      "console": "integratedTerminal",
-      "outFiles": [
-        "${workspaceFolder}/none/**/*.js"
-      ],
-      "presentation": {
-        "hidden": false,
-        "group": "machines",
-        "order": 15
-      }
-    },
-    {
-      "name": "PC.js compaq386 MBR331",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/tools/pc/pc.js",
-      "args": [
-        "compaq386",
-        "--disk=MBR331.img",
-        "--nofloppy",
-        "--halt"
-      ],
-      "cwd": "${workspaceFolder}/tools/pc/disks",
+      "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
       "console": "integratedTerminal",
       "outFiles": [
@@ -758,7 +768,7 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
-        "--start=test386",
+        "--select=test386",
         "--debug"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
@@ -774,12 +784,13 @@
       }
     },
     {
-      "name": "PC.js --start=/machines/pcx86/ibm/5170/cga/640kb/rev3/machine.xml",
+      "name": "PC.js --select=/machines/pcx86/ibm/5170/cga/640kb/rev3/machine.xml",
       "type": "node",
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
-        "--start=/machines/pcx86/ibm/5170/cga/640kb/rev3/machine.xml"
+        "--select=/machines/pcx86/ibm/5170/cga/640kb/rev3/machine.xml",
+        "disks/msdos"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
@@ -794,12 +805,13 @@
       }
     },
     {
-      "name": "PC.js --start=/machines/pcx86/ibm/5170/ega/1024kb/rev3/debugger/machine.xml",
+      "name": "PC.js --select=/machines/pcx86/ibm/5170/ega/1024kb/rev3/debugger/machine.xml",
       "type": "node",
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
-        "--start=/machines/pcx86/ibm/5170/ega/1024kb/rev3/debugger/machine.xml"
+        "--select=/machines/pcx86/ibm/5170/ega/1024kb/rev3/debugger/machine.xml",
+        "disks/msdos"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
@@ -981,12 +993,13 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
+        "disks/empty",
         "dir",
         "--drivetype=80:2:18",
         "--sys=compaq",
         "--ver=3.31"
       ],
-      "cwd": "${workspaceFolder}/tools/pc/disks/msdos",
+      "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
       "console": "integratedTerminal",
       "outFiles": [
@@ -1004,7 +1017,7 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
-        "--start=/machines/dec/pdp11/1120/basic/machine.xml",
+        "--select=/machines/dec/pdp11/1120/basic/machine.xml",
         "--debug"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
@@ -1025,7 +1038,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
-        "--start=/machines/dec/pdp11/1120/basic/debugger/machine.xml",
+        "--select=/machines/dec/pdp11/1120/basic/debugger/machine.xml",
+        "--dir=none",
         "--debug"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
@@ -1046,7 +1060,7 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
-        "--start=/machines/dec/pdp11/1170/panel/debugger/machine.xml",
+        "--select=/machines/dec/pdp11/1170/panel/debugger/machine.xml",
         "--debug"
       ],
       "cwd": "${workspaceFolder}/tools/pc",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,10 +1,13 @@
 {
   "files.exclude": {
+    "_site/": true,
+    ".fseventsd": true,
     ".history": true,
     ".sass-cache": true,
+    ".Trashes": true,
+    "CNAME": true,
     "node_modules": true,
-    ".fseventsd": true,
-    ".Trashes": true
+    "out/": true
   },
   "editor.wordWrap": "off",
   "editor.rulers": [127],
@@ -2798,6 +2801,7 @@
     "unbootable",
     "unbundle",
     "uncapitalize",
+    "Unclocked",
     "uncoded",
     "uncomp",
     "uncompiled",

diff --git a/machines/dec/pdp10/releases/2.21/pdp10-uncompiled.js b/machines/dec/pdp10/releases/2.21/pdp10-uncompiled.js
@@ -6321,14 +6321,15 @@ class DbgLib extends Component {
     }
 
     /**
-     * notifyEvent(nEvent)
+     * notifyEvent(nEvent, dataEvent)
      *
      * @param {number} nEvent (see DbgLib.EVENTS)
+     * @param {number} [dataEvent] (optional data for event)
      */
-    notifyEvent(nEvent)
+    notifyEvent(nEvent, dataEvent)
     {
         for (let i = 0; i < this.afnNotify.length; i++) {
-            this.afnNotify[i](nEvent);
+            this.afnNotify[i](nEvent, dataEvent);
         }
     }
 }

diff --git a/machines/dec/pdp10/releases/2.21/pdp10.js.map b/machines/dec/pdp10/releases/2.21/pdp10.js.map
diff --git a/machines/dec/pdp11/releases/2.21/pdp11-uncompiled.js b/machines/dec/pdp11/releases/2.21/pdp11-uncompiled.js
@@ -26134,14 +26134,15 @@ class DbgLib extends Component {
     }
 
     /**
-     * notifyEvent(nEvent)
+     * notifyEvent(nEvent, dataEvent)
      *
      * @param {number} nEvent (see DbgLib.EVENTS)
+     * @param {number} [dataEvent] (optional data for event)
      */
-    notifyEvent(nEvent)
+    notifyEvent(nEvent, dataEvent)
     {
         for (let i = 0; i < this.afnNotify.length; i++) {
-            this.afnNotify[i](nEvent);
+            this.afnNotify[i](nEvent, dataEvent);
         }
     }
 }

diff --git a/machines/dec/pdp11/releases/2.21/pdp11.js b/machines/dec/pdp11/releases/2.21/pdp11.js
diff --git a/machines/dec/pdp11/releases/2.21/pdp11.js.map b/machines/dec/pdp11/releases/2.21/pdp11.js.map
diff --git a/machines/modules/v2/dbglib.js b/machines/modules/v2/dbglib.js
@@ -1277,14 +1277,15 @@ export default class DbgLib extends Component {
     }
 
     /**
-     * notifyEvent(nEvent)
+     * notifyEvent(nEvent, dataEvent)
      *
      * @param {number} nEvent (see DbgLib.EVENTS)
+     * @param {number} [dataEvent] (optional data for event)
      */
-    notifyEvent(nEvent)
+    notifyEvent(nEvent, dataEvent)
     {
         for (let i = 0; i < this.afnNotify.length; i++) {
-            this.afnNotify[i](nEvent);
+            this.afnNotify[i](nEvent, dataEvent);
         }
     }
 }

diff --git a/machines/pcx80/releases/2.21/pcx80-uncompiled.js b/machines/pcx80/releases/2.21/pcx80-uncompiled.js
@@ -19655,14 +19655,15 @@ class DbgLib extends Component {
     }
 
     /**
-     * notifyEvent(nEvent)
+     * notifyEvent(nEvent, dataEvent)
      *
      * @param {number} nEvent (see DbgLib.EVENTS)
+     * @param {number} [dataEvent] (optional data for event)
      */
-    notifyEvent(nEvent)
+    notifyEvent(nEvent, dataEvent)
     {
         for (let i = 0; i < this.afnNotify.length; i++) {
-            this.afnNotify[i](nEvent);
+            this.afnNotify[i](nEvent, dataEvent);
         }
     }
 }

diff --git a/machines/pcx80/releases/2.21/pcx80.js.map b/machines/pcx80/releases/2.21/pcx80.js.map
diff --git a/machines/pcx86/diskettes.json b/machines/pcx86/diskettes.json
@@ -9004,6 +9004,11 @@
 						"@title": "WOW Reversi MIPS Demo (Disk 3)",
 						"@diskette": "JEFFPAR-WOW-REVERSI-MIPS-DISK3.json",
 						"@format": "PC1200K"
+					},
+					{
+						"@title": "X86 Emulator Source Code (1990-1996)",
+						"@diskette": "JEFFPAR-X86SRC.json",
+						"@format": "PC1440K"
 					}
 				]
 			}

diff --git a/machines/pcx86/modules/v2/debugger.js b/machines/pcx86/modules/v2/debugger.js
@@ -2955,11 +2955,13 @@ export default class DebuggerX86 extends DbgLib {
      */
     start(ms, nCycles)
     {
-        if (!this.nStep) this.printf("running\n");
         this.flags.running = true;
         this.msStart = ms;
         this.nCyclesStart = nCycles;
-        this.notifyEvent(DbgLib.EVENTS.EXIT);
+        if (!this.nStep) {
+            this.printf("running\n");
+        }
+        this.notifyEvent(DbgLib.EVENTS.EXIT, this.nStep);
     }
 
     /**
@@ -2974,10 +2976,11 @@ export default class DebuggerX86 extends DbgLib {
     stop(ms, nCycles)
     {
         if (this.flags.running) {
+            let nStep = this.nStep;
             this.flags.running = false;
             this.nCycles = nCycles - this.nCyclesStart;
-            this.notifyEvent(DbgLib.EVENTS.ENTER);
-            if (!this.nStep) {
+            this.notifyEvent(DbgLib.EVENTS.ENTER, nStep);
+            if (!nStep) {
                 let sStopped = "stopped";
                 if (this.nCycles) {
                     let msTotal = ms - this.msStart;
@@ -3033,7 +3036,7 @@ export default class DebuggerX86 extends DbgLib {
             this.updateStatus(true);
             this.updateFocus();
             this.clearTempBreakpoint(this.cpu.regLIP);
-            this.notifyEvent(DbgLib.EVENTS.READY);
+            this.notifyEvent(DbgLib.EVENTS.READY, nStep);
         }
     }