Changeset 31086 in vbox

Timestamp:

Jul 25, 2010 10:40:49 AM (15 years ago)

Author:

vboxsync

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

64034

Message:

PGM: Disabled the GstWalk #PF code.

File:

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

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

@@ -74 +74 @@
 
 /* enables the new code. */
-#define PGM_WITH_GST_WALK
+//#define PGM_WITH_GST_WALK
 
 #ifndef IN_RING3
@@ -245 +245 @@
 #  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE != PGM_TYPE_PAE
     /*
-     * Hide the instruction fetch trap indicator for now.
-     */
-    /** @todo NXE will change this and we must fix NXE in the switcher too! */
-    if (uErr & X86_TRAP_PF_ID)
+     * Hide the instruction fetch trap indicator if NX isn't active.
+     */
+    /** @todo do this only when returning with a guest trap! */
+    if ((uErr & X86_TRAP_PF_ID) && !pVCpu->pgm.s.fNoExecuteEnabled)
     {
         uErr &= ~X86_TRAP_PF_ID;