Changeset 47719 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 14, 2013 10:34:44 AM (11 years ago)

Author:

vboxsync

Message:

No MMIO2 aliasing when doing full IEM verification runs.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IOMAllMMIO.cpp (modified) (3 diffs)
• PGMAllHandler.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -2424 +2424 @@
 VMMDECL(int) IOMMMIOMapMMIO2Page(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped, uint64_t fPageFlags)
 {
+# ifndef IEM_VERIFICATION_MODE_FULL
     /* Currently only called from the VGA device during MMIO. */
     Log(("IOMMMIOMapMMIO2Page %RGp -> %RGp flags=%RX64\n", GCPhys, GCPhysRemapped, fPageFlags));
@@ -2466 +2467 @@
      * Note: This is a NOP in the EPT case; we'll just let it fault again to resync the page.
      */
-#if 0 /* The assertion is wrong for the PGM_SYNC_CLEAR_PGM_POOL and VINF_PGM_HANDLER_ALREADY_ALIASED cases. */
-# ifdef VBOX_STRICT
+#  if 0 /* The assertion is wrong for the PGM_SYNC_CLEAR_PGM_POOL and VINF_PGM_HANDLER_ALREADY_ALIASED cases. */
+#   ifdef VBOX_STRICT
     uint64_t fFlags;
     RTHCPHYS HCPhys;
     rc = PGMShwGetPage(pVCpu, (RTGCPTR)GCPhys, &fFlags, &HCPhys);
     Assert(rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT);
-# endif
-#endif
+#   endif
+#  endif
     rc = PGMPrefetchPage(pVCpu, (RTGCPTR)GCPhys);
     Assert(rc == VINF_SUCCESS || rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT);
+# endif /* !IEM_VERIFICATION_MODE_FULL */
     return VINF_SUCCESS;
 }
 
 
+# ifndef IEM_VERIFICATION_MODE_FULL
 /**
  * Mapping a HC page in place of an MMIO page for direct access.
@@ -2533 +2536 @@
     return VINF_SUCCESS;
 }
+#endif /* !IEM_VERIFICATION_MODE_FULL */
 
 

trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp

@@ -1004 +1004 @@
 }
 
+#ifndef IEM_VERIFICATION_MODE_FULL
 
 /**
@@ -1130 +1131 @@
     return VERR_PGM_HANDLER_NOT_FOUND;
 }
+
 
 /**
@@ -1235 +1237 @@
 }
 
+#endif /* !IEM_VERIFICATION_MODE_FULL */
 
 /**