Changeset 18665 in vbox

Timestamp:

Apr 2, 2009 7:44:18 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45592

Message:

VMM: Clean out the VBOX_WITH_NEW_PHYS_CODE #ifdefs. (part 1)

Location:

trunk/src/VBox/VMM

Files:

• MM.cpp (modified) (4 diffs)
• MMInternal.h (modified) (3 diffs)
• MMPhys.cpp (deleted)
• Makefile.kmk (modified) (1 diff)
• PDMDevHlp.cpp (modified) (10 diffs)
• PGM.cpp (modified) (23 diffs)
• PGMDbg.cpp (modified) (3 diffs)
• PGMHandler.cpp (modified) (3 diffs)
• PGMInternal.h (modified) (33 diffs)
• PGMPhys.cpp (modified) (30 diffs)
• VMM.cpp (modified) (2 diffs)
• VMMInternal.h (modified) (1 diff)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/MM.cpp ¶

@@ -412 +412 @@
      * Setup the base ram (PGM).
      */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     if (cbRam > offRamHole)
     {
@@ -427 +426 @@
         return VM_SET_ERROR(pVM, VERR_NOT_IMPLEMENTED, "TODO: RamPreAlloc");
     }
-#else
-    rc = PGMR3PhysRegisterRam(pVM, 0, cbRam, "Base RAM");
-    if (RT_SUCCESS(rc))
-    {
-        /*
-         * Allocate the first chunk, as we'll map ROM ranges there.
-         * If requested, allocated the rest too.
-         */
-        RTGCPHYS GCPhys = (RTGCPHYS)0;
-        rc = PGM3PhysGrowRange(pVM, &GCPhys);
-        if (RT_SUCCESS(rc) && fPreAlloc)
-            for (GCPhys = PGM_DYNAMIC_CHUNK_SIZE;
-                 GCPhys < cbRam && RT_SUCCESS(rc);
-                 GCPhys += PGM_DYNAMIC_CHUNK_SIZE)
-                rc = PGM3PhysGrowRange(pVM, &GCPhys);
-    }
-#endif
-
-#ifdef VBOX_WITH_NEW_PHYS_CODE
+
     /*
      * Enabled mmR3UpdateReservation here since we don't want the
@@ -452 +433 @@
     pVM->mm.s.fDoneMMR3InitPaging = true;
     AssertMsg(pVM->mm.s.cBasePages == cBasePages || RT_FAILURE(rc), ("%RX64 != %RX64\n", pVM->mm.s.cBasePages, cBasePages));
-#endif
 
     LogFlow(("MMR3InitPaging: returns %Rrc\n", rc));
@@ -536 +516 @@
  * Reset notification.
  *
- * MM will reload shadow ROMs into RAM at this point and make
- * the ROM writable.
- *
  * @param   pVM             The VM handle.
  */
 VMMR3DECL(void) MMR3Reset(PVM pVM)
 {
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    mmR3PhysRomReset(pVM);
-#endif
+    /* nothing to do anylonger. */
 }
 

trunk/src/VBox/VMM/MMInternal.h ¶

@@ -565 +565 @@
 
 
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-/**
- * A registered Rom range.
- *
- * This is used to track ROM registrations both for debug reasons
- * and for resetting shadow ROM at reset.
- *
- * This is allocated of the MMR3Heap and thus only accessibel from ring-3.
- */
-typedef struct MMROMRANGE
-{
-    /** Pointer to the next */
-    struct MMROMRANGE      *pNext;
-    /** Address of the range. */
-    RTGCPHYS                GCPhys;
-    /** Size of the range. */
-    uint32_t                cbRange;
-    /** Shadow ROM? */
-    bool                    fShadow;
-    /** Is the shadow ROM currently wriable? */
-    bool                    fWritable;
-    /** The address of the virgin ROM image for shadow ROM. */
-    const void             *pvBinary;
-    /** The address of the guest RAM that's shadowing the ROM. (lazy bird) */
-    void                   *pvCopy;
-    /** The ROM description. */
-    const char             *pszDesc;
-} MMROMRANGE;
-/** Pointer to a ROM range. */
-typedef MMROMRANGE *PMMROMRANGE;
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
-
-
 /**
  * Hypervisor memory mapping type.
@@ -771 +738 @@
     /** Padding. */
     uint32_t                    u32Padding0;
-
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    /** The head of the ROM ranges. */
-    R3PTRTYPE(PMMROMRANGE)      pRomHead;
-#endif
 } MM;
 /** Pointer to MM Data (part of VM). */
@@ -811 +773 @@
 
 const char *mmR3GetTagName(MMTAG enmTag);
-
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-void mmR3PhysRomReset(PVM pVM);
-#endif
 
 /**

trunk/src/VBox/VMM/Makefile.kmk ¶

@@ -71 +71 @@
         MMHyper.cpp \
         MMPagePool.cpp \
-        MMPhys.cpp \
         PDM.cpp \
         PDMDevice.cpp \

trunk/src/VBox/VMM/PDMDevHlp.cpp ¶

@@ -354 +354 @@
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvBinary, fFlags, pszDesc, pszDesc));
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     int rc = PGMR3PhysRomRegister(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange, pvBinary, fFlags, pszDesc);
-#else
-    int rc = MMR3PhysRomRegister(pDevIns->Internal.s.pVMR3, pDevIns, GCPhysStart, cbRange, pvBinary,
-                                 !!(fFlags & PGMPHYS_ROM_FLAGS_SHADOWED), pszDesc);
-#endif
 
     LogFlow(("pdmR3DevHlp_ROMRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
@@ -2039 +2034 @@
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhys, pvBuf, cbRead));
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
     if (!VM_IS_EMT(pVM)) /** @todo not true for SMP. oh joy! */
@@ -2054 +2048 @@
     else
         rc = PGMR3PhysReadExternal(pVM, GCPhys, pvBuf, cbRead);
-#else
-    PGMPhysRead(pVM, GCPhys, pvBuf, cbRead);
-    int rc = VINF_SUCCESS;
-#endif
+
     Log(("pdmR3DevHlp_PhysRead: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
     return rc;
@@ -2071 +2062 @@
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhys, pvBuf, cbWrite));
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
     if (!VM_IS_EMT(pVM)) /** @todo not true for SMP. oh joy! */
@@ -2086 +2076 @@
     else
         rc = PGMR3PhysWriteExternal(pVM, GCPhys, pvBuf, cbWrite);
-#else
-    PGMPhysWrite(pVM, GCPhys, pvBuf, cbWrite);
-    int rc = VINF_SUCCESS;
-#endif
+
     Log(("pdmR3DevHlp_PhysWrite: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
     return rc;
@@ -2104 +2091 @@
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
     if (!VM_IS_EMT(pVM)) /** @todo not true for SMP. oh joy! */
@@ -2113 +2099 @@
     }
 #endif
-#endif
 
     int rc = PGMR3PhysGCPhys2CCPtrExternal(pVM, GCPhys, ppv, pLock);
@@ -2131 +2116 @@
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
     if (!VM_IS_EMT(pVM)) /** @todo not true for SMP. oh joy! */
@@ -2139 +2123 @@
         AssertMsg(cLocks == 0, ("cLocks=%u %s\n", cLocks, szNames));
     }
-#endif
 #endif
 
@@ -2557 +2540 @@
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhysStart, cbRange, enmProt));
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     int rc = PGMR3PhysRomProtect(pDevIns->Internal.s.pVMR3, GCPhysStart, cbRange, enmProt);
-#else
-    int rc = MMR3PhysRomProtect(pDevIns->Internal.s.pVMR3, GCPhysStart, cbRange);
-#endif
 
     LogFlow(("pdmR3DevHlp_ROMProtectShadow: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));

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

@@ -610 +610 @@
 *******************************************************************************/
 /** Saved state data unit version. */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
-# define PGM_SAVED_STATE_VERSION                7
-#else
-# define PGM_SAVED_STATE_VERSION                6
-#endif
+#define PGM_SAVED_STATE_VERSION                 7
 /** Saved state data unit version. */
 #define PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE   6
@@ -1229 +1225 @@
     rc = CFGMR3QueryU64(CFGMR3GetRoot(pVM), "RamSize", &cbRam);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        cbRam = pVM->pgm.s.cbRamSize = 0;
+        cbRam = 0;
     else if (RT_SUCCESS(rc))
     {
@@ -1235 +1231 @@
             cbRam = 0;
         cbRam = RT_ALIGN_64(cbRam, PAGE_SIZE);
-        pVM->pgm.s.cbRamSize = (RTUINT)cbRam; /* pointless legacy, remove after enabling the new phys code. */
     }
     else
@@ -1268 +1263 @@
     PGMPhysInvalidatePageGCMapTLB(pVM);
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     /*
      * For the time being we sport a full set of handy pages in addition to the base
      * memory to simplify things.
      */
-    rc = MMR3ReserveHandyPages(pVM, RT_ELEMENTS(pVM->pgm.s.aHandyPages));
+    rc = MMR3ReserveHandyPages(pVM, RT_ELEMENTS(pVM->pgm.s.aHandyPages)); /** @todo this should be changed to PGM_HANDY_PAGES_MIN but this needs proper testing... */
     AssertRCReturn(rc, rc);
-#endif
 
     /*
@@ -1579 +1572 @@
     STAM_REG(pVM, &pPGM->StatR3GuestPDWrite,                STAMTYPE_COUNTER, "/PGM/R3/PDWrite",                    STAMUNIT_OCCURENCES,     "The total number of times pgmHCGuestPDWriteHandler() was called.");
     STAM_REG(pVM, &pPGM->StatR3GuestPDWriteConflict,        STAMTYPE_COUNTER, "/PGM/R3/PDWriteConflict",            STAMUNIT_OCCURENCES,     "The number of times pgmHCGuestPDWriteHandler() detected a conflict.");
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    STAM_REG(pVM, &pPGM->StatR3DynRamTotal,                 STAMTYPE_COUNTER, "/PGM/DynAlloc/TotalAlloc",           STAMUNIT_MEGABYTES,      "Allocated MBs of guest ram.");
-    STAM_REG(pVM, &pPGM->StatR3DynRamGrow,                  STAMTYPE_COUNTER, "/PGM/DynAlloc/Grow",                 STAMUNIT_OCCURENCES,     "Nr of pgmr3PhysGrowRange calls.");
-#endif
 
     /* R0 only: */
@@ -2101 +2090 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_NEW_PHYS_CODE
         /*
          * Reset (zero) shadow ROM pages.
          */
         rc = pgmR3PhysRomReset(pVM);
-#endif
         if (RT_SUCCESS(rc))
         {
@@ -2163 +2150 @@
 }
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 
 /**
@@ -2256 +2242 @@
     SSMFIELD_ENTRY_TERM()
 };
-#endif /* VBOX_WITH_NEW_PHYS_CODE */
 
 
@@ -2274 +2259 @@
      * Lock PGM and set the no-more-writes indicator.
      */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     pgmLock(pVM);
-#endif
     pVM->pgm.s.fNoMorePhysWrites = true;
 
@@ -2282 +2265 @@
      * Save basic data (required / unaffected by relocation).
      */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     SSMR3PutStruct(pSSM, pPGM, &s_aPGMFields[0]);
-#else
-    SSMR3PutBool(  pSSM, pPGM->fMappingsFixed);
-    SSMR3PutGCPtr( pSSM, pPGM->GCPtrMappingFixed);
-    SSMR3PutU32(   pSSM, pPGM->cbMappingFixed);
-    SSMR3PutUInt(  pSSM, pPGM->cbRamSize);
-    SSMR3PutGCPhys(pSSM, pPGM->GCPhysA20Mask);
-    SSMR3PutUInt(  pSSM, pPGM->fA20Enabled);
-    SSMR3PutUInt(  pSSM, pPGM->fSyncFlags);
-    SSMR3PutUInt(  pSSM, pPGM->enmGuestMode);
-    SSMR3PutU32(   pSSM, ~0);      /* Separator. */
-#endif
 
     /*
@@ -2323 +2294 @@
         SSMR3PutGCPhys(pSSM,    pRam->cb);
         SSMR3PutU8(pSSM,        !!pRam->pvR3);      /* Boolean indicating memory or not. */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
         SSMR3PutStrZ(pSSM,      pRam->pszDesc);     /* This is the best unique id we have... */
 
@@ -2354 +2324 @@
         if (RT_FAILURE(rc))
             break;
-
-#else  /* !VBOX_WITH_NEW_PHYS_CODE */
-        /* Flags. */
-        const unsigned cPages = pRam->cb >> PAGE_SHIFT;
-        for (unsigned iPage = 0; iPage < cPages; iPage++)
-            SSMR3PutU16(pSSM, (uint16_t)(pRam->aPages[iPage].HCPhys & ~X86_PTE_PAE_PG_MASK)); /** @todo PAGE FLAGS */
-
-        /* Any memory associated with the range. */
-        if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-        {
-            for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
-            {
-                if (pRam->paChunkR3Ptrs[iChunk])
-                {
-                    SSMR3PutU8(pSSM, 1);    /* chunk present */
-                    SSMR3PutMem(pSSM, (void *)pRam->paChunkR3Ptrs[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
-                }
-                else
-                    SSMR3PutU8(pSSM, 0);    /* no chunk present */
-            }
-        }
-        else if (pRam->pvR3)
-        {
-            rc = SSMR3PutMem(pSSM, pRam->pvR3, pRam->cb);
-            if (RT_FAILURE(rc))
-            {
-                Log(("pgmR3Save: SSMR3PutMem(, %p, %#x) -> %Rrc\n", pRam->pvR3, pRam->cb, rc));
-                return rc;
-            }
-        }
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
-    }
-
-#ifdef VBOX_WITH_NEW_PHYS_CODE
+    }
+
     pgmUnlock(pVM);
-#endif
     return SSMR3PutU32(pSSM, ~0); /* terminator. */
 }
 
-
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 
 /**
@@ -2552 +2487 @@
 }
 
-#endif  /* VBOX_WITH_NEW_PHYS_CODE */
 
 /**
@@ -2572 +2506 @@
      * Load basic data (required / unaffected by relocation).
      */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     if (u32Version >= PGM_SAVED_STATE_VERSION)
     {
@@ -2579 +2512 @@
     }
     else
-#endif
     {
         SSMR3GetBool(pSSM,      &pPGM->fMappingsFixed);
@@ -2585 +2517 @@
         SSMR3GetU32(pSSM,       &pPGM->cbMappingFixed);
 
-        RTUINT cbRamSize;
-        rc = SSMR3GetU32(pSSM, &cbRamSize);
+        uint32_t cbRamSizeIgnored;
+        rc = SSMR3GetU32(pSSM, &cbRamSizeIgnored);
         if (RT_FAILURE(rc))
             return rc;
-        AssertLogRelMsgReturn(cbRamSize == pPGM->cbRamSize, ("%#x != %#x\n", cbRamSize, pPGM->cbRamSize),
-                              VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH);
         SSMR3GetGCPhys(pSSM,    &pPGM->GCPhysA20Mask);
 
@@ -2701 +2631 @@
         char szDesc[256];
         szDesc[0] = '\0';
-#ifdef VBOX_WITH_NEW_PHYS_CODE
         if (u32Version >= PGM_SAVED_STATE_VERSION)
         {
@@ -2708 +2637 @@
                 return rc;
         }
-#endif
 
         /*
@@ -2720 +2648 @@
                  || GCPhysLast != pRam->GCPhysLast
                  || cb         != pRam->cb
-#ifdef VBOX_WITH_NEW_PHYS_CODE
-                 ||  (szDesc[0] && strcmp(szDesc, pRam->pszDesc))
-#else
-                 ||  fHaveBits  != !!pRam->pvR3
-#endif
-                 )
-#ifdef VBOX_WITH_NEW_PHYS_CODE
+                 ||  (szDesc[0] && strcmp(szDesc, pRam->pszDesc)) )
                 /* Hack for PDMDevHlpPhysReserve(pDevIns, 0xfff80000, 0x80000, "High ROM Region"); */
             &&  (   u32Version != PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE
@@ -2734 +2656 @@
                  || pRam->GCPhys     <  GCPhys
                  || !fHaveBits)
-#endif
            )
         {
@@ -2749 +2670 @@
                 AssertFailedReturn(VERR_SSM_LOAD_CONFIG_MISMATCH);
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
-            if (u32Version > PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE)
-                AssertMsgFailed(("debug skipping not implemented, sorry\n"));
-            else
-#else
-            {
-                RTGCPHYS cPages = ((GCPhysLast - GCPhys) + 1) >> PAGE_SHIFT;
-                while (cPages-- > 0)
-                {
-                    uint16_t u16Ignore;
-                    SSMR3GetU16(pSSM, &u16Ignore);
-                }
-            }
-#endif
+            AssertMsgFailed(("debug skipping not implemented, sorry\n"));
             continue;
         }
 
         uint32_t cPages = (GCPhysLast - GCPhys + 1) >> PAGE_SHIFT;
-
-#ifdef VBOX_WITH_NEW_PHYS_CODE
         if (u32Version >= PGM_SAVED_STATE_VERSION)
         {
@@ -2902 +2808 @@
             }
         }
-
-#else  /* !VBOX_WITH_NEW_PHYS_CODE */
-        /* Flags. */
-        for (uint32_t iPage = 0; iPage < cPages; iPage++)
-        {
-            uint16_t    u16 = 0;
-            SSMR3GetU16(pSSM, &u16);
-            u16 &= PAGE_OFFSET_MASK & ~(  RT_BIT(4) | RT_BIT(5) | RT_BIT(6)
-                                        | RT_BIT(7) | RT_BIT(8) | RT_BIT(9) | RT_BIT(10) );
-                   // &= MM_RAM_FLAGS_DYNAMIC_ALLOC | MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO | MM_RAM_FLAGS_MMIO2
-            pRam->aPages[iPage].HCPhys = PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]) | (RTHCPHYS)u16; /** @todo PAGE FLAGS */
-        }
-
-        /* any memory associated with the range. */
-        if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-        {
-            for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
-            {
-                uint8_t fValidChunk;
-
-                rc = SSMR3GetU8(pSSM, &fValidChunk);
-                if (RT_FAILURE(rc))
-                    return rc;
-                if (fValidChunk > 1)
-                    return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
-
-                if (fValidChunk)
-                {
-                    if (!pRam->paChunkR3Ptrs[iChunk])
-                    {
-                        rc = pgmr3PhysGrowRange(pVM, pRam->GCPhys + iChunk * PGM_DYNAMIC_CHUNK_SIZE);
-                        if (RT_FAILURE(rc))
-                            return rc;
-                    }
-                    Assert(pRam->paChunkR3Ptrs[iChunk]);
-
-                    SSMR3GetMem(pSSM, (void *)pRam->paChunkR3Ptrs[iChunk], PGM_DYNAMIC_CHUNK_SIZE);
-                }
-                /* else nothing to do */
-            }
-        }
-        else if (pRam->pvR3)
-        {
-            rc = SSMR3GetMem(pSSM, pRam->pvR3, pRam->cb);
-            if (RT_FAILURE(rc))
-            {
-                Log(("pgmR3Save: SSMR3GetMem(, %p, %#x) -> %Rrc\n", pRam->pvR3, pRam->cb, rc));
-                return rc;
-            }
-        }
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
     }
 
@@ -2976 +2831 @@
      */
     if (    u32Version != PGM_SAVED_STATE_VERSION
-#ifdef VBOX_WITH_NEW_PHYS_CODE
-        &&  u32Version != PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE
-#endif
-       )
+        &&  u32Version != PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE)
     {
         AssertMsgFailed(("pgmR3Load: Invalid version u32Version=%d (current %d)!\n", u32Version, PGM_SAVED_STATE_VERSION));

trunk/src/VBox/VMM/PGMDbg.cpp ¶

@@ -55 +55 @@
 VMMR3DECL(int) PGMR3DbgR3Ptr2GCPhys(PVM pVM, RTR3PTR R3Ptr, PRTGCPHYS pGCPhys)
 {
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     *pGCPhys = NIL_RTGCPHYS;
     return VERR_NOT_IMPLEMENTED;
-
-#else
-    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
-         pRam;
-         pRam = pRam->CTX_SUFF(pNext))
-    {
-        if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-        {
-            for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
-            {
-                if (pRam->paChunkR3Ptrs[iChunk])
-                {
-                    RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - pRam->paChunkR3Ptrs[iChunk];
-                    if (off < PGM_DYNAMIC_CHUNK_SIZE)
-                    {
-                        *pGCPhys = pRam->GCPhys + iChunk*PGM_DYNAMIC_CHUNK_SIZE + off;
-                        return VINF_SUCCESS;
-                    }
-                }
-            }
-        }
-        else if (pRam->pvR3)
-        {
-            RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pRam->pvR3;
-            if (off < pRam->cb)
-            {
-                *pGCPhys = pRam->GCPhys + off;
-                return VINF_SUCCESS;
-            }
-        }
-    }
-    return VERR_INVALID_POINTER;
-#endif
 }
 
@@ -110 +76 @@
 VMMR3DECL(int) PGMR3DbgR3Ptr2HCPhys(PVM pVM, RTR3PTR R3Ptr, PRTHCPHYS pHCPhys)
 {
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     *pHCPhys = NIL_RTHCPHYS;
     return VERR_NOT_IMPLEMENTED;
-
-#else
-    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
-         pRam;
-         pRam = pRam->CTX_SUFF(pNext))
-    {
-        if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-        {
-            for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
-            {
-                if (pRam->paChunkR3Ptrs[iChunk])
-                {
-                    RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - pRam->paChunkR3Ptrs[iChunk];
-                    if (off < PGM_DYNAMIC_CHUNK_SIZE)
-                    {
-                        PPGMPAGE pPage = &pRam->aPages[off >> PAGE_SHIFT];
-                        if (PGM_PAGE_IS_RESERVED(pPage))
-                            return VERR_PGM_PHYS_PAGE_RESERVED;
-                        *pHCPhys = PGM_PAGE_GET_HCPHYS(pPage)
-                                 | (off & PAGE_OFFSET_MASK);
-                        return VINF_SUCCESS;
-                    }
-                }
-            }
-        }
-        else if (pRam->pvR3)
-        {
-            RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pRam->pvR3;
-            if (off < pRam->cb)
-            {
-                PPGMPAGE pPage = &pRam->aPages[off >> PAGE_SHIFT];
-                if (PGM_PAGE_IS_RESERVED(pPage))
-                    return VERR_PGM_PHYS_PAGE_RESERVED;
-                *pHCPhys = PGM_PAGE_GET_HCPHYS(pPage)
-                         | (off & PAGE_OFFSET_MASK);
-                return VINF_SUCCESS;
-            }
-        }
-    }
-    return VERR_INVALID_POINTER;
-#endif
 }
 
@@ -582 +506 @@
             {
                 PPGMPAGE pPage = &pRam->aPages[iPage];
-#ifdef VBOX_WITH_NEW_PHYS_CODE
                 if (    !PGM_PAGE_IS_ZERO(pPage)
                     &&  !PGM_PAGE_IS_MMIO(pPage))
-#else
-                if (    /** @todo !PGM_PAGE_IS_ZERO(pPage)
-                    &&*/  !PGM_PAGE_IS_MMIO(pPage))
-#endif
                 {
                     void const *pvPage;

trunk/src/VBox/VMM/PGMHandler.cpp ¶

@@ -99 +99 @@
     if (!pszModR0)
         pszModR0 = VMMR0_MAIN_MODULE_NAME;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     AssertPtrReturn(pfnHandlerR3, VERR_INVALID_POINTER);
     AssertPtrReturn(pszHandlerR0, VERR_INVALID_POINTER);
     AssertPtrReturn(pszHandlerRC, VERR_INVALID_POINTER);
-#endif
 
     /*
@@ -110 +108 @@
     R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0 = NIL_RTR0PTR;
     int rc = VINF_SUCCESS;
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-  if (pszHandlerR0)
-#endif
     rc = PDMR3LdrGetSymbolR0Lazy(pVM, pszModR0, pszHandlerR0, &pfnHandlerR0);
     if (RT_SUCCESS(rc))
@@ -120 +115 @@
          */
         RTRCPTR pfnHandlerRC = NIL_RTRCPTR;
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-      if (pszHandlerRC)
-#endif
         rc = PDMR3LdrGetSymbolRCLazy(pVM, pszModRC, pszHandlerRC, &pfnHandlerRC);
-
         if (RT_SUCCESS(rc))
             return PGMHandlerPhysicalRegisterEx(pVM, enmType, GCPhys, GCPhysLast, pfnHandlerR3, pvUserR3,

trunk/src/VBox/VMM/PGMInternal.h ¶

@@ -143 +143 @@
 #endif
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 /** @def VBOX_WITH_NEW_LAZY_PAGE_ALLOC
  * Enables the experimental lazy page allocation code. */
 /*# define VBOX_WITH_NEW_LAZY_PAGE_ALLOC */
-#endif
+
 /** @} */
 
@@ -587 +586 @@
 {
     /** The physical address and a whole lot of other stuff. All bits are used! */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     RTHCPHYS    HCPhysX;
-#else
-    RTHCPHYS    HCPhys;
-#define HCPhysX HCPhys /**< Temporary while in the process of eliminating direct access to PGMPAGE::HCPhys. */
-#endif
     /** The page state. */
     uint32_t    u2StateX : 2;
@@ -655 +649 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
-# define PGM_PAGE_INIT_ZERO(pPage, pVM, _uType)  \
+#define PGM_PAGE_INIT_ZERO(pPage, pVM, _uType)  \
     PGM_PAGE_INIT(pPage, (pVM)->pgm.s.HCPhysZeroPg, NIL_GMM_PAGEID, (_uType), PGM_PAGE_STATE_ZERO)
-#else
-# define PGM_PAGE_INIT_ZERO(pPage, pVM, _uType)  \
-    PGM_PAGE_INIT(pPage, 0, NIL_GMM_PAGEID, (_uType), PGM_PAGE_STATE_ZERO)
-#endif
 /** Temporary hack. Replaced by PGM_PAGE_INIT_ZERO once the old code is kicked out. */
 # define PGM_PAGE_INIT_ZERO_REAL(pPage, pVM, _uType)  \
@@ -788 +777 @@
  * @param   _enmType    The new page type (PGMPAGETYPE).
  */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #define PGM_PAGE_SET_TYPE(pPage, _enmType) \
     do { (pPage)->u3Type = (_enmType); } while (0)
-#else
-#define PGM_PAGE_SET_TYPE(pPage, _enmType) \
-    do { \
-        (pPage)->u3Type = (_enmType); \
-        if ((_enmType) == PGMPAGETYPE_ROM) \
-            (pPage)->HCPhysX |= MM_RAM_FLAGS_ROM; \
-        else if ((_enmType) == PGMPAGETYPE_ROM_SHADOW) \
-            (pPage)->HCPhysX |= MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO2; \
-        else if ((_enmType) == PGMPAGETYPE_MMIO2) \
-            (pPage)->HCPhysX |= MM_RAM_FLAGS_MMIO2; \
-    } while (0)
-#endif
-
-
-/**
- * Checks if the page is 'reserved'.
- * @returns true/false.
- * @param   pPage       Pointer to the physical guest page tracking structure.
- */
-#define PGM_PAGE_IS_RESERVED(pPage)     ( !!((pPage)->HCPhysX & MM_RAM_FLAGS_RESERVED) )
 
 /**
@@ -817 +785 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
-# define PGM_PAGE_IS_MMIO(pPage)        ( (pPage)->u3Type == PGMPAGETYPE_MMIO )
-#else
-# define PGM_PAGE_IS_MMIO(pPage)        ( !!((pPage)->HCPhysX & MM_RAM_FLAGS_MMIO) )
-#endif
+#define PGM_PAGE_IS_MMIO(pPage)         ( (pPage)->u3Type == PGMPAGETYPE_MMIO )
 
 /**
@@ -835 +799 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#define PGM_PAGE_IS_SHARED(pPage)        ( (pPage)->u2StateX == PGM_PAGE_STATE_SHARED )
+#define PGM_PAGE_IS_SHARED(pPage)       ( (pPage)->u2StateX == PGM_PAGE_STATE_SHARED )
 
 
@@ -1032 +996 @@
     /** Start of the HC mapping of the range. This is only used for MMIO2. */
     R3PTRTYPE(void *)                   pvR3;
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    /** R3 virtual lookup ranges for chunks.
-     * Currently only used with MM_RAM_FLAGS_DYNAMIC_ALLOC ranges.
-     * @remarks This is occationally accessed from ring-0!! (not darwin) */
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    R3PTRTYPE(PRTR3UINTPTR)             paChunkR3Ptrs;
-# else
-    R3R0PTRTYPE(PRTR3UINTPTR)           paChunkR3Ptrs;
-# endif
-#endif
     /** The range description. */
     R3PTRTYPE(const char *)             pszDesc;
@@ -1049 +1003 @@
     RCPTRTYPE(struct PGMRAMRANGE *)     pSelfRC;
     /** Padding to make aPage aligned on sizeof(PGMPAGE). */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     uint32_t                            au32Alignment2[HC_ARCH_BITS == 32 ? 2 : 1];
-#else
-# if HC_ARCH_BITS == 32
-    uint32_t                            u32Alignment2;
-# endif
-#endif
     /** Array of physical guest page tracking structures. */
     PGMPAGE                             aPages[1];
@@ -1068 +1016 @@
 /** @} */
 
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-/** Return hc ptr corresponding to the ram range and physical offset */
-#define PGMRAMRANGE_GETHCPTR(pRam, off) \
-    (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC) ? (RTHCPTR)((pRam)->paChunkR3Ptrs[(off) >> PGM_DYNAMIC_CHUNK_SHIFT] + ((off) & PGM_DYNAMIC_CHUNK_OFFSET_MASK)) \
-                                                : (RTHCPTR)((RTR3UINTPTR)(pRam)->pvR3 + (off));
-#endif
 
 /**
@@ -2388 +2330 @@
     /** RC pointer corresponding to PGM::pRamRangesR3. */
     RCPTRTYPE(PPGMRAMRANGE)         pRamRangesRC;
-    /** The configured RAM size.
-     * @remarks Do NOT use this, it's too small to hold the whole stuff.
-     * @todo    Remove with VBOX_WITH_NEW_PHYS_CODE! */
-    RTUINT                          cbRamSize;
+    RTRCPTR                         alignment4; /**< structure alignment. */
 
     /** Pointer to the list of ROM ranges - for R3.
@@ -2632 +2571 @@
     STAMCOUNTER StatR3GuestPDWrite;                 /**< R3: The total number of times pgmHCGuestPDWriteHandler() was called. */
     STAMCOUNTER StatR3GuestPDWriteConflict;         /**< R3: The number of times GuestPDWriteContlict() detected a conflict. */
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    STAMCOUNTER StatR3DynRamTotal;                  /**< R3: Allocated MBs of guest ram */
-    STAMCOUNTER StatR3DynRamGrow;                   /**< R3: Nr of pgmr3PhysGrowRange calls. */
-#endif
 
     /* R0 only: */
@@ -2909 +2844 @@
 int             pgmR3PhysRamReset(PVM pVM);
 int             pgmR3PhysRomReset(PVM pVM);
-# ifndef VBOX_WITH_NEW_PHYS_CODE
-int             pgmr3PhysGrowRange(PVM pVM, RTGCPHYS GCPhys);
-# endif
 
 int             pgmR3PoolInit(PVM pVM);
@@ -3060 +2992 @@
     }
     *ppPage = &pRam->aPages[off >> PAGE_SHIFT];
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-
-    /*
-     * Make sure it's present.
-     */
-    if (RT_UNLIKELY(    !PGM_PAGE_GET_HCPHYS(*ppPage)
-                    &&  (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)))
-    {
-#ifdef IN_RING3
-        int rc = pgmr3PhysGrowRange(PGM2VM(pPGM), GCPhys);
-#else
-        int rc = CTXALLMID(VMM, CallHost)(PGM2VM(pPGM), VMMCALLHOST_PGM_RAM_GROW_RANGE, GCPhys);
-#endif
-        if (RT_FAILURE(rc))
-        {
-            *ppPage = NULL; /* avoid incorrect and very annoying GCC warnings */
-            return rc;
-        }
-        Assert(rc == VINF_SUCCESS);
-    }
-#endif
     return VINF_SUCCESS;
 }
@@ -3127 +3038 @@
     }
     *ppPage = &pRam->aPages[off >> PAGE_SHIFT];
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-
-    /*
-     * Make sure it's present.
-     */
-    if (RT_UNLIKELY(    !PGM_PAGE_GET_HCPHYS(*ppPage)
-                    &&  (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)))
-    {
-#ifdef IN_RING3
-        int rc = pgmr3PhysGrowRange(PGM2VM(pPGM), GCPhys);
-#else
-        int rc = CTXALLMID(VMM, CallHost)(PGM2VM(pPGM), VMMCALLHOST_PGM_RAM_GROW_RANGE, GCPhys);
-#endif
-        if (RT_FAILURE(rc))
-        {
-            *ppPage = NULL; /* Shut up annoying smart ass. */
-            return rc;
-        }
-        Assert(rc == VINF_SUCCESS);
-    }
-#endif
     return VINF_SUCCESS;
 }
@@ -3218 +3108 @@
     *ppRam = pRam;
     *ppPage = &pRam->aPages[off >> PAGE_SHIFT];
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-
-    /*
-     * Make sure it's present.
-     */
-    if (RT_UNLIKELY(    !PGM_PAGE_GET_HCPHYS(*ppPage)
-                    &&  (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)))
-    {
-#ifdef IN_RING3
-        int rc = pgmr3PhysGrowRange(PGM2VM(pPGM), GCPhys);
-#else
-        int rc = CTXALLMID(VMM, CallHost)(PGM2VM(pPGM), VMMCALLHOST_PGM_RAM_GROW_RANGE, GCPhys);
-#endif
-        if (RT_FAILURE(rc))
-        {
-            *ppPage = NULL; /* Shut up silly GCC warnings. */
-            *ppPage = NULL; /* ditto */
-            return rc;
-        }
-        Assert(rc == VINF_SUCCESS);
-
-    }
-#endif
     return VINF_SUCCESS;
 }
@@ -3408 +3275 @@
 
 #endif /*  VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 || IN_RC */
-
 #ifndef IN_RC
+
 /**
  * Queries the Physical TLB entry for a physical guest page,
@@ -3466 +3333 @@
     return rc;
 }
+
 #endif /* !IN_RC */
-
-
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-/**
- * Convert GC Phys to HC Virt and HC Phys.
- *
- * @returns VBox status.
- * @param   pPGM        PGM handle.
- * @param   GCPhys      The GC physical address.
- * @param   pHCPtr      Where to store the corresponding HC virtual address.
- * @param   pHCPhys     Where to store the HC Physical address and its flags.
- *
- * @deprecated  Will go away or be changed. Only user is MapCR3. MapCR3 will have to do ring-3
- *              and ring-0 locking of the CR3 in a lazy fashion I'm fear... or perhaps not. we'll see.
- *              Either way, we have to make sure the page is writable in MapCR3.
- */
-DECLINLINE(int) pgmRamGCPhys2HCPtrAndHCPhys(PPGM pPGM, RTGCPHYS GCPhys, PRTHCPTR pHCPtr, PRTHCPHYS pHCPhys)
-{
-    PPGMRAMRANGE pRam;
-    PPGMPAGE pPage;
-    int rc = pgmPhysGetPageAndRangeEx(pPGM, GCPhys, &pPage, &pRam);
-    if (RT_FAILURE(rc))
-    {
-        *pHCPtr = 0;    /* Shut up crappy GCC warnings */
-        *pHCPhys = 0;   /* ditto */
-        return rc;
-    }
-    RTGCPHYS off = GCPhys - pRam->GCPhys;
-
-    *pHCPhys = PGM_PAGE_GET_HCPHYS(pPage);
-    if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-    {
-        unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
-#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) /* ASSUMES only MapCR3 usage. */
-        PRTR3UINTPTR paChunkR3Ptrs = (PRTR3UINTPTR)MMHyperR3ToCC(PGM2VM(pPGM), pRam->paChunkR3Ptrs);
-        *pHCPtr = (RTHCPTR)(paChunkR3Ptrs[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
-#else
-        *pHCPtr = (RTHCPTR)(pRam->paChunkR3Ptrs[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
-#endif
-        return VINF_SUCCESS;
-    }
-    if (pRam->pvR3)
-    {
-        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvR3 + off);
-        return VINF_SUCCESS;
-    }
-    *pHCPtr = 0;
-    return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
-}
-#endif /* VBOX_WITH_NEW_PHYS_CODE */
-
 
 /**
@@ -3555 +3372 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef VBOX_WITH_NEW_PHYS_CODE
 # ifdef IN_RING3
     if (!pGuestPD)
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 # endif
 #endif
@@ -3581 +3396 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef VBOX_WITH_NEW_PHYS_CODE
 # ifdef IN_RING3
     if (!pGuestPD)
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 # endif
 #endif
@@ -3606 +3419 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef VBOX_WITH_NEW_PHYS_CODE
 # ifdef IN_RING3
     if (!pGuestPD)
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 # endif
 #endif
@@ -3632 +3443 @@
 #else
     PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
-# ifdef VBOX_WITH_NEW_PHYS_CODE
 # ifdef IN_RING3
     if (!pGuestPDPT)
         pGuestPDPT = pgmGstLazyMapPaePDPT(pPGM);
-# endif
 # endif
 #endif
@@ -3661 +3470 @@
 #else
     PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
-# ifdef VBOX_WITH_NEW_PHYS_CODE
 # ifdef IN_RING3
     if (!pGuestPDPT)
         pGuestPDPT = pgmGstLazyMapPaePDPT(pPGM);
-# endif
 # endif
 #endif
@@ -3689 +3496 @@
     if (pGuestPDPT->a[iPdpt].n.u1Present)
     {
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
         PX86PDPAE   pGuestPD = NULL;
@@ -3701 +3507 @@
 #endif
         return pGuestPD;
-#else  /* !VBOX_WITH_NEW_PHYS_CODE */
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        if ((pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK) == pPGM->aGCPhysGstPaePDs[iPdpt])
-            return pPGM->CTX_SUFF(apGstPaePDs)[iPdpt];
-#endif
-
-        /* cache is out-of-sync. */
-        PX86PDPAE pPD;
-        int rc = PGM_GCPHYS_2_PTR_BY_PGM(pPGM, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, &pPD);
-        if (RT_SUCCESS(rc))
-            return pPD;
-        AssertMsgFailed(("Impossible! rc=%d PDPE=%#llx\n", rc, pGuestPDPT->a[iPdpt].u));
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
         /* returning NULL is ok if we assume it's just an invalid page of some kind emulated as all 0s. (not quite true) */
     }
@@ -3738 +3531 @@
     {
         const unsigned iPD = (GCPtr >> X86_PD_PAE_SHIFT) & X86_PD_PAE_MASK;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
         PX86PDPAE   pGuestPD = NULL;
@@ -3750 +3542 @@
 #endif
         return &pGuestPD->a[iPD];
-#else  /* !VBOX_WITH_NEW_PHYS_CODE */
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        if ((pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK) == pPGM->aGCPhysGstPaePDs[iPdpt])
-            return &pPGM->CTX_SUFF(apGstPaePDs)[iPdpt]->a[iPD];
-#endif
-
-        /* The cache is out-of-sync. */
-        PX86PDPAE pPD;
-        int rc = PGM_GCPHYS_2_PTR_BY_PGM(pPGM, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, &pPD);
-        if (RT_SUCCESS(rc))
-            return &pPD->a[iPD];
-        AssertMsgFailed(("Impossible! rc=%Rrc PDPE=%RX64\n", rc, pGuestPDPT->a[iPdpt].u));
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
         /* returning NIL_RTGCPHYS is ok if we assume it's just an invalid page or something which we'll emulate as all 0s. (not quite true) */
     }
@@ -3788 +3567 @@
         {
             const unsigned iPD = (GCPtr >> X86_PD_PAE_SHIFT) & X86_PD_PAE_MASK;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
             PX86PDPAE   pGuestPD = NULL;
@@ -3800 +3578 @@
 #endif
             return pGuestPD->a[iPD];
-#else  /* !VBOX_WITH_NEW_PHYS_CODE */
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-            if ((pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK) == pPGM->aGCPhysGstPaePDs[iPdpt])
-                return pPGM->CTX_SUFF(apGstPaePDs)[iPdpt]->a[iPD];
-#endif
-
-            /* cache is out-of-sync. */
-            PX86PDPAE pPD;
-            int rc = PGM_GCPHYS_2_PTR_BY_PGM(pPGM, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, &pPD);
-            if (RT_SUCCESS(rc))
-                return pPD->a[iPD];
-            AssertMsgFailed(("Impossible! rc=%d PDPE=%RX64\n", rc, pGuestPDPT->a[iPdpt].u));
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
         }
     }
@@ -3842 +3607 @@
     {
         const unsigned iPD = (GCPtr >> X86_PD_PAE_SHIFT) & X86_PD_PAE_MASK;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
         PX86PDPAE   pGuestPD = NULL;
@@ -3855 +3619 @@
         *piPD = iPD;
         return pGuestPD;
-#else  /* !VBOX_WITH_NEW_PHYS_CODE */
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        if ((pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK) == pPGM->aGCPhysGstPaePDs[iPdpt])
-        {
-            *piPD = iPD;
-            return pPGM->CTX_SUFF(apGstPaePDs)[iPdpt];
-        }
-#endif
-
-        /* cache is out-of-sync. */
-        PX86PDPAE pPD;
-        int rc = PGM_GCPHYS_2_PTR_BY_PGM(pPGM, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, &pPD);
-        if (RT_SUCCESS(rc))
-        {
-            *piPD = iPD;
-            return pPD;
-        }
-        AssertMsgFailed(("Impossible! rc=%d PDPE=%#llx\n", rc, pGuestPDPT->a[iPdpt].u));
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
         /* returning NIL_RTGCPHYS is ok if we assume it's just an invalid page of some kind emulated as all 0s. */
     }
@@ -3895 +3640 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_NEW_PHYS_CODE
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
     if (!pGuestPml4)
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
 # endif
     Assert(pGuestPml4);
@@ -3922 +3665 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_NEW_PHYS_CODE
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
     if (!pGuestPml4)
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
 # endif
     Assert(pGuestPml4);
@@ -3953 +3694 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_NEW_PHYS_CODE
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
     if (!pGuestPml4)
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
 # endif
     Assert(pGuestPml4);

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

@@ -346 +346 @@
 
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 /**
  * VMR3ReqCall worker for PGMR3PhysGCPhys2CCPtrExternal to make pages writable.
@@ -386 +385 @@
     return rc;
 }
-#endif /* VBOX_WITH_NEW_PHYS_CODE */
 
 
@@ -421 +419 @@
     AssertPtr(pLock);
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     int rc = pgmLock(pVM);
     AssertRCReturn(rc, rc);
@@ -483 +480 @@
     pgmUnlock(pVM);
     return rc;
-
-#else  /* !VBOX_WITH_NEW_PHYS_CODE */
-    /*
-     * Fallback code.
-     */
-    return PGMPhysGCPhys2R3Ptr(pVM, GCPhys, 1, (PRTR3PTR)ppv);
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 }
 
@@ -517 +507 @@
 VMMR3DECL(int) PGMR3PhysGCPhys2CCPtrReadOnlyExternal(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock)
 {
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     int rc = pgmLock(pVM);
     AssertRCReturn(rc, rc);
@@ -560 +549 @@
     pgmUnlock(pVM);
     return rc;
-
-#else  /* !VBOX_WITH_NEW_PHYS_CODE */
-    /*
-     * Fallback code.
-     */
-    return PGMPhysGCPhys2CCPtr(pVM, GCPhys, (void **)ppv, pLock);
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 }
 
@@ -716 +698 @@
 
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
 /**
  * Frees a range of pages, replacing them with ZERO pages of the specified type.
@@ -757 +738 @@
     return rc;
 }
-#endif /* VBOX_WITH_NEW_PHYS_CODE */
 
 
@@ -972 +952 @@
         return rc;
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     if (    GCPhys >= _4G
         &&  cPages > 256)
@@ -1025 +1004 @@
     }
     else
-#endif
     {
         /*
@@ -1035 +1013 @@
         AssertLogRelMsgRCReturn(rc, ("cbRamRange=%zu\n", cbRamRange), rc);
 
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-        /* Allocate memory for chunk to HC ptr lookup array. */
-        pNew->paChunkR3Ptrs = NULL;
-        rc = MMHyperAlloc(pVM, (cb >> PGM_DYNAMIC_CHUNK_SHIFT) * sizeof(void *), 16, MM_TAG_PGM, (void **)&pNew->paChunkR3Ptrs);
-        AssertRCReturn(rc, rc);
-        pNew->fFlags |= MM_RAM_FLAGS_DYNAMIC_ALLOC;
-#endif
-
         pgmR3PhysInitAndLinkRamRange(pVM, pNew, GCPhys, GCPhysLast, NIL_RTRCPTR, NIL_RTR0PTR, pszDesc, pPrev);
     }
@@ -1049 +1019 @@
      * Notify REM.
      */
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, REM_NOTIFY_PHYS_RAM_FLAGS_RAM);
-#else
-    REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, MM_RAM_FLAGS_DYNAMIC_ALLOC);
-#endif
 
     return VINF_SUCCESS;
@@ -1069 +1035 @@
 int pgmR3PhysRamReset(PVM pVM)
 {
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     /*
      * We batch up pages before freeing them.
@@ -1077 +1042 @@
     int rc = GMMR3FreePagesPrepare(pVM, &pReq, PGMPHYS_FREE_PAGE_BATCH_SIZE, GMMACCOUNT_BASE);
     AssertLogRelRCReturn(rc, rc);
-#endif
 
     /*
@@ -1087 +1051 @@
         AssertMsg(((RTGCPHYS)iPage << PAGE_SHIFT) == pRam->cb, ("%RGp %RGp\n", (RTGCPHYS)iPage << PAGE_SHIFT, pRam->cb));
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
         if (!pVM->pgm.s.fRamPreAlloc)
         {
@@ -1119 +1082 @@
         }
         else
-#endif
         {
             /* Zero the memory. */
@@ -1127 +1089 @@
                 switch (PGM_PAGE_GET_TYPE(pPage))
                 {
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-                    case PGMPAGETYPE_INVALID:
-                    case PGMPAGETYPE_RAM:
-                        if (pRam->aPages[iPage].HCPhys & (MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO | MM_RAM_FLAGS_MMIO2)) /** @todo PAGE FLAGS */
-                        {
-                            /* shadow ram is reloaded elsewhere. */
-                            Log4(("PGMR3Reset: not clearing phys page %RGp due to flags %RHp\n", pRam->GCPhys + (iPage << PAGE_SHIFT), pRam->aPages[iPage].HCPhys & (MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO))); /** @todo PAGE FLAGS */
-                            continue;
-                        }
-                        if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-                        {
-                            unsigned iChunk = iPage >> (PGM_DYNAMIC_CHUNK_SHIFT - PAGE_SHIFT);
-                            if (pRam->paChunkR3Ptrs[iChunk])
-                                ASMMemZero32((char *)pRam->paChunkR3Ptrs[iChunk] + ((iPage << PAGE_SHIFT) & PGM_DYNAMIC_CHUNK_OFFSET_MASK), PAGE_SIZE);
-                        }
-                        else
-                            ASMMemZero32((char *)pRam->pvR3 + (iPage << PAGE_SHIFT), PAGE_SIZE);
-                        break;
-#else /* VBOX_WITH_NEW_PHYS_CODE */
                     case PGMPAGETYPE_RAM:
                         switch (PGM_PAGE_GET_STATE(pPage))
@@ -1166 +1109 @@
                         }
                         break;
-#endif /* VBOX_WITH_NEW_PHYS_CODE */
 
                     case PGMPAGETYPE_MMIO2_ALIAS_MMIO:
@@ -1186 +1128 @@
     }
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     /*
      * Finish off any pages pending freeing.
@@ -1196 +1137 @@
     }
     GMMR3FreePagesCleanup(pReq);
-#endif
-
 
     return VINF_SUCCESS;
@@ -1285 +1224 @@
     {
         pNew = NULL;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
+
         /*
          * Make all the pages in the range MMIO/ZERO pages, freeing any
@@ -1298 +1237 @@
         }
         AssertRCReturn(rc, rc);
-#endif
     }
     else
@@ -1325 +1263 @@
 
         pNew->pvR3          = NULL;
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-        pNew->paChunkR3Ptrs = NULL;
-#endif
 
         uint32_t iPage = cPages;
@@ -1411 +1346 @@
                     {
                         fAllMMIO = false;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
                         Assert(PGM_PAGE_GET_TYPE(pPage) != PGMPAGETYPE_MMIO2_ALIAS_MMIO);
                         AssertMsgFailed(("%RGp %R[pgmpage]\n", pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), pPage));
-#endif
                         break;
                     }
@@ -1438 +1371 @@
             }
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
             /*
              * Range match? It will all be within one range (see PGMAllHandler.cpp).
@@ -1463 +1395 @@
                 break;
             }
-#endif
 
             /* next */
@@ -1584 +1515 @@
 
             pNew->RamRange.pvR3         = pvPages;
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-            pNew->RamRange.paChunkR3Ptrs = NULL;
-#endif
 
             uint32_t iPage = cPages;
@@ -2671 +2599 @@
 }
 
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-
-/**
- * Interface that the MMR3RamRegister(), MMR3RomRegister() and MMIO handler
- * registration APIs calls to inform PGM about memory registrations.
- *
- * It registers the physical memory range with PGM. MM is responsible
- * for the toplevel things - allocation and locking - while PGM is taking
- * care of all the details and implements the physical address space virtualization.
- *
- * @returns VBox status.
- * @param   pVM             The VM handle.
- * @param   pvRam           HC virtual address of the RAM range. (page aligned)
- * @param   GCPhys          GC physical address of the RAM range. (page aligned)
- * @param   cb              Size of the RAM range. (page aligned)
- * @param   fFlags          Flags, MM_RAM_*.
- * @param   paPages         Pointer an array of physical page descriptors.
- * @param   pszDesc         Description string.
- */
-VMMR3DECL(int) PGMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc)
-{
-    /*
-     * Validate input.
-     * (Not so important because callers are only MMR3PhysRegister()
-     *  and PGMR3HandlerPhysicalRegisterEx(), but anyway...)
-     */
-    Log(("PGMR3PhysRegister %08X %x bytes flags %x %s\n", GCPhys, cb, fFlags, pszDesc));
-
-    Assert((fFlags & (MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_MMIO | MM_RAM_FLAGS_DYNAMIC_ALLOC)) || paPages);
-    /*Assert(!(fFlags & MM_RAM_FLAGS_RESERVED) || !paPages);*/
-    Assert((fFlags == (MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_MMIO)) || (fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC) || pvRam);
-    /*Assert(!(fFlags & MM_RAM_FLAGS_RESERVED) || !pvRam);*/
-    Assert(!(fFlags & ~0xfff));
-    Assert(RT_ALIGN_Z(cb, PAGE_SIZE) == cb && cb);
-    Assert(RT_ALIGN_P(pvRam, PAGE_SIZE) == pvRam);
-    Assert(!(fFlags & ~(MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO | MM_RAM_FLAGS_MMIO2 | MM_RAM_FLAGS_DYNAMIC_ALLOC)));
-    Assert(RT_ALIGN_T(GCPhys, PAGE_SIZE, RTGCPHYS) == GCPhys);
-    RTGCPHYS GCPhysLast = GCPhys + (cb - 1);
-    if (GCPhysLast < GCPhys)
-    {
-        AssertMsgFailed(("The range wraps! GCPhys=%RGp cb=%#x\n", GCPhys, cb));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    /*
-     * Find range location and check for conflicts.
-     */
-    PPGMRAMRANGE    pPrev = NULL;
-    PPGMRAMRANGE    pCur = pVM->pgm.s.pRamRangesR3;
-    while (pCur)
-    {
-        if (GCPhys <= pCur->GCPhysLast && GCPhysLast >= pCur->GCPhys)
-        {
-            AssertMsgFailed(("Conflict! This cannot happen!\n"));
-            return VERR_PGM_RAM_CONFLICT;
-        }
-        if (GCPhysLast < pCur->GCPhys)
-            break;
-
-        /* next */
-        pPrev = pCur;
-        pCur = pCur->pNextR3;
-    }
-
-    /*
-     * Allocate RAM range.
-     * Small ranges are allocated from the heap, big ones have separate mappings.
-     */
-    size_t          cbRam = RT_OFFSETOF(PGMRAMRANGE, aPages[cb >> PAGE_SHIFT]);
-    PPGMRAMRANGE    pNew;
-    int             rc = VERR_NO_MEMORY;
-    if (cbRam > PAGE_SIZE / 2)
-    {   /* large */
-        cbRam = RT_ALIGN_Z(cbRam, PAGE_SIZE);
-        rc = MMR3HyperAllocOnceNoRel(pVM, cbRam, PAGE_SIZE, MM_TAG_PGM_PHYS, (void **)&pNew);
-        AssertMsgRC(rc, ("MMR3HyperAllocOnceNoRel(,%#x,,) -> %Rrc\n", cbRam, rc));
-    }
-    else
-    {   /* small */
-        rc = MMHyperAlloc(pVM, cbRam, 16, MM_TAG_PGM, (void **)&pNew);
-        AssertMsgRC(rc, ("MMHyperAlloc(,%#x,,,) -> %Rrc\n", cbRam, rc));
-    }
-    if (RT_SUCCESS(rc))
-    {
-        /*
-         * Initialize the range.
-         */
-        pNew->pvR3          = pvRam;
-        pNew->GCPhys        = GCPhys;
-        pNew->GCPhysLast    = GCPhysLast;
-        pNew->cb            = cb;
-        pNew->fFlags        = fFlags;
-        pNew->paChunkR3Ptrs = NULL;
-
-        unsigned iPage = (unsigned)(cb >> PAGE_SHIFT);
-        if (paPages)
-        {
-            while (iPage-- > 0)
-            {
-                PGM_PAGE_INIT(&pNew->aPages[iPage], paPages[iPage].Phys & X86_PTE_PAE_PG_MASK, NIL_GMM_PAGEID,
-                              fFlags & MM_RAM_FLAGS_MMIO2 ? PGMPAGETYPE_MMIO2 : PGMPAGETYPE_RAM,
-                              PGM_PAGE_STATE_ALLOCATED);
-                pNew->aPages[iPage].HCPhys |= fFlags; /** @todo PAGE FLAGS*/
-            }
-        }
-        else if (fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-        {
-            /* Allocate memory for chunk to HC ptr lookup array. */
-            rc = MMHyperAlloc(pVM, (cb >> PGM_DYNAMIC_CHUNK_SHIFT) * sizeof(void *), 16, MM_TAG_PGM, (void **)&pNew->paChunkR3Ptrs);
-            AssertMsgReturn(rc == VINF_SUCCESS, ("MMHyperAlloc(,%#x,,,) -> %Rrc\n", cbRam, cb), rc);
-
-            /* Physical memory will be allocated on demand. */
-            while (iPage-- > 0)
-            {
-                PGM_PAGE_INIT(&pNew->aPages[iPage], 0, NIL_GMM_PAGEID, PGMPAGETYPE_RAM, PGM_PAGE_STATE_ZERO);
-                pNew->aPages[iPage].HCPhys = fFlags; /** @todo PAGE FLAGS */
-            }
-        }
-        else
-        {
-            Assert(fFlags == (MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_MMIO));
-            RTHCPHYS HCPhysDummyPage = MMR3PageDummyHCPhys(pVM);
-            while (iPage-- > 0)
-            {
-                PGM_PAGE_INIT(&pNew->aPages[iPage], HCPhysDummyPage, NIL_GMM_PAGEID, PGMPAGETYPE_MMIO, PGM_PAGE_STATE_ZERO);
-                pNew->aPages[iPage].HCPhys |= fFlags; /** @todo PAGE FLAGS*/
-            }
-        }
-
-        /*
-         * Insert the new RAM range.
-         */
-        pgmLock(pVM);
-        pNew->pNextR3 = pCur;
-        pNew->pNextR0 = pCur ? MMHyperCCToR0(pVM, pCur) : NIL_RTR0PTR;
-        pNew->pNextRC = pCur ? MMHyperCCToRC(pVM, pCur) : NIL_RTRCPTR;
-        if (pPrev)
-        {
-            pPrev->pNextR3 = pNew;
-            pPrev->pNextR0 = MMHyperCCToR0(pVM, pNew);
-            pPrev->pNextRC = MMHyperCCToRC(pVM, pNew);
-        }
-        else
-        {
-            pVM->pgm.s.pRamRangesR3 = pNew;
-            pVM->pgm.s.pRamRangesR0 = MMHyperCCToR0(pVM, pNew);
-            pVM->pgm.s.pRamRangesRC = MMHyperCCToRC(pVM, pNew);
-        }
-        pgmUnlock(pVM);
-    }
-    return rc;
-}
-
-
-/**
- * Register a chunk of a the physical memory range with PGM. MM is responsible
- * for the toplevel things - allocation and locking - while PGM is taking
- * care of all the details and implements the physical address space virtualization.
- *
- *
- * @returns VBox status.
- * @param   pVM             The VM handle.
- * @param   pvRam           HC virtual address of the RAM range. (page aligned)
- * @param   GCPhys          GC physical address of the RAM range. (page aligned)
- * @param   cb              Size of the RAM range. (page aligned)
- * @param   fFlags          Flags, MM_RAM_*.
- * @param   paPages         Pointer an array of physical page descriptors.
- * @param   pszDesc         Description string.
- */
-VMMR3DECL(int) PGMR3PhysRegisterChunk(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc)
-{
-    NOREF(pszDesc);
-
-    /*
-     * Validate input.
-     * (Not so important because callers are only MMR3PhysRegister()
-     *  and PGMR3HandlerPhysicalRegisterEx(), but anyway...)
-     */
-    Log(("PGMR3PhysRegisterChunk %08X %x bytes flags %x %s\n", GCPhys, cb, fFlags, pszDesc));
-
-    Assert(paPages);
-    Assert(pvRam);
-    Assert(!(fFlags & ~0xfff));
-    Assert(RT_ALIGN_Z(cb, PAGE_SIZE) == cb && cb);
-    Assert(RT_ALIGN_P(pvRam, PAGE_SIZE) == pvRam);
-    Assert(!(fFlags & ~(MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO | MM_RAM_FLAGS_MMIO2 | MM_RAM_FLAGS_DYNAMIC_ALLOC)));
-    Assert(RT_ALIGN_T(GCPhys, PAGE_SIZE, RTGCPHYS) == GCPhys);
-    Assert(VM_IS_EMT(pVM));
-    Assert(!(GCPhys & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
-    Assert(cb == PGM_DYNAMIC_CHUNK_SIZE);
-
-    RTGCPHYS GCPhysLast = GCPhys + (cb - 1);
-    if (GCPhysLast < GCPhys)
-    {
-        AssertMsgFailed(("The range wraps! GCPhys=%RGp cb=%#x\n", GCPhys, cb));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    /*
-     * Find existing range location.
-     */
-    PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
-    while (pRam)
-    {
-        RTGCPHYS off = GCPhys - pRam->GCPhys;
-        if (    off < pRam->cb
-            &&  (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC))
-            break;
-
-        pRam = pRam->CTX_SUFF(pNext);
-    }
-    AssertReturn(pRam, VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS);
-
-    unsigned off = (GCPhys - pRam->GCPhys) >> PAGE_SHIFT;
-    unsigned iPage = (unsigned)(cb >> PAGE_SHIFT);
-    if (paPages)
-    {
-        while (iPage-- > 0)
-            pRam->aPages[off + iPage].HCPhys = (paPages[iPage].Phys & X86_PTE_PAE_PG_MASK) | fFlags;  /** @todo PAGE FLAGS */
-    }
-    off >>= (PGM_DYNAMIC_CHUNK_SHIFT - PAGE_SHIFT);
-    pRam->paChunkR3Ptrs[off] = (uintptr_t)pvRam;
-
-    /* Notify the recompiler. */
-    REMR3NotifyPhysRamChunkRegister(pVM, GCPhys, PGM_DYNAMIC_CHUNK_SIZE, (RTHCUINTPTR)pvRam, fFlags);
-
-    return VINF_SUCCESS;
-}
-
-
-/**
- * Allocate missing physical pages for an existing guest RAM range.
- *
- * @returns VBox status.
- * @param   pVM             The VM handle.
- * @param   GCPhys          GC physical address of the RAM range. (page aligned)
- */
-VMMR3DECL(int) PGM3PhysGrowRange(PVM pVM, PCRTGCPHYS pGCPhys)
-{
-    RTGCPHYS GCPhys = *pGCPhys;
-
-    /*
-     * Walk range list.
-     */
-    pgmLock(pVM);
-
-    PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
-    while (pRam)
-    {
-        RTGCPHYS off = GCPhys - pRam->GCPhys;
-        if (    off < pRam->cb
-            &&  (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC))
-        {
-            bool     fRangeExists = false;
-            unsigned off = (GCPhys - pRam->GCPhys) >> PGM_DYNAMIC_CHUNK_SHIFT;
-
-            /* Note: A request made from another thread may end up in EMT after somebody else has already allocated the range. */
-            if (pRam->paChunkR3Ptrs[off])
-                fRangeExists = true;
-
-            pgmUnlock(pVM);
-            if (fRangeExists)
-                return VINF_SUCCESS;
-            return pgmr3PhysGrowRange(pVM, GCPhys);
-        }
-
-        pRam = pRam->CTX_SUFF(pNext);
-    }
-    pgmUnlock(pVM);
-    return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
-}
-
-
-/**
- * Allocate missing physical pages for an existing guest RAM range.
- *
- * @returns VBox status.
- * @param   pVM             The VM handle.
- * @param   pRamRange       RAM range
- * @param   GCPhys          GC physical address of the RAM range. (page aligned)
- */
-int pgmr3PhysGrowRange(PVM pVM, RTGCPHYS GCPhys)
-{
-    void *pvRam;
-    int   rc;
-
-    /* We must execute this function in the EMT thread, otherwise we'll run into problems. */
-    if (!VM_IS_EMT(pVM))
-    {
-        PVMREQ pReq;
-        const RTGCPHYS GCPhysParam = GCPhys;
-
-        AssertMsg(!PDMCritSectIsOwner(&pVM->pgm.s.CritSect), ("We own the PGM lock -> deadlock danger!!\n"));
-
-        rc = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)PGM3PhysGrowRange, 2, pVM, &GCPhysParam);
-        if (RT_SUCCESS(rc))
-        {
-            rc = pReq->iStatus;
-            VMR3ReqFree(pReq);
-        }
-        return rc;
-    }
-
-    /* Round down to chunk boundary */
-    GCPhys = GCPhys & PGM_DYNAMIC_CHUNK_BASE_MASK;
-
-    STAM_COUNTER_INC(&pVM->pgm.s.StatR3DynRamGrow);
-    STAM_COUNTER_ADD(&pVM->pgm.s.StatR3DynRamTotal, PGM_DYNAMIC_CHUNK_SIZE/(1024*1024));
-
-    Log(("pgmr3PhysGrowRange: allocate chunk of size 0x%X at %RGp\n", PGM_DYNAMIC_CHUNK_SIZE, GCPhys));
-
-    unsigned cPages = PGM_DYNAMIC_CHUNK_SIZE >> PAGE_SHIFT;
-
-    for (;;)
-    {
-        rc = SUPPageAlloc(cPages, &pvRam);
-        if (RT_SUCCESS(rc))
-        {
-            rc = MMR3PhysRegisterEx(pVM, pvRam, GCPhys, PGM_DYNAMIC_CHUNK_SIZE, 0, MM_PHYS_TYPE_DYNALLOC_CHUNK, "Main Memory");
-            if (RT_SUCCESS(rc))
-                return rc;
-
-            SUPPageFree(pvRam, cPages);
-        }
-
-        VMSTATE enmVMState = VMR3GetState(pVM);
-        if (enmVMState != VMSTATE_RUNNING)
-        {
-            AssertMsgFailed(("Out of memory while trying to allocate a guest RAM chunk at %RGp!\n", GCPhys));
-            LogRel(("PGM: Out of memory while trying to allocate a guest RAM chunk at %RGp (VMstate=%s)!\n", GCPhys, VMR3GetStateName(enmVMState)));
-            return rc;
-        }
-
-        LogRel(("pgmr3PhysGrowRange: out of memory. pause until the user resumes execution.\n"));
-
-        /* Pause first, then inform Main. */
-        rc = VMR3SuspendNoSave(pVM);
-        AssertRC(rc);
-
-        VMSetRuntimeError(pVM, 0/*fFlags*/, "HostMemoryLow", "Unable to allocate and lock memory. The virtual machine will be paused. Please close applications to free up memory or close the VM");
-
-        /* Wait for resume event; will only return in that case. If the VM is stopped, the EMT thread will be destroyed. */
-        rc = VMR3WaitForResume(pVM);
-
-        /* Retry */
-        LogRel(("pgmr3PhysGrowRange: VM execution resumed -> retry.\n"));
-    }
-}
-
-
-/**
- * Interface MMR3RomRegister() and MMR3PhysReserve calls to update the
- * flags of existing RAM ranges.
- *
- * @returns VBox status.
- * @param   pVM             The VM handle.
- * @param   GCPhys          GC physical address of the RAM range. (page aligned)
- * @param   cb              Size of the RAM range. (page aligned)
- * @param   fFlags          The Or flags, MM_RAM_* \#defines.
- * @param   fMask           The and mask for the flags.
- */
-VMMR3DECL(int) PGMR3PhysSetFlags(PVM pVM, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, unsigned fMask)
-{
-    Log(("PGMR3PhysSetFlags %08X %x %x %x\n", GCPhys, cb, fFlags, fMask));
-
-    /*
-     * Validate input.
-     * (Not so important because caller is always MMR3RomRegister() and MMR3PhysReserve(), but anyway...)
-     */
-    Assert(!(fFlags & ~(MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO | MM_RAM_FLAGS_MMIO2)));
-    Assert(RT_ALIGN_Z(cb, PAGE_SIZE) == cb && cb);
-    Assert(RT_ALIGN_T(GCPhys, PAGE_SIZE, RTGCPHYS) == GCPhys);
-    RTGCPHYS GCPhysLast = GCPhys + (cb - 1);
-    AssertReturn(GCPhysLast > GCPhys, VERR_INVALID_PARAMETER);
-
-    /*
-     * Lookup the range.
-     */
-    PPGMRAMRANGE    pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
-    while (pRam && GCPhys > pRam->GCPhysLast)
-        pRam = pRam->CTX_SUFF(pNext);
-    if (    !pRam
-        ||  GCPhys > pRam->GCPhysLast
-        ||  GCPhysLast < pRam->GCPhys)
-    {
-        AssertMsgFailed(("No RAM range for %RGp-%RGp\n", GCPhys, GCPhysLast));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    /*
-     * Update the requested flags.
-     */
-    RTHCPHYS fFullMask = ~(RTHCPHYS)(MM_RAM_FLAGS_RESERVED | MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO | MM_RAM_FLAGS_MMIO2)
-                         | fMask;
-    unsigned iPageEnd = (GCPhysLast - pRam->GCPhys + 1) >> PAGE_SHIFT;
-    unsigned iPage    = (GCPhys - pRam->GCPhys) >> PAGE_SHIFT;
-    for ( ; iPage < iPageEnd; iPage++)
-        pRam->aPages[iPage].HCPhys = (pRam->aPages[iPage].HCPhys & fFullMask) | fFlags; /** @todo PAGE FLAGS */
-
-    return VINF_SUCCESS;
-}
-
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 /**
@@ -3607 +3132 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_NEW_PHYS_CODE
         if (!PGM_PAGE_HAS_ANY_HANDLERS(pPage))
             rc = VINF_SUCCESS;
@@ -3664 +3188 @@
 
         /* else: handler catching all access, no pointer returned. */
-
-#else
-        if (0)
-            /* nothing */;
-        else if (PGM_PAGE_HAS_ANY_HANDLERS(pPage))
-        {
-            if (PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)) /* catches MMIO */
-                rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
-            else if (fWritable && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
-                rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
-            else
-            {
-                /* Temporariliy disabled phycial handler(s), since the recompiler
-                   doesn't get notified when it's reset we'll have to pretend its
-                   operating normally. */
-                if (pgmHandlerPhysicalIsAll(pVM, GCPhys))
-                    rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
-                else
-                    rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
-            }
-        }
-        else
-            rc = VINF_SUCCESS;
-        if (RT_SUCCESS(rc))
-        {
-            if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-            {
-                AssertMsg(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM, ("GCPhys=%RGp type=%d\n", GCPhys, PGM_PAGE_GET_TYPE(pPage)));
-                RTGCPHYS off = GCPhys - pRam->GCPhys;
-                unsigned iChunk = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
-                *ppv = (void *)(pRam->paChunkR3Ptrs[iChunk] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
-            }
-            else if (RT_LIKELY(pRam->pvR3))
-            {
-                AssertMsg(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO2, ("GCPhys=%RGp type=%d\n", GCPhys, PGM_PAGE_GET_TYPE(pPage)));
-                RTGCPHYS off = GCPhys - pRam->GCPhys;
-                *ppv = (uint8_t *)pRam->pvR3 + off;
-            }
-            else
-                rc = VERR_PGM_PHYS_TLB_UNASSIGNED;
-        }
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
     }
     else

trunk/src/VBox/VMM/VMM.cpp ¶

@@ -361 +361 @@
     STAM_REG(pVM, &pVM->vmm.s.StatRZCallPGMMapChunk,        STAMTYPE_COUNTER, "/VMM/RZCallR3/PGMMapChunk",      STAMUNIT_OCCURENCES, "Number of VMMCALLHOST_PGM_MAP_CHUNK calls.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZCallPGMAllocHandy,      STAMTYPE_COUNTER, "/VMM/RZCallR3/PGMAllocHandy",    STAMUNIT_OCCURENCES, "Number of VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES calls.");
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    STAM_REG(pVM, &pVM->vmm.s.StatRZCallPGMGrowRAM,         STAMTYPE_COUNTER, "/VMM/RZCallR3/PGMGrowRAM",       STAMUNIT_OCCURENCES, "Number of VMMCALLHOST_PGM_RAM_GROW_RANGE calls.");
-#endif
     STAM_REG(pVM, &pVM->vmm.s.StatRZCallRemReplay,          STAMTYPE_COUNTER, "/VMM/RZCallR3/REMReplay",        STAMUNIT_OCCURENCES, "Number of VMMCALLHOST_REM_REPLAY_HANDLER_NOTIFICATIONS calls.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZCallLogFlush,           STAMTYPE_COUNTER, "/VMM/RZCallR3/VMMLogFlush",      STAMUNIT_OCCURENCES, "Number of VMMCALLHOST_VMM_LOGGER_FLUSH calls.");
@@ -1408 +1405 @@
             break;
         }
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-
-        case VMMCALLHOST_PGM_RAM_GROW_RANGE:
-        {
-            const RTGCPHYS GCPhys = pVM->vmm.s.u64CallHostArg;
-            pVM->vmm.s.rcCallHost = PGM3PhysGrowRange(pVM, &GCPhys);
-            break;
-        }
-#endif
 
         /*

trunk/src/VBox/VMM/VMMInternal.h ¶

@@ -333 +333 @@
     STAMCOUNTER                 StatRZRetEmulHlt;
     STAMCOUNTER                 StatRZRetPendingRequest;
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    STAMCOUNTER                 StatRZCallPGMGrowRAM;
-#endif
     STAMCOUNTER                 StatRZCallPDMLock;
     STAMCOUNTER                 StatRZCallLogFlush;

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp ¶

@@ -467 +467 @@
     GEN_CHECK_OFF(PGM, pRomRangesR0);
     GEN_CHECK_OFF(PGM, pRomRangesRC);
-    GEN_CHECK_OFF(PGM, cbRamSize);
     GEN_CHECK_OFF(PGM, pTreesR3);
     GEN_CHECK_OFF(PGM, pTreesR0);