Merge branch 'master' into gh-pages

jeffpar · Nov 2, 2023 · 2398593 · 2398593
2 parents 93b0069 + 5a85a07
commit 2398593
Show file tree

Hide file tree

Showing 13 changed files with 85,422 additions and 34 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1668,11 +1668,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/diskimage/diskimage.js",
       "args": [
-        "/Volumes/PC_SIG_12_90/1301_400/DISK1370/DISK1370.ZIP",
-        "--verbose",
-        "--extract",
-        "--expand",
-        "--normalize"
+        "https://harddisks.pcjs.org/pcx86/10mb/MSDOS330-C400.json",
+        "tools.json"
       ],
       "cwd": "${workspaceFolder}/tools/pc/disks",
       "stopOnEntry": false,

diff --git a/machines/dec/pdp10/releases/2.21/pdp10-uncompiled.js b/machines/dec/pdp10/releases/2.21/pdp10-uncompiled.js
@@ -5,7 +5,7 @@
 /**
  * @define {string}
  */
-const APPVERSION = "2.21";              // this @define is overridden by the Closure Compiler with the version in machines.json
+const APPVERSION = "2.22";              // this @define is overridden by the Closure Compiler with the version in machines.json
 
 /**
  * COMPILED is false by default; overridden with true in the Closure Compiler release.

diff --git a/machines/dec/pdp11/releases/2.21/pdp11-uncompiled.js b/machines/dec/pdp11/releases/2.21/pdp11-uncompiled.js
@@ -5,7 +5,7 @@
 /**
  * @define {string}
  */
-const APPVERSION = "2.21";              // this @define is overridden by the Closure Compiler with the version in machines.json
+const APPVERSION = "2.22";              // this @define is overridden by the Closure Compiler with the version in machines.json
 
 /**
  * COMPILED is false by default; overridden with true in the Closure Compiler release.

diff --git a/machines/machines.json b/machines/machines.json
@@ -24,7 +24,7 @@
   },
   "pcx86": {
     "name": "PCx86",
-    "version": "2.21",
+    "version": "2.22",
     "defines": [
       "APPVERSION",
       "DEBUGGER",

diff --git a/machines/modules/v2/defines.js b/machines/modules/v2/defines.js
@@ -10,7 +10,7 @@
 /**
  * @define {string}
  */
-const APPVERSION = "2.21";              // this @define is overridden by the Closure Compiler with the version in machines.json
+const APPVERSION = "2.22";              // this @define is overridden by the Closure Compiler with the version in machines.json
 
 /**
  * COMPILED is false by default; overridden with true in the Closure Compiler release.

diff --git a/machines/osi/c1p/releases/2.21/c1p-uncompiled.js b/machines/osi/c1p/releases/2.21/c1p-uncompiled.js
@@ -5,7 +5,7 @@
 /**
  * @define {string}
  */
-const APPVERSION = "2.21";              // this @define is overridden by the Closure Compiler with the version in machines.json
+const APPVERSION = "2.22";              // this @define is overridden by the Closure Compiler with the version in machines.json
 
 /**
  * COMPILED is false by default; overridden with true in the Closure Compiler release.

diff --git a/machines/pcx80/releases/2.21/pcx80-uncompiled.js b/machines/pcx80/releases/2.21/pcx80-uncompiled.js
@@ -5,7 +5,7 @@
 /**
  * @define {string}
  */
-const APPVERSION = "2.21";              // this @define is overridden by the Closure Compiler with the version in machines.json
+const APPVERSION = "2.22";              // this @define is overridden by the Closure Compiler with the version in machines.json
 
 /**
  * COMPILED is false by default; overridden with true in the Closure Compiler release.

diff --git a/machines/pcx86/modules/v2/cpux86.js b/machines/pcx86/modules/v2/cpux86.js
@@ -2473,6 +2473,10 @@ export default class CPUx86 extends CPULib {
         this.resultLogic = value;
         if (carry) this.setCF(); else this.clearCF();
         if (overflow) this.setOF(); else this.clearOF();
+        /*
+         * Apparently the actual hardware clears AF on logical instructions (at least AND, OR, TEST) so we will, too.
+         */
+        this.clearAF();
         return value;
     }