Changeset 11153 in vbox for trunk

Timestamp:

Aug 5, 2008 10:47:48 PM (16 years ago)

Author:

vboxsync

Message:

VMM: raw-mode context (RC) changes for the MHyperXXToYY APIs.

Location:

trunk

Files:

• include/VBox/mm.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/MMAll.cpp (modified) (1 diff)

trunk/include/VBox/mm.h

@@ -246 +246 @@
 }
 #endif
-#define MMHyperGCToCC(pVM, RCPtr) MMHyperRCToCC(pVM, RCPtr)
+#define MMHyperGCToCC(pVM, RCPtr) MMHyperRCToCC(pVM, RCPtr) /**< @deprecated */
 
 #ifndef IN_RING3
@@ -269 +269 @@
 
 #ifndef IN_GC
-MMDECL(RCPTRTYPE(void *))     MMHyperCCToGC(PVM pVM, void *pv);
-#else
-DECLINLINE(RCPTRTYPE(void *)) MMHyperCCToGC(PVM pVM, void *pv)
-{
-    NOREF(pVM);
-    return (RCPTRTYPE(void *))pv;
-}
-#endif
+MMDECL(RTRCPTR)     MMHyperCCToRC(PVM pVM, void *pv);
+#else
+DECLINLINE(RTRCPTR) MMHyperCCToRC(PVM pVM, void *pv)
+{
+    NOREF(pVM);
+    return (RTRCPTR)pv;
+}
+#endif
+#define MMHyperCCToGC(pVM, pv)  MMHyperCCToRC(pVM, pv) /** @deprecated */
 
 
@@ -289 +290 @@
 #endif
 
-
-MMDECL(RCPTRTYPE(void *))     MMHyperHC2GC(PVM pVM, RTHCPTR HCPtr);
-MMDECL(RTHCPTR)     MMHyperGC2HC(PVM pVM, RCPTRTYPE(void *) GCPtr);
+#define MMHyperHC2GC(pVM, R3Ptr) MMHyperR3ToRC((pVM), (R3Ptr)) /**< @deprecated */
+#define MMHyperGC2HC(pVM, RCPtr) MMHyperRCToR3((pVM), (RCPtr)) /**< @deprecated */
+
+
 MMDECL(int)         MMHyperAlloc(PVM pVM, size_t cb, uint32_t uAlignment, MMTAG enmTag, void **ppv);
 MMDECL(int)         MMHyperFree(PVM pVM, void *pv);

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

@@ -504 +504 @@
 #endif
 
-
-
-/**
- * Converts a HC address in the Hypervisor memory region to a GC address.
- * The memory must have been allocated with MMGCHyperAlloc() or MMR3HyperAlloc().
- *
- * @returns GC address.
- * @param   pVM         The VM to operate on.
- * @param   HCPtr       The host context address.
- *                      You'll be damed if this is not in the hypervisor region! :-)
- * @deprecated
- */
-MMDECL(RTRCPTR) MMHyperHC2GC(PVM pVM, RTHCPTR HCPtr)
-{
-    PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((char*)CTXSUFF(pVM->mm.s.pHyperHeap) + pVM->mm.s.offLookupHyper);
-    for (;;)
-    {
-        switch (pLookup->enmType)
-        {
-            case MMLOOKUPHYPERTYPE_LOCKED:
-            {
-                unsigned    off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)pLookup->u.Locked.pvHC;
-                if (off < pLookup->cb)
-                    return (RTRCPTR)((RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC + pLookup->off + off);
-                break;
-            }
-
-            case MMLOOKUPHYPERTYPE_HCPHYS:
-            {
-                unsigned    off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)pLookup->u.HCPhys.pvHC;
-                if (off < pLookup->cb)
-                    return (RTRCPTR)((RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC + pLookup->off + off);
-                break;
-            }
-
-            case MMLOOKUPHYPERTYPE_GCPHYS:  /* (for now we'll not allow these kind of conversions) */
-            case MMLOOKUPHYPERTYPE_MMIO2:
-            case MMLOOKUPHYPERTYPE_DYNAMIC:
-                break;
-
-            default:
-                AssertMsgFailed(("enmType=%d\n", pLookup->enmType));
-                break;
-        }
-
-        /* next */
-        if ((unsigned)pLookup->offNext == NIL_OFFSET)
-            break;
-        pLookup = (PMMLOOKUPHYPER)((char *)pLookup + pLookup->offNext);
-    }
-
-    AssertMsgFailed(("HCPtr=%p is not inside the hypervisor memory area!\n", HCPtr));
-    return NIL_RTRCPTR;
-}
-
-
-/**
- * Converts a RC address in the Hypervisor memory region to a HC address.
- * The memory must have been allocated with MMHyperAlloc().
- *
- * @returns HC address.
- * @param   pVM         The VM to operate on.
- * @param   RCPtr       The raw-mode context address.
- *                      You'll be damed if this is not in the hypervisor region! :-)
- * @deprecated
- */
-MMDECL(RTHCPTR) MMHyperRC2HC(PVM pVM, RTRCPTR RCPtr)
-{
-    unsigned        offRC = (RTRCUINTPTR)RCPtr - (RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC;
-    PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((char*)CTXSUFF(pVM->mm.s.pHyperHeap) + pVM->mm.s.offLookupHyper);
-    for (;;)
-    {
-        unsigned off = offRC - pLookup->off;
-        if (off < pLookup->cb)
-        {
-            switch (pLookup->enmType)
-            {
-                case MMLOOKUPHYPERTYPE_LOCKED:
-                    return (RTHCPTR)((RTHCUINTPTR)pLookup->u.Locked.pvHC + off);
-                case MMLOOKUPHYPERTYPE_HCPHYS:
-                    return (RTHCPTR)((RTHCUINTPTR)pLookup->u.HCPhys.pvHC + off);
-                default:
-                    break;
-            }
-            AssertMsgFailed(("enmType=%d\n", pLookup->enmType));
-            return (RTHCPTR)0;
-        }
-
-        /* next */
-        if ((unsigned)pLookup->offNext == NIL_OFFSET)
-            break;
-        pLookup = (PMMLOOKUPHYPER)((char *)pLookup + pLookup->offNext);
-    }
-
-    AssertMsgFailed(("RCPtr=%p is not inside the hypervisor memory area!\n", RCPtr));
-    return (RTHCPTR)0;
-}
-