Changeset 13827

Timestamp:

11/05/08 02:31:18 (2 months ago)

Author:

vboxsync

Message:

MM: Retired MMHyper2HC, MMHyperHC2GC and MMHyperGC2HC.

Files:

• trunk/include/VBox/mm.h (modified) (1 diff)
• trunk/src/VBox/VMM/CPUM.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/CPUMStack.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/DBGFDisas.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/PATM/CSAM.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/PATM/PATM.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/SELM.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/testcase/tstMicro.cpp (modified) (1 diff)

trunk/include/VBox/mm.h

@@ -277 +277 @@
-}
-#endif
-
-
-#ifdef IN_GC
-VMMDECL(RTHCPTR)    MMHyper2HC(PVM pVM, uintptr_t Ptr);
-#else
-DECLINLINE(RTHCPTR) MMHyper2HC(PVM pVM, uintptr_t Ptr)
-{
-    NOREF(pVM);
-    return (RTHCPTR)Ptr;
-}
-#endif
-
-#define MMHyperHC2GC(pVM, R3Ptr) MMHyperR3ToRC((pVM), (R3Ptr)) /**< @deprecated */
-#define MMHyperGC2HC(pVM, RCPtr) MMHyperRCToR3((pVM), (RCPtr)) /**< @deprecated */
-
-

trunk/src/VBox/VMM/CPUM.cpp

@@ -2081 +2081 @@
-    /** The size of the segment minus 1. */
-    RTGCUINTPTR     cbSegLimit;
-HC
-HC
+R3
+R3
-    /** Pointer to the current page - GC Ptr. */
-    RTGCPTR         pvPageGC;
@@ -2115 +2115 @@
-
-        /* Need to update the page translation? */
-HC
+R3
-            ||  (GCPtr >> PAGE_SHIFT) != (pState->pvPageGC >> PAGE_SHIFT))
-        {
@@ -2122 +2122 @@
-            /* translate the address */
-            pState->pvPageGC = GCPtr & PAGE_BASE_GC_MASK;
-
+ /** @todo r=bird: Don't do this if we're in VT-x/AMD-V mode. */
-            {
-HC = MMHyperGC2HC(pState->pVM, 
-HC
+R3 = MMHyperRCToR3(pState->pVM, (RTRCPTR)
+R3
-                    rc = VERR_INVALID_POINTER;
-            }
@@ -2133 +2133 @@
-                if (pState->fLocked)
-                    PGMPhysReleasePageMappingLock(pState->pVM, &pState->PageMapLock);
-HC
+R3
-                pState->fLocked = RT_SUCCESS_NP(rc);
-            }
-            if (VBOX_FAILURE(rc))
-            {
-HC
+R3
-                return rc;
-            }
@@ -2159 +2159 @@
-
-        /* read and advance */
-HC
+R3
-        cbRead -= cb;
-        if (!cbRead)
@@ -2188 +2188 @@
-    State.pCpu            = pCpu;
-    State.pvPageGC        = 0;
-HC
+R3
-    State.pVM             = pVM;
-    State.fLocked         = false;

trunk/src/VBox/VMM/CPUMStack.cpp

@@ -39 +39 @@
-    /* ASSUME always on flat stack within hypervisor memory for now */
-    pVM->cpum.s.Hyper.esp -= sizeof(u32);
-GC2HC(pVM, (RTG
+RCToR3(pVM, (RTR
-}
-

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -62 +62 @@
-    /** The guest paging mode. */
-    PGMMODE         enmMode;
-HC
-HC
+R3
+R3
-    /** Pointer to the current page - GC Ptr. */
-    RTGCPTR         pvPageGC;
@@ -101 +101 @@
-    pState->enmMode         = enmMode;
-    pState->pvPageGC        = 0;
-HC
+R3
-    pState->pVM             = pVM;
-    pState->fLocked         = false;
@@ -189 +189 @@
-
-        /* Need to update the page translation? */
-HC
+R3
-            ||  (GCPtr >> PAGE_SHIFT) != (pState->pvPageGC >> PAGE_SHIFT))
-        {
@@ -198 +198 @@
-            if (MMHyperIsInsideArea(pState->pVM, pState->pvPageGC))
-            {
-HC = MMHyperGC2HC(pState->pVM, 
-HC
+R3 = MMHyperRCToR3(pState->pVM, (RTRCPTR)
+R3
-                    rc = VERR_INVALID_POINTER;
-            }
@@ -208 +208 @@
-
-                if (pState->enmMode <= PGMMODE_PROTECTED)
-HC
+R3
-                else
-HC
+R3
-                pState->fLocked = RT_SUCCESS_NP(rc);
-            }
-            if (RT_FAILURE(rc))
-            {
-HC
+R3
-                return rc;
-            }
@@ -236 +236 @@
-
-        /* read and advance */
-HC
+R3
-        cbRead -= cb;
-        if (!cbRead)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -120 +120 @@
-    rc = MMR3HyperAllocOnceNoRel(pVM, CSAM_PGDIRBMP_CHUNKS*sizeof(RTRCPTR), 0, MM_TAG_CSAM, (void **)&pVM->csam.s.pPDGCBitmapHC);
-    AssertRCReturn(rc, rc);
-HC2G
-HC2G
+R3ToR
+R3ToR
-
-    rc = csamReinit(pVM);
@@ -260 +260 @@
-    {
-        /* Adjust pgdir and page bitmap pointers. */
-HC2G
-HC2G
+R3ToR
+R3ToR
-
-        for(int i=0;i<CSAM_PGDIRBMP_CHUNKS;i++)
@@ -493 +493 @@
-            }
-            /* Convert to GC pointer. */
-HC2G
+R3ToR
-            Assert(pVM->csam.s.pPDGCBitmapHC[i]);
-

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -125 +125 @@
-        return rc;
-    }
-HC2G
+R3ToR
-
-    /* PATM stack page for call instruction execution. (2 parts: one for our private stack and one to store the original return address */
-    pVM->patm.s.pGCStackHC  = (RTRCPTR *)(pVM->patm.s.pPatchMemHC + PATCH_MEMORY_SIZE + PAGE_SIZE);
-HC2G
+R3ToR
-
-    /*
@@ -140 +140 @@
-    Assert(sizeof(PATMGCSTATE) < PAGE_SIZE);    /** @note hardcoded dependencies on this exist. */
-    pVM->patm.s.pGCStateHC  = (PPATMGCSTATE)((uint8_t *)pVM->patm.s.pGCStackHC + PATM_STACK_TOTAL_SIZE);
-HC2G
+R3ToR
-
-    /* Hypervisor memory for patch statistics */
-    pVM->patm.s.pStatsHC  = (PSTAMRATIOU32)((uint8_t *)pVM->patm.s.pGCStateHC + PAGE_SIZE);
-HC2G
+R3ToR
-
-    /* Memory for patch lookup trees. */
-    rc = MMHyperAlloc(pVM, sizeof(*pVM->patm.s.PatchLookupTreeHC), 0, MM_TAG_PATM, (void **)&pVM->patm.s.PatchLookupTreeHC);
-    AssertRCReturn(rc, rc);
-HC2G
+R3ToR
-
-#ifdef RT_ARCH_AMD64 /* see patmReinit(). */
@@ -341 +341 @@
-
-    Assert(pVM->patm.s.pPatchMemHC);
-HC2G
+R3ToR
-    memset(pVM->patm.s.pPatchMemHC, 0, PATCH_MEMORY_SIZE);
-    AssertReleaseMsg(pVM->patm.s.pPatchMemGC, ("Impossible! MMHyperHC2GC(%p) failed!\n", pVM->patm.s.pPatchMemHC));
@@ -350 +350 @@
-
-    Assert(pVM->patm.s.PatchLookupTreeHC);
-HC2G
+R3ToR
-
-    /*
@@ -412 +412 @@
-VMMR3DECL(void) PATMR3Relocate(PVM pVM)
-{
-HC2G
+R3ToR
-    RTRCINTPTR  delta = GCPtrNew - pVM->patm.s.pGCStateGC;
-
@@ -434 +434 @@
-
-        pVM->patm.s.pGCStateGC  = GCPtrNew;
-HC2G
-
-HC2G
-
-HC2G
-
-HC2G
+R3ToR
+
+R3ToR
+
+R3ToR
+
+R3ToR
-
-        if (pVM->patm.s.pfnSysEnterPatchGC)

trunk/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp

@@ -138 +138 @@
-        }
-#ifdef IN_GC
-GC2HC
+RCToR3
-        if (!pVM->csam.s.pPDHCBitmapGC[pgdir])
-        {
@@ -145 +145 @@
-        }
-#else
-HC2G
+R3ToR
-        if (!pVM->csam.s.pPDGCBitmapHC[pgdir])
-        {

trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp

@@ -128 +128 @@
-            STAM_COUNTER_INC(&pVM->patm.s.StatPatchWriteInterpretedFailed);
-        }
-HC2G
+R3ToR
-
-        /* Increase the invalid write counter for each patch that's registered for that page. */
-        for (uint32_t i=0;i<pPatchPage->cCount;i++)
-        {
-HC2G
+R3ToR
-
-            pPatch->cInvalidWrites++;

trunk/src/VBox/VMM/SELM.cpp

@@ -268 +268 @@
-    {
-        PX86DESC paGdt = pVM->selm.s.paGdtR3;
-HC2G
+R3ToR
-                           X86_PTE_RW | X86_PTE_P | X86_PTE_A | X86_PTE_D);
-        AssertRC(rc);
-HC2G
+R3ToR
-                           X86_PTE_RW | X86_PTE_P | X86_PTE_A | X86_PTE_D);
-        AssertRC(rc);
-GUEST
+RC
-                           X86_PTE_RW | X86_PTE_P | X86_PTE_A | X86_PTE_D);
-        AssertRC(rc);
-GUEST
+RC
-                           X86_PTE_RW | X86_PTE_P | X86_PTE_A | X86_PTE_D);
-        AssertRC(rc);
@@ -399 +399 @@
-     * Update GDTR and selector.
-     */
-HC2G
+R3ToR
-
-    /** @todo selector relocations should be a seperate operation? */

trunk/src/VBox/VMM/testcase/tstMicro.cpp

@@ -161 +161 @@
-     * Find the GDT - This is a HACK :-)
-     */
-GCPTR     G
-GC2HC(pVM, G
+RCPTR     R
+RCToR3(pVM, R
-
-    for (unsigned i = 0; i <= 3; i++)