Changeset 92747 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 5, 2021 7:16:31 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148658

Message:

DevFDC: Added a basic debug info handler.

File:

• trunk/src/VBox/Devices/Storage/DevFdc.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/DevFdc.cpp

@@ -684 +684 @@
     uint8_t data_dir;
     uint8_t eot; /* last wanted sector */
+    /* Debugging only */
+    uint8_t cur_cmd;
+    uint8_t prev_cmd;
     /* States kept only to be returned back */
     /* Timers state */
@@ -1068 +1071 @@
     fdctrl->data_pos = 0;
     fdctrl->msr &= ~(FD_MSR_CMDBUSY | FD_MSR_DIO);
+    fdctrl->prev_cmd = fdctrl->cur_cmd;
+    fdctrl->cur_cmd = 0;
 }
 
@@ -2189 +2194 @@
         fdctrl->data_len = handlers[pos].parameters + 1;
         fdctrl->msr |= FD_MSR_CMDBUSY;
+        fdctrl->cur_cmd = value & 0xff;
     }
 
@@ -2365 +2371 @@
     }
     return VERR_IOM_IOPORT_UNUSED;
+}
+
+
+/* -=-=-=-=-=-=-=-=- Debugger callback -=-=-=-=-=-=-=-=- */
+
+/**
+ * FDC debugger info callback.
+ *
+ * @param   pDevIns     The device instance.
+ * @param   pHlp        The output helpers.
+ * @param   pszArgs     The arguments.
+ */
+static DECLCALLBACK(void) fdcInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    fdctrl_t    *pThis = PDMDEVINS_2_DATA(pDevIns, fdctrl_t *);
+    unsigned    i;
+    bool        fVerbose = false;
+
+    /* Parse arguments. */
+    if (pszArgs)
+        fVerbose = strstr(pszArgs, "verbose") != NULL;
+
+    /* Show basic information. */
+    pHlp->pfnPrintf(pHlp, "%s#%d: ",
+                    pDevIns->pReg->szName,
+                    pDevIns->iInstance);
+    pHlp->pfnPrintf(pHlp, "I/O=%X IRQ=%u DMA=%u ",
+                    pThis->io_base,
+                    pThis->irq_lvl,
+                    pThis->dma_chann);
+    pHlp->pfnPrintf(pHlp, "RC=%RTbool R0=%RTbool\n", pDevIns->fRCEnabled, pDevIns->fR0Enabled);
+
+    /* Print register contents. */
+    pHlp->pfnPrintf(pHlp, "Registers: MSR=%02X DSR=%02X DOR=%02X\n",
+                    pThis->msr, pThis->dsr, pThis->dor);
+    pHlp->pfnPrintf(pHlp, "           DIR=%02X\n",
+                    fdctrl_read_dir(pThis));
+
+    /* Print the current command, if any. */
+    if (pThis->cur_cmd)
+        pHlp->pfnPrintf(pHlp, "Curr cmd: %02X (%s)\n",
+                        pThis->cur_cmd,
+                        handlers[command_to_handler[pThis->cur_cmd]].name);
+        pHlp->pfnPrintf(pHlp, "Prev cmd: %02X (%s)\n",
+                        pThis->prev_cmd,
+                        handlers[command_to_handler[pThis->prev_cmd]].name);
+
+
+    for (i = 0; i < pThis->num_floppies; ++i)
+    {
+        fdrive_t  *drv = &pThis->drives[i];
+        pHlp->pfnPrintf(pHlp, "  Drive %u state:\n", i);
+        pHlp->pfnPrintf(pHlp, "    Medium : %u tracks, %u sectors\n",
+                        drv->max_track,
+                        drv->last_sect);
+        pHlp->pfnPrintf(pHlp, "    Current: track %u, head %u, sector %u\n",
+                        drv->track,
+                        drv->head,
+                        drv->sect);
+    }
 }
 
@@ -3002 +3068 @@
     rc = PDMDevHlpSSMRegister(pDevIns, FDC_SAVESTATE_CURRENT, sizeof(*pThis), fdcSaveExec, fdcLoadExec);
     AssertRCReturn(rc, rc);
+
+    /*
+     * Register the debugger info callback.
+     */
+    PDMDevHlpDBGFInfoRegister(pDevIns, "fdc", "FDC info", fdcInfo);
 
     /*