Moved Message categories into messages.js, and include defines.js as appropriate

modules/pcx86/lib/chipset.js

@@ -37,6 +37,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Interrupts  = require("./interrupts");
     var Messages    = require("./messages");
     var X86         = require("./x86");

modules/pcx86/lib/computer.js

@@ -68,6 +68,7 @@ if (NODE) {
     var ReportAPI   = require("../../shared/lib/reportapi");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Messages    = require("./messages");
     var Bus         = require("./bus");
 }

modules/pcx86/lib/debugger.js

@@ -677,59 +677,6 @@ if (DEBUGGER) {
     Debugger.TYPE_80387 = Debugger.TYPE_80386;
     Debugger.TYPE_CPU_SHIFT = 14;
 
-    /*
-     * Message categories supported by the messageEnabled() function and other assorted message
-     * functions. Each category has a corresponding bit value that can be combined (ie, OR'ed) as
-     * needed.  The Debugger's message command ("m") is used to turn message categories on and off,
-     * like so:
-     *
-     *      m port on
-     *      m port off
-     *      ...
-     *
-     * NOTE: The order of these categories can be rearranged, alphabetized, etc, as desired; just be
-     * aware that changing the bit values could break saved Debugger states (not a huge concern, just
-     * something to be aware of).
-     */
-    Debugger.MESSAGES = {
-        "cpu":      Messages.CPU,
-        "seg":      Messages.SEG,
-        "desc":     Messages.DESC,
-        "tss":      Messages.TSS,
-        "int":      Messages.INT,
-        "fault":    Messages.FAULT,
-        "bus":      Messages.BUS,
-        "mem":      Messages.MEM,
-        "port":     Messages.PORT,
-        "dma":      Messages.DMA,
-        "pic":      Messages.PIC,
-        "timer":    Messages.TIMER,
-        "cmos":     Messages.CMOS,
-        "rtc":      Messages.RTC,
-        "8042":     Messages.C8042,
-        "chipset":  Messages.CHIPSET,   // ie, anything else in ChipSet besides DMA, PIC, TIMER, CMOS, RTC and 8042
-        "keyboard": Messages.KEYBOARD,  // "kbd" is also allowed as shorthand for "keyboard"; see doMessages()
-        "key":      Messages.KEYS,      // using "key" instead of "keys", since the latter is a method on JavasScript objects
-        "video":    Messages.VIDEO,
-        "fdc":      Messages.FDC,
-        "hdc":      Messages.HDC,
-        "disk":     Messages.DISK,
-        "parallel": Messages.PARALLEL,
-        "serial":   Messages.SERIAL,
-        "mouse":    Messages.MOUSE,
-        "speaker":  Messages.SPEAKER,
-        "computer": Messages.COMPUTER,
-        "dos":      Messages.DOS,
-        "data":     Messages.DATA,
-        "log":      Messages.LOG,
-        "warn":     Messages.WARN,
-        /*
-         * Now we turn to message actions rather than message types; for example, setting "halt"
-         * on or off doesn't enable "halt" messages, but rather halts the CPU on any message above.
-         */
-        "halt":     Messages.HALT
-    };
-
     Debugger.HISTORY_LIMIT = DEBUG? 100000 : 1000;
 
     /*
@@ -3410,9 +3357,9 @@ if (DEBUGGER) {
          */
         var aEnable = this.parseCommand(sEnable.replace("keys","key").replace("kbd","keyboard"), false, '|');
         if (aEnable.length) {
-            for (var m in Debugger.MESSAGES) {
+            for (var m in Messages.CATEGORIES) {
                 if (usr.indexOf(aEnable, m) >= 0) {
-                    this.bitsMessage |= Debugger.MESSAGES[m];
+                    this.bitsMessage |= Messages.CATEGORIES[m];
                     this.println(m + " messages enabled");
                 }
             }
@@ -3430,8 +3377,8 @@ if (DEBUGGER) {
      */
     Debugger.prototype.messageDump = function(bitMessage, fnDumper)
     {
-        for (var m in Debugger.MESSAGES) {
+        for (var m in Messages.CATEGORIES) {
-            if (bitMessage == Debugger.MESSAGES[m]) {
+            if (bitMessage == Messages.CATEGORIES[m]) {
                 this.afnDumpers[m] = fnDumper;
                 return true;
             }
@@ -6404,7 +6351,7 @@ if (DEBUGGER) {
 
         if (sAddr == '?') {
             var sDumpers = "";
-            for (m in Debugger.MESSAGES) {
+            for (m in Messages.CATEGORIES) {
                 if (this.afnDumpers[m]) {
                     if (sDumpers) sDumpers += ',';
                     sDumpers = sDumpers + m;
@@ -6487,7 +6434,7 @@ if (DEBUGGER) {
                 this.doLoad(asArgs);
                 return;
             }
-            for (m in Debugger.MESSAGES) {
+            for (m in Messages.CATEGORIES) {
                 if (asArgs[1] == m) {
                     var fnDumper = this.afnDumpers[m];
                     if (fnDumper) {
@@ -7007,9 +6954,9 @@ if (DEBUGGER) {
                  */
                 if (sCategory == "keys") sCategory = "key";
                 if (sCategory == "kbd") sCategory = "keyboard";
-                for (m in Debugger.MESSAGES) {
+                for (m in Messages.CATEGORIES) {
                     if (sCategory == m) {
-                        bitsMessage = Debugger.MESSAGES[m];
+                        bitsMessage = Messages.CATEGORIES[m];
                         fCriteria = !!(this.bitsMessage & bitsMessage);
                         break;
                     }
@@ -7036,9 +6983,9 @@ if (DEBUGGER) {
          */
         var n = 0;
         var sCategories = "";
-        for (m in Debugger.MESSAGES) {
+        for (m in Messages.CATEGORIES) {
             if (!sCategory || sCategory == m) {
-                var bitMessage = Debugger.MESSAGES[m];
+                var bitMessage = Messages.CATEGORIES[m];
                 var fEnabled = !!(this.bitsMessage & bitMessage);
                 if (fCriteria !== null && fCriteria != fEnabled) continue;
                 if (sCategories) sCategories += ',';

modules/pcx86/lib/fdc.js

@@ -37,6 +37,7 @@ if (NODE) {
     var DiskAPI     = require("../../shared/lib/diskapi");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Messages    = require("./messages");
     var ChipSet     = require("./chipset");
     var Disk        = require("./disk");

modules/pcx86/lib/hdc.js

@@ -37,6 +37,7 @@ if (NODE) {
     var DiskAPI     = require("../../shared/lib/diskapi");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Interrupts  = require("./interrupts");
     var Messages    = require("./messages");
     var ChipSet     = require("./chipset");

modules/pcx86/lib/keyboard.js

@@ -36,6 +36,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Messages    = require("./messages");
     var ChipSet     = require("./chipset");
     var CPU         = require("./cpu");

modules/pcx86/lib/messages.js

@@ -82,4 +82,57 @@ var Messages = {
     HALT:       0x80000000|0
 };
 
+/*
+ * Message categories supported by the messageEnabled() function and other assorted message
+ * functions. Each category has a corresponding bit value that can be combined (ie, OR'ed) as
+ * needed.  The Debugger's message command ("m") is used to turn message categories on and off,
+ * like so:
+ *
+ *      m port on
+ *      m port off
+ *      ...
+ *
+ * NOTE: The order of these categories can be rearranged, alphabetized, etc, as desired; just be
+ * aware that changing the bit values could break saved Debugger states (not a huge concern, just
+ * something to be aware of).
+ */
+Messages.CATEGORIES = {
+    "cpu":      Messages.CPU,
+    "seg":      Messages.SEG,
+    "desc":     Messages.DESC,
+    "tss":      Messages.TSS,
+    "int":      Messages.INT,
+    "fault":    Messages.FAULT,
+    "bus":      Messages.BUS,
+    "mem":      Messages.MEM,
+    "port":     Messages.PORT,
+    "dma":      Messages.DMA,
+    "pic":      Messages.PIC,
+    "timer":    Messages.TIMER,
+    "cmos":     Messages.CMOS,
+    "rtc":      Messages.RTC,
+    "8042":     Messages.C8042,
+    "chipset":  Messages.CHIPSET,       // ie, anything else in ChipSet besides DMA, PIC, TIMER, CMOS, RTC and 8042
+    "keyboard": Messages.KEYBOARD,      // "kbd" is also allowed as shorthand for "keyboard"; see doMessages()
+    "key":      Messages.KEYS,          // using "key" instead of "keys", since the latter is a method on JavasScript objects
+    "video":    Messages.VIDEO,
+    "fdc":      Messages.FDC,
+    "hdc":      Messages.HDC,
+    "disk":     Messages.DISK,
+    "parallel": Messages.PARALLEL,
+    "serial":   Messages.SERIAL,
+    "mouse":    Messages.MOUSE,
+    "speaker":  Messages.SPEAKER,
+    "computer": Messages.COMPUTER,
+    "dos":      Messages.DOS,
+    "data":     Messages.DATA,
+    "log":      Messages.LOG,
+    "warn":     Messages.WARN,
+    /*
+     * Now we turn to message actions rather than message types; for example, setting "halt"
+     * on or off doesn't enable "halt" messages, but rather halts the CPU on any message above.
+     */
+    "halt":     Messages.HALT
+};
+
 if (NODE) module.exports = Messages;

modules/pcx86/lib/mouse.js

@@ -36,6 +36,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Messages    = require("./messages");
     var SerialPort  = require("./serialport");
 }

modules/pcx86/lib/panel.js

@@ -36,6 +36,7 @@ if (NODE) {
     var usr         = require("../../shared/lib/usrlib");
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
+    var PCX86       = require("./defines");
     var Bus         = require("./bus");
     var Memory      = require("./memory");
     var X86         = require("./x86");

modules/pcx86/lib/parallelport.js

@@ -36,6 +36,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Messages    = require("./messages");
     var ChipSet     = require("./chipset");
 }

modules/pcx86/lib/ram.js

@@ -36,6 +36,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Memory      = require("./memory");
     var ROM         = require("./rom");
 }

modules/pcx86/lib/rom.js

@@ -36,6 +36,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var DumpAPI     = require("../../shared/lib/dumpapi");
     var Component   = require("../../shared/lib/component");
+    var PCX86       = require("./defines");
     var Memory      = require("./memory");
 }
 

modules/pcx86/lib/serialport.js

@@ -36,6 +36,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Messages    = require("./messages");
     var ChipSet     = require("./chipset");
 }

modules/pcx86/lib/video.js

@@ -37,6 +37,7 @@ if (NODE) {
     var DumpAPI     = require("../../shared/lib/dumpapi");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Memory      = require("./memory");
     var Messages    = require("./messages");
     var ChipSet     = require("./chipset");

modules/pcx86/lib/x86cpu.js

@@ -36,6 +36,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var Messages    = require("./messages");
     var Memory      = require("./memory");
     var CPU         = require("./cpu");

modules/pcx86/lib/x86fpu.js

@@ -39,6 +39,7 @@ if (NODE) {
     var web         = require("../../shared/lib/weblib");
     var Component   = require("../../shared/lib/component");
     var State       = require("../../shared/lib/state");
+    var PCX86       = require("./defines");
     var X86         = require("./x86");
 }