Changeset 36416 in vbox

Timestamp:

Mar 24, 2011 6:25:59 PM (14 years ago)

Author:

vboxsync

Message:

PGMRZDynMap.cpp: Committed a slightly modified version of pgm_dynmap.patch. See #3862.

File:

• trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -206 +206 @@
     /** The number of references. */
     int32_t volatile            cRefs;
+#ifndef IN_RC
     /** PTE pointer union. */
     union PGMR0DYNMAPENTRY_PPTE
@@ -216 +217 @@
         void                   *pv;
     } uPte;
+#else
+    /** PTE pointers. */
+    struct PGMR0DYNMAPENTRY_PPTE
+    {
+        /** PTE pointer, 32-bit legacy version. */
+        PX86PTE                 pLegacy;
+        /** PTE pointer, PAE version. */
+        PX86PTEPAE              pPae;
+    } uPte;
+#endif
 # ifndef IN_RC
     /** CPUs that haven't invalidated this entry after it's last update. */
@@ -248 +259 @@
     /** The cache size given as a number of pages. */
     uint32_t                    cPages;
+# ifndef IN_RC
     /** Whether it's 32-bit legacy or PAE/AMD64 paging mode. */
     bool                        fLegacyMode;
+# endif
     /** The current load.
      * This does not include guard pages. */
@@ -1277 +1290 @@
     pThis->paPages      = RT_ALIGN_PT(pThis + 1, 32, PPGMRZDYNMAPENTRY);
     pThis->cPages       = cPages;
-    pThis->fLegacyMode  = PGMGetHostMode(pVM) == PGMMODE_32_BIT;
     pThis->cLoad        = 0;
     pThis->cMaxLoad     = 0;
@@ -1288 +1300 @@
         pThis->paPages[iPage].pvPage = pVM->pgm.s.pbDynPageMapBaseGC + iPage * PAGE_SIZE;
         pThis->paPages[iPage].cRefs  = 0;
-        if (pThis->fLegacyMode)
-            pThis->paPages[iPage].uPte.pLegacy = &pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage];
-        else
-            pThis->paPages[iPage].uPte.pPae    = (PX86PTEPAE)&pVM->pgm.s.paDynPageMapPaePTEsGC[iPage];
+        pThis->paPages[iPage].uPte.pLegacy = &pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage];
+        pThis->paPages[iPage].uPte.pPae    = (PX86PTEPAE)&pVM->pgm.s.paDynPageMapPaePTEsGC[iPage];
     }
 
@@ -1422 +1432 @@
 #ifndef IN_RC
     RTCpuSetFill(&paPages[iFreePage].PendingSet);
-#endif
+
     if (pThis->fLegacyMode)
+#endif
     {
         X86PGUINT       uOld  = paPages[iFreePage].uPte.pLegacy->u;
@@ -1434 +1445 @@
         Assert(paPages[iFreePage].uPte.pLegacy->u == uNew);
     }
+#ifndef IN_RC
     else
+#endif
     {
         X86PGPAEUINT    uOld  = paPages[iFreePage].uPte.pPae->u;