Changeset 91907 in vbox for trunk/src

Timestamp:

Oct 20, 2021 7:00:05 PM (3 years ago)

Author:

vboxsync

Message:

VMM/MM: Eliminated MMHyperCCToRC and MMHyperR0ToRC. bugref:9517

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/MMAll.cpp (modified) (2 diffs)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)
• VMMR3/PGMPhys.cpp (modified) (1 diff)

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

@@ -327 +327 @@
 
 
-/**
- * Converts a ring-0 host context address in the Hypervisor memory region to a raw-mode context address.
- *
- * @returns raw-mode context address.
- * @param   pVM         The cross context VM structure.
- * @param   R0Ptr       The ring-0 host context address.
- *                      You'll be damned if this is not in the HMA! :-)
- * @thread  The Emulation Thread.
- */
-VMMDECL(RTRCPTR) MMHyperR0ToRC(PVM pVM, RTR0PTR R0Ptr)
-{
-    uint32_t off;
-    PMMLOOKUPHYPER pLookup = mmHyperLookupR0(pVM, R0Ptr, &off);
-    if (pLookup)
-        return mmHyperLookupCalcRC(pVM, pLookup, off);
-    return NIL_RTRCPTR;
-}
-
-
 #ifndef IN_RING0
 /**
@@ -524 +505 @@
 }
 #endif
-
-
-/**
- * Converts a current context address in the Hypervisor memory region to a raw-mode context address.
- *
- * @returns guest context address.
- * @param   pVM         The cross context VM structure.
- * @param   pv          The current context address.
- *                      You'll be damned if this is not in the HMA! :-)
- * @thread  The Emulation Thread.
- */
-VMMDECL(RTRCPTR) MMHyperCCToRC(PVM pVM, void *pv)
-{
-    uint32_t off;
-    PMMLOOKUPHYPER pLookup = mmHyperLookupCC(pVM, pv, &off);
-    if (pLookup)
-        return mmHyperLookupCalcRC(pVM, pLookup, off);
-    return NIL_RTRCPTR;
-}
 
 

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

@@ -2476 +2476 @@
         const RTGCPHYS GCPhysPage = pPage->GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK;
         rc = PGMHandlerPhysicalRegister(pVM, GCPhysPage, GCPhysPage + PAGE_OFFSET_MASK, pPool->hAccessHandlerType,
-                                        MMHyperCCToR3(pVM, pPage), MMHyperCCToR0(pVM, pPage), MMHyperCCToRC(pVM, pPage),
-                                        NIL_RTR3PTR /*pszDesc*/);
+                                        MMHyperCCToR3(pVM, pPage), MMHyperCCToR0(pVM, pPage), NIL_RTRCPTR, NIL_RTR3PTR /*pszDesc*/);
         /** @todo we should probably deal with out-of-memory conditions here, but for now increasing
          * the heap size should suffice. */

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

@@ -4272 +4272 @@
              */
             rc = PGMHandlerPhysicalRegister(pVM, GCPhys, GCPhysLast, pVM->pgm.s.hRomPhysHandlerType,
-                                            pRomNew, MMHyperCCToR0(pVM, pRomNew), MMHyperCCToRC(pVM, pRomNew), pszDesc);
+                                            pRomNew, MMHyperCCToR0(pVM, pRomNew), NIL_RTRCPTR, pszDesc);
             if (RT_SUCCESS(rc))
             {