Changeset 12964 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 2, 2008 10:25:43 PM (16 years ago)

Author:

vboxsync

Message:

VMM: MMPhysGCPhys2HCVirt -> PGMPhysGCPhys2HCPtrAssert; deleted MMAllPhys.cpp.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (1 diff)
• PGMAllPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -3142 +3142 @@
     Assert(pPDSrc);
 #   ifndef IN_GC
-    Assert(MMPhysGCPhys2HCVirt(pVM, (RTGCPHYS)(cr3 & GST_CR3_PAGE_MASK), sizeof(*pPDSrc)) == pPDSrc);
+    Assert(PGMPhysGCPhys2HCPtrAssert(pVM, (RTGCPHYS)(cr3 & GST_CR3_PAGE_MASK), sizeof(*pPDSrc)) == pPDSrc);
 #   endif
 #  endif

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -900 +900 @@
         return VERR_PGM_PHYS_PAGE_RESERVED;
     return VINF_SUCCESS;
+}
+
+
+/**
+ * PGMPhysGCPhys2HCPtr convenience for use with assertions.
+ *
+ * @returns The HCPtr, NIL_RTHCPTR on failure.
+ * @param   pVM         The VM handle.
+ * @param   GCPhys      The GC Physical addresss.
+ * @param   cbRange     Physical range.
+ */
+PGMDECL(RTHCPTR) PGMPhysGCPhys2HCPtrAssert(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange)
+{
+    RTHCPTR HCPtr;
+    int rc = PGMPhysGCPhys2HCPtr(pVM, GCPhys, cbRange, &HCPtr);
+    if (VBOX_SUCCESS(rc))
+        return HCPtr;
+    return NIL_RTHCPTR;
 }