Changeset 9606 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

Timestamp:

Jun 11, 2008 12:25:36 PM (17 years ago)

Author:

vboxsync

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

31923

Message:

X86_CR4_PSE changes for long mode (bit is ignored there)

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (6 diffs)

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

@@ -194 +194 @@
 
     if (    !Pde.b.u1Size
-        ||  !(CPUMGetGuestCR4(pVM) & X86_CR4_PSE))
+# if PGM_GST_TYPE != PGM_TYPE_AMD64
+        ||  !(CPUMGetGuestCR4(pVM) & X86_CR4_PSE)
+# endif
+        )
     {
         PGSTPT pPT;
@@ -276 +279 @@
          * Get the PD entry.
          */
-#if PGM_GST_TYPE == PGM_TYPE_32BIT
+# if PGM_GST_TYPE == PGM_TYPE_32BIT
         PX86PDE pPde = &CTXSUFF(pVM->pgm.s.pGuestPD)->a[GCPtr >> X86_PD_SHIFT];
-#elif PGM_GST_TYPE == PGM_TYPE_PAE
+# elif PGM_GST_TYPE == PGM_TYPE_PAE
         /* pgmGstGetPaePDEPtr will return 0 if the PDPTE is marked as not present
          * All the other bits in the PDPTE are only valid in long mode (r/w, u/s, nx)
@@ -286 +289 @@
         if (!pPde)
             return VERR_PAGE_TABLE_NOT_PRESENT;
-#elif PGM_GST_TYPE == PGM_TYPE_AMD64
+# elif PGM_GST_TYPE == PGM_TYPE_AMD64
         /** @todo Setting the r/w, u/s & nx bits might have no effect depending on the pdpte & pml4 values */
         PX86PDEPAE pPde = pgmGstGetLongModePDEPtr(&pVM->pgm.s, GCPtr);
@@ -292 +295 @@
         if (!pPde)
             return VERR_PAGE_TABLE_NOT_PRESENT;
-#endif
+# endif
         GSTPDE Pde = *pPde;
         Assert(Pde.n.u1Present);
@@ -299 +302 @@
 
         if (    !Pde.b.u1Size
-            ||  !(CPUMGetGuestCR4(pVM) & X86_CR4_PSE))
+# if PGM_GST_TYPE != PGM_TYPE_AMD64
+            ||  !(CPUMGetGuestCR4(pVM) & X86_CR4_PSE)
+# endif
+            )
         {
             /*
@@ -728 +734 @@
         if (Pde.n.u1Present)
         {
-            if (!Pde.b.u1Size || !(pState->cr4 & X86_CR4_PSE))
+            if (    !Pde.b.u1Size 
+# if PGM_GST_TYPE != PGM_TYPE_AMD64
+                ||  !(pState->cr4 & X86_CR4_PSE)
+# endif
+                )
             {
                 /*