Changeset 80181 in vbox for trunk/src/VBox/VMM/VMMR3/PGM.cpp

Timestamp:

Aug 7, 2019 10:49:52 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Kicking out raw-mode - Bunch of RCPTRTYPE use in PGM. bugref:9517

File:

• trunk/src/VBox/VMM/VMMR3/PGM.cpp (modified) (9 diffs)

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

@@ -804 +804 @@
         pPGM->pGstAmd64Pml4R0   = NIL_RTR0PTR;
 #endif
-        pPGM->pGst32BitPdRC     = NIL_RTRCPTR;
-        pPGM->pGstPaePdptRC     = NIL_RTRCPTR;
         for (unsigned i = 0; i < RT_ELEMENTS(pVCpu->pgm.s.apGstPaePDsR3); i++)
         {
@@ -812 +810 @@
             pPGM->apGstPaePDsR0[i]             = NIL_RTR0PTR;
 #endif
-            pPGM->apGstPaePDsRC[i]             = NIL_RTRCPTR;
             pPGM->aGCPhysGstPaePDs[i]          = NIL_RTGCPHYS;
             pPGM->aGstPaePdpeRegs[i].u         = UINT64_MAX;
@@ -893 +890 @@
     pVM->pgm.s.pStatsR3 = (PGMSTATS *)pv;
     pVM->pgm.s.pStatsR0 = MMHyperCCToR0(pVM, pv);
-    pVM->pgm.s.pStatsRC = MMHyperCCToRC(pVM, pv);
     pv = (uint8_t *)pv + RT_ALIGN_Z(sizeof(PGMSTATS), 64);
 
@@ -900 +896 @@
         pVM->aCpus[iCpu].pgm.s.pStatsR3 = (PGMCPUSTATS *)pv;
         pVM->aCpus[iCpu].pgm.s.pStatsR0 = MMHyperCCToR0(pVM, pv);
-        pVM->aCpus[iCpu].pgm.s.pStatsRC = MMHyperCCToRC(pVM, pv);
 
         pv = (uint8_t *)pv + RT_ALIGN_Z(sizeof(PGMCPUSTATS), 64);
@@ -939 +934 @@
     rc = MMHyperAlloc(pVM, sizeof(PGMTREES), 0, MM_TAG_PGM, (void **)&pVM->pgm.s.pTreesR3);
     if (RT_SUCCESS(rc))
-    {
         pVM->pgm.s.pTreesR0 = MMHyperR3ToR0(pVM, pVM->pgm.s.pTreesR3);
-        pVM->pgm.s.pTreesRC = MMHyperR3ToRC(pVM, pVM->pgm.s.pTreesR3);
-    }
 
     /*
@@ -1873 +1865 @@
 
     /*
-     * Trees.
-     */
-    pVM->pgm.s.pTreesRC = MMHyperR3ToRC(pVM, pVM->pgm.s.pTreesR3);
-
-    /*
      * Ram ranges.
      */
@@ -1887 +1874 @@
                 pCur->pSelfRC = MMHyperCCToRC(pVM, pCur);
         pgmR3PhysRelinkRamRanges(pVM);
-
-        /* Flush the RC TLB. */
-        for (unsigned i = 0; i < PGM_RAMRANGE_TLB_ENTRIES; i++)
-            pVM->pgm.s.apRamRangesTlbRC[i] = NIL_RTRCPTR;
     }
 
@@ -1957 +1940 @@
     PGMRELOCHANDLERARGS Args = { offDelta, pVM };
     RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesR3->PhysHandlers,     true, pgmR3RelocatePhysHandler,      &Args);
-    pVM->pgm.s.pLastPhysHandlerRC = NIL_RTRCPTR;
 
     PPGMPHYSHANDLERTYPEINT pCurPhysType;
@@ -1972 +1954 @@
      */
     pgmR3PoolRelocate(pVM);
-
-#ifdef VBOX_WITH_STATISTICS
-    /*
-     * Statistics.
-     */
-    pVM->pgm.s.pStatsRC = MMHyperCCToRC(pVM, pVM->pgm.s.pStatsR3);
-    for (VMCPUID iCpu = 0; iCpu < pVM->cCpus; iCpu++)
-        pVM->aCpus[iCpu].pgm.s.pStatsRC = MMHyperCCToRC(pVM, pVM->aCpus[iCpu].pgm.s.pStatsR3);
-#endif
 }