Changeset 4558

Timestamp:

09/06/07 10:47:05 (1 year ago)

Author:

vboxsync

Message:

Added PDMDEVHLP::pfnPhysGCPtr2GCPhys

Files:

• trunk/include/VBox/pdmdev.h (modified) (1 diff)
• trunk/src/VBox/VMM/PDMDevice.cpp (modified) (4 diffs)

trunk/include/VBox/pdmdev.h

@@ -2196 +2196 @@
-                                                  PFNPDMTHREADWAKEUPDEV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName));
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** Space reserved for future members.
-     * @{ */
-    DECLR3CALLBACKMEMBER(void, pfnReserved2,(void));
-    DECLR3CALLBACKMEMBER(void, pfnReserved3,(void));
-    DECLR3CALLBACKMEMBER(void, pfnReserved4,(void));

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -144 +144 @@
-static DECLCALLBACK(int) pdmR3DevHlp_PhysReserve(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTUINT cbRange, const char *pszDesc);
-static DECLCALLBACK(int) pdmR3DevHlp_Phys2HCVirt(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTUINT cbRange, PRTHCPTR ppvHC);
+static DECLCALLBACK(int) pdmR3DevHlp_PhysGCPtr2GCPhys(PPDMDEVINS pDevIns, RTGCPTR GCPtr, PRTGCPHYS pGCPhys);
-static DECLCALLBACK(int) pdmR3DevHlp_PhysGCPtr2HCPtr(PPDMDEVINS pDevIns, RTGCPTR GCPtr, PRTHCPTR pHCPtr);
-static DECLCALLBACK(bool) pdmR3DevHlp_A20IsEnabled(PPDMDEVINS pDevIns);
@@ -320 +321 @@
-    pdmR3DevHlp_UTCNow,
-    pdmR3DevHlp_PDMThreadCreate,
-0
+pdmR3DevHlp_PhysGCPtr2GCPhys
-    0,
-    0,
@@ -409 +410 @@
-    pdmR3DevHlp_UTCNow,
-    pdmR3DevHlp_PDMThreadCreate,
-0
+pdmR3DevHlp_PhysGCPtr2GCPhys
-    0,
-    0,
@@ -3289 +3290 @@
-}
-
+/** @copydoc PDMDEVHLP::pfnPhysGCPtr2GCPhys */
+static DECLCALLBACK(int) pdmR3DevHlp_PhysGCPtr2GCPhys(PPDMDEVINS pDevIns, RTGCPTR GCPtr, PRTGCPHYS pGCPhys)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    PVM pVM = pDevIns->Internal.s.pVMHC;
+    VM_ASSERT_EMT(pVM);
+    LogFlow(("pdmR3DevHlp_PhysGCPtr2GCPhys: caller='%s'/%d: GCPtr=%VGv pGCPhys=%p\n",
+             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPtr, pGCPhys));
+
+    int rc = PGMPhysGCPtr2GCPhys(pVM, GCPtr, pGCPhys);
+
+    LogFlow(("pdmR3DevHlp_PhysGCPtr2GCPhys: caller='%s'/%d: returns %Vrc *pGCPhys=%VGp\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc, *pGCPhys));
+
+    return rc;
+}
-
-/** @copydoc PDMDEVHLP::pfnA20IsEnabled */