Changeset 8033 in vbox

Timestamp:

Apr 16, 2008 12:40:16 PM (17 years ago)

Author:

vboxsync

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

29696

Message:

Fixed one regression + several PAE related bugs.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMMap.cpp (modified) (1 diff)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)
• VMMGC/TRPMGCHandlers.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1289 +1289 @@
 #define PGMPOOL_IDX_PAE_PD_2    5
  /** PAE Page Directory Table 3. */
-#define PGMPOOL_IDX_PAE_PD_4    6
+#define PGMPOOL_IDX_PAE_PD_3    6
 /** Page Directory Pointer Table (PAE root, not currently used). */
 #define PGMPOOL_IDX_PDPT        7

trunk/src/VBox/VMM/PGMMap.cpp

@@ -1010 +1010 @@
              * Ask for the mapping.
              */
-            RTGCPTR GCPtrNewMapping = iPDPTE << X86_PDPT_SHIFT + iPDNew << X86_PD_PAE_SHIFT;
+            RTGCPTR GCPtrNewMapping = (iPDPTE << X86_PDPT_SHIFT) + (iPDNew << X86_PD_PAE_SHIFT);
 
             if (pMapping->pfnRelocate(pVM, GCPtrOldMapping, GCPtrNewMapping, PGMRELOCATECALL_SUGGEST, pMapping->pvUser))

trunk/src/VBox/VMM/PGMPool.cpp

@@ -433 +433 @@
         }
         pPage->Core.Key  = MMPage2Phys(pVM, pPage->pvPageHC);
+        LogFlow(("PGMR3PoolGrow: insert page %VHp\n", pPage->Core.Key));
         pPage->GCPhys    = NIL_RTGCPHYS;
         pPage->enmKind   = PGMPOOLKIND_FREE;

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

@@ -2754 +2754 @@
                         const unsigned cPTs = pMapping->cb >> SHW_PD_SHIFT;
                         iPD += cPTs - 1;
-                        pPDEDst += cPTs + cPTs;
+                        pPDEDst += cPTs;
                         pMapping = pMapping->CTXALLSUFF(pNext);
                         iPdNoMapping = pMapping ? pMapping->GCPtr >> GST_PD_SHIFT : ~0U;

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

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

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -856 +856 @@
             /* no break; */
         case VINF_PGM_SYNC_CR3: /** @todo Check this with Sander. */
+        case VINF_EM_RAW_EMULATE_INSTR:
         case VINF_IOM_HC_IOPORT_READ:
         case VINF_IOM_HC_IOPORT_WRITE: