Changeset 7808 in vbox

Timestamp:

Apr 8, 2008 2:25:58 PM (17 years ago)

Author:

vboxsync

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

29381

Message:

SyncPage: correct NXE bit handling

File:

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

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

@@ -1254 +1254 @@
 PGM_BTH_DECL(int, SyncPage)(PVM pVM, GSTPDE PdeSrc, RTGCUINTPTR GCPtrPage, unsigned cPages, unsigned uErr)
 {
+# if PGM_WITH_NX(PGM_GST_TYPE)
+    bool fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE);
+# endif
     LogFlow(("SyncPage: GCPtrPage=%VGv cPages=%d uErr=%#x\n", GCPtrPage, cPages, uErr));
 
@@ -1303 +1306 @@
         &&  (PdeSrc.n.u1User == PdeDst.n.u1User)
         &&  (PdeSrc.n.u1Write == PdeDst.n.u1Write || !PdeDst.n.u1Write)
-# if PGM_GST_TYPE == PGM_TYPE_PAE
-        &&  (PdeSrc.n.u1NoExecute == PdeDst.n.u1NoExecute)
+# if PGM_WITH_NX(PGM_GST_TYPE)
+        &&  (!fNoExecuteBitValid || PdeSrc.n.u1NoExecute == PdeDst.n.u1NoExecute)
 # endif
        )