Changeset 14133 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 12, 2008 4:37:47 PM (16 years ago)

Author:

vboxsync

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

39220

Message:

#1865: final pae change.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (2 diffs)
• PGMAllPool.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -2324 +2324 @@
     const unsigned  iPdpt    = (GCPtrPage >> X86_PDPT_SHIFT); NOREF(iPdpt);
     PX86PDPT        pPdptDst = pgmShwGetPaePDPTPtr(&pVM->pgm.s); NOREF(pPdptDst);
-    PSHWPDE         pPdeDst = pgmShwGetPaePDEPtr(&pVM->pgm.s, GCPtrPage);
+    PSHWPDE         pPdeDst  = pgmShwGetPaePDEPtr(&pVM->pgm.s, GCPtrPage);
 
 # elif PGM_SHW_TYPE == PGM_TYPE_AMD64
@@ -3214 +3214 @@
         X86PDPE         PdpeSrc;
         PGSTPD          pPDSrc    = pgmGstGetPaePDPtr(&pVM->pgm.s, iPdpt << X86_PDPT_SHIFT, &iPDSrc, &PdpeSrc);
-        PX86PDPAE       pPDPAE    = pVM->pgm.s.CTXMID(ap,PaePDs)[0];
         PX86PDEPAE      pPDEDst   = pgmShwGetPaePDEPtr(&pVM->pgm.s, iPdpt << X86_PDPT_SHIFT);
         PX86PDPT        pPdptDst  = pgmShwGetPaePDPTPtr(&pVM->pgm.s);

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

@@ -115 +115 @@
         case PGMPOOL_IDX_PAE_PD:
         case PGMPOOL_IDX_PAE_PD_0:
-            return pVM->pgm.s.apGCPaePDs[0];
+            return pVM->pgm.s.apShwPaePDsRC[0];
         case PGMPOOL_IDX_PAE_PD_1:
-            return pVM->pgm.s.apGCPaePDs[1];
+            return pVM->pgm.s.apShwPaePDsRC[1];
         case PGMPOOL_IDX_PAE_PD_2:
-            return pVM->pgm.s.apGCPaePDs[2];
+            return pVM->pgm.s.apShwPaePDsRC[2];
         case PGMPOOL_IDX_PAE_PD_3:
-            return pVM->pgm.s.apGCPaePDs[3];
+            return pVM->pgm.s.apShwPaePDsRC[3];
         case PGMPOOL_IDX_PDPT:
             return pVM->pgm.s.pShwPaePdptRC;