Merge branch 'master' into gh-pages

jeffpar · Dec 14, 2023 · 238aca5 · 238aca5
2 parents 23d585b + 030fd92
commit 238aca5
Show file tree

Hide file tree

Showing 8 changed files with 2,080 additions and 746 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -179,6 +179,7 @@
     "APPCLASS",
     "APPNAME",
     "APPVERSION",
+    "Appy",
     "ARCCRC",
     "arcfile",
     "arclzw",
@@ -280,6 +281,7 @@
     "BINOP",
     "BIOS's",
     "BIOSes",
+    "BIOSEXT",
     "BIOSHOOK",
     "BIOSMODE",
     "BIOSRTC",
@@ -394,6 +396,7 @@
     "ccccdddddddd",
     "CCTRAN",
     "CDBL",
+    "CDFS",
     "CDIV",
     "cdrom",
     "cdroms",
@@ -428,6 +431,7 @@
     "CEQKCE",
     "CERTID",
     "CFKAAC",
+    "CFSD",
     "CGA's",
     "changeline",
     "Chappell",
@@ -522,6 +526,7 @@
     "CONFIGFAIL",
     "CONFIGMG",
     "CONFLIB",
+    "Confs",
     "congfigurations",
     "CONI",
     "CONO",
@@ -573,6 +578,7 @@
     "CTRLS",
     "CTTY",
     "CUPDATE",
+    "Curdir",
     "CURSCAN",
     "CURSCANB",
     "CURSORHI",
@@ -985,6 +991,7 @@
     "fileoverview",
     "FILESIZE",
     "FILESORT",
+    "FILESYSCHANGE",
     "filetimes",
     "FIMUL",
     "finchar",
@@ -1263,6 +1270,7 @@
     "IFNB",
     "iframes",
     "IFSHLP",
+    "IFSMGR",
     "iife",
     "iisnode",
     "ILDB",
@@ -1299,6 +1307,7 @@
     "INCWORD",
     "INDEXD",
     "indianred",
+    "Indos",
     "INDXB",
     "INDXW",
     "inflag",
@@ -1354,6 +1363,7 @@
     "IORB",
     "IORD",
     "ioregs",
+    "IOREQ",
     "IORI",
     "IORM",
     "IOSYS",
@@ -2084,6 +2094,7 @@
     "peachpuff",
     "PEDATA",
     "PEDIR",
+    "PELDR",
     "PELOADER",
     "PELWIDTH",
     "PENHI",
@@ -2202,6 +2213,7 @@
     "PSFLAG",
     "Psti",
     "Psygnosis",
+    "Ptrs",
     "Pullup",
     "PUOZDI",
     "PUPSW",
@@ -2299,6 +2311,7 @@
     "redirector",
     "Redirector",
     "redistributable",
+    "Reenumerate",
     "refid",
     "REGD",
     "REGDOTCMD",
@@ -2441,6 +2454,7 @@
     "SCCS",
     "SCED",
     "SCESA",
+    "Sched",
     "Schulman",
     "Schwaderer",
     "scottsc",
@@ -2715,6 +2729,7 @@
     "SYSIMES",
     "SYSINFO",
     "SYSINIT",
+    "SYSMODAL",
     "SYSREQ",
     "SYSTEMCLOCK",
     "SYSTEMCLOCKDIV",
@@ -2865,6 +2880,7 @@
     "undelete",
     "underflows",
     "UNDOC",
+    "Undock",
     "unencrypted",
     "UNERASE",
     "Unerasing",
@@ -2911,6 +2927,7 @@
     "untypeable",
     "unus",
     "unvalidated",
+    "Unvirtualize",
     "unwritable",
     "upcase",
     "uppercases",
@@ -2957,7 +2974,9 @@
     "visualbasic",
     "VLSI",
     "VMCPD",
+    "VMINI",
     "VMMAPI",
+    "VMOUSE",
     "VMPOLL",
     "VMSGD",
     "VNETBIOS",

diff --git a/machines/pcx86/modules/v2/computer.js b/machines/pcx86/modules/v2/computer.js
@@ -498,8 +498,8 @@ export default class Computer extends Component {
      *
      * @this {Computer}
      * @param {string} sParm
-     * @param {boolean} fDefault
-     * @returns {boolean}
+     * @param {boolean} [fDefault]
+     * @returns {boolean|undefined}
      */
     getMachineBoolean(sParm, fDefault)
     {

diff --git a/machines/pcx86/modules/v2/debugger.js b/machines/pcx86/modules/v2/debugger.js
@@ -280,7 +280,7 @@ export default class Debuggerx86 extends DbgLib {
         this.messageDump(MESSAGE.MEM,  function onDumpMem(asArgs) { dbg.dumpMem(asArgs); });
         this.messageDump(MESSAGE.TSS,  function onDumpTSS(asArgs) { dbg.dumpTSS(asArgs); });
 
-        let fSymbols = cmp.getMachineBoolean('symbols', false);
+        let fSymbols = cmp.getMachineBoolean('symbols');
         if (DEBUG && fSymbols !== false || fSymbols) {
             if (Interrupts.WINDBG.ENABLED || Interrupts.WINDBGRM.ENABLED) {
                 this.fWinDbg = null;
@@ -4742,7 +4742,7 @@ export default class Debuggerx86 extends DbgLib {
                                     if (symbol['o'] == offSymbol && symbol['s'] == symbolTable.sel) {
                                         return true;
                                     }
-                                    dbg.printf(MESSAGE.DEBUG + MESSAGE.ERROR, "%s.%s (%x) does not match previous value (%x)\n", sVxD, sSymbol, offSymbol, symbol['o']);
+                                    dbg.printf(MESSAGE.DEBUG + MESSAGE.ERROR, "%s.%s (%%%X) does not match previous value (%%%X)\n", sVxD, sSymbol, offSymbol, symbol['o']);
                                     return false;
                                 }
                                 let pair = [offSymbol, keySymbol];
@@ -4751,14 +4751,16 @@ export default class Debuggerx86 extends DbgLib {
                                     symbolTable.aOffsets.splice(-(result + 1), 0, pair);
                                     symbolTable.aSymbols[keySymbol] = {'o': offSymbol, 's': symbolTable.sel};
                                     if (fPrint && sSymbol[0] != '$') {
-                                        dbg.printf(MESSAGE.DEBUG + MESSAGE.LOG, "%s.%s: %x\n", sVxD, sSymbol, offSymbol);
+                                        dbg.printf(MESSAGE.DEBUG + MESSAGE.LOG, "%s.%s: %%%X\n", sVxD, sSymbol, offSymbol);
                                     }
-                                    return true;
+                                } else {
+                                    // dbg.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "%s.%s (%%%X) already has symbol: %s\n", sVxD, sSymbol, offSymbol, symbolTable.aOffsets[result][1]);
+                                    symbolTable.aOffsets[result] = pair;
+                                    symbolTable.aSymbols[keySymbol] = {'o': offSymbol, 's': symbolTable.sel};
                                 }
-                                dbg.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "%s.%s (%x) already has symbol: %s\n", sVxD, sSymbol, offSymbol, symbolTable.aOffsets[result][1]);
-                                return false;
+                                return true;
                             }
-                            dbg.printf(MESSAGE.DEBUG + MESSAGE.ERROR, "%s.%s (%x) out of range\n", sVxD, sSymbol, offSymbol);
+                            dbg.printf(MESSAGE.DEBUG + MESSAGE.ERROR, "%s.%s (%%%X) out of range (check %%%X)\n", sVxD, sSymbol, offSymbol, dbgAddr.addr-2);
                             return false;
                         };
                         /**
@@ -4774,14 +4776,14 @@ export default class Debuggerx86 extends DbgLib {
                         return false;
                     }
                     if (idSrv < 32768) {        // TODO: Figure out what the larger service numbers represent
-                        this.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "%s service %d: unrecognized\n", sVxD, idSrv);
+                        this.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "%s service %d: unrecognized (check %%%X)\n", sVxD, idSrv, dbgAddr.addr-2);
                     }
                     return false;
                 }
                 return false;                   // if our VxD table doesn't have a function list yet, don't bother with a warning
             }
         }
-        this.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "VxD %d: unrecognized\n", idVxD);
+        this.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "VxD %d: unrecognized (check %%%X)\n", idVxD, dbgAddr.addr-2);
         return false;
     }
 

diff --git a/machines/pcx86/modules/v2/disk.js b/machines/pcx86/modules/v2/disk.js
@@ -1024,11 +1024,11 @@ export default class Disk extends Component {
      * addModuleInfo(sector)
      *
      * @this {Disk}
-     * @param {Sector} sector
+     * @param {Sector|null} sector
      */
     addModuleInfo(sector)
     {
-        if (SYMBOLS && sector.file) {
+        if (SYMBOLS && sector && sector.file) {
             let module = sector.file.module;
             if (module) {
                 this.aModules[module.name] = module;