Changeset 44691 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 14, 2013 3:33:24 PM (12 years ago)

Author:

vboxsync

Message:

Added a device helper for registering device registers with DBGF (breaks extpacks). Added IOREDTBLn subfields.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGFReg.cpp (modified) (1 diff)
• PDMDevHlp.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFReg.cpp

@@ -525 +525 @@
  *
  * @returns VBox status code.
- * @param   enmReg              The register identifier.
- * @param   enmType             The register type.  This is for sort out
- *                              aliases.  Pass DBGFREGVALTYPE_INVALID to get
- *                              the standard name.
- */
-VMMR3DECL(int) DBGFR3RegRegisterDevice(PVM pVM, PCDBGFREGDESC paRegisters, PPDMDEVINS pDevIns, const char *pszPrefix,
-                                            uint32_t iInstance)
+ * @param   pVM             Pointer to the VM.
+ * @param   paRegisters     The register descriptors.
+ * @param   pDevIns         The device instance. This will be the callback user
+ *                          argument.
+ * @param   pszPrefix       The device name.
+ * @param   iInstance       The device instance.
+ */
+VMMR3_INT_DECL(int) DBGFR3RegRegisterDevice(PVM pVM, PCDBGFREGDESC paRegisters, PPDMDEVINS pDevIns,
+                                            const char *pszPrefix, uint32_t iInstance)
 {
     AssertPtrReturn(paRegisters, VERR_INVALID_POINTER);

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -1006 +1006 @@
 
     LogFlow(("pdmR3DevHlp_DBGFInfoRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
+    return rc;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnDBGFRegRegister} */
+static DECLCALLBACK(int) pdmR3DevHlp_DBGFRegRegister(PPDMDEVINS pDevIns, PCDBGFREGDESC paRegisters)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3DevHlp_DBGFRegRegister: caller='%s'/%d: paRegisters=%p\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, paRegisters));
+
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    VM_ASSERT_EMT(pVM);
+    int rc = DBGFR3RegRegisterDevice(pVM, paRegisters, pDevIns, pDevIns->pReg->szName, pDevIns->iInstance);
+
+    LogFlow(("pdmR3DevHlp_DBGFRegRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     return rc;
 }
@@ -3375 +3391 @@
     pdmR3DevHlp_DBGFStopV,
     pdmR3DevHlp_DBGFInfoRegister,
+    pdmR3DevHlp_DBGFRegRegister,
     pdmR3DevHlp_DBGFTraceBuf,
     pdmR3DevHlp_STAMRegister,
@@ -3605 +3622 @@
     pdmR3DevHlp_DBGFStopV,
     pdmR3DevHlp_DBGFInfoRegister,
+    pdmR3DevHlp_DBGFRegRegister,
     pdmR3DevHlp_DBGFTraceBuf,
     pdmR3DevHlp_STAMRegister,