Changeset 7802 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 8, 2008 1:16:05 PM (17 years ago)

Author:

vboxsync

Message:

NX, r/w, u/s bits in the PDPE are valid in long mode only.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (1 diff)

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

@@ -1637 +1637 @@
     if (    (uErr & X86_TRAP_PF_RSVD)
         ||  !pPdpeSrc->n.u1Present
-# if PGM_WITH_NX(PGM_GST_TYPE)
+# if PGM_GST_TYPE == PGM_TYPE_AMD64 /* NX, r/w, u/s bits in the PDPE are long mode only */
         ||  (fNoExecuteBitValid && (uErr & X86_TRAP_PF_ID) &&  pPdpeSrc->n.u1NoExecute)
-# endif
         ||  (fWriteFault && !pPdpeSrc->n.u1Write && (fUserLevelFault || fWriteProtect))
-        ||  (fUserLevelFault && !pPdpeSrc->n.u1User) )
+        ||  (fUserLevelFault && !pPdpeSrc->n.u1User) 
+# endif
+       )
     {
 #  ifdef IN_GC