Changeset 7804 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

Timestamp:

Apr 8, 2008 1:34:26 PM (17 years ago)

Author:

vboxsync

Message:

NXE correction

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (3 diffs)

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

@@ -1638 +1638 @@
         ||  !pPdpeSrc->n.u1Present
 # 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)
+        ||  (fNoExecuteBitValid && (uErr & X86_TRAP_PF_ID) && pPdpeSrc->n.u1NoExecute)
         ||  (fWriteFault && !pPdpeSrc->n.u1Write && (fUserLevelFault || fWriteProtect))
         ||  (fUserLevelFault && !pPdpeSrc->n.u1User) 
@@ -1687 +1687 @@
         ||  !pPdeSrc->n.u1Present
 # if PGM_WITH_NX(PGM_GST_TYPE)
-        ||  (fNoExecuteBitValid && (uErr & X86_TRAP_PF_ID) &&  pPdeSrc->n.u1NoExecute)
+        ||  (fNoExecuteBitValid && (uErr & X86_TRAP_PF_ID) && pPdeSrc->n.u1NoExecute)
 # endif
         ||  (fWriteFault && !pPdeSrc->n.u1Write && (fUserLevelFault || fWriteProtect))
@@ -1777 +1777 @@
         if (    !PteSrc.n.u1Present
 #  if PGM_WITH_NX(PGM_GST_TYPE)
-            ||  ((uErr & X86_TRAP_PF_ID) && !PteSrc.n.u1NoExecute)
+            ||  (fNoExecuteBitValid && (uErr & X86_TRAP_PF_ID) && PteSrc.n.u1NoExecute)
 #  endif
             ||  (fWriteFault && !PteSrc.n.u1Write && (fUserLevelFault || fWriteProtect))