Changeset 41420 in vbox for trunk/src/VBox/VMM/include

Timestamp:

May 23, 2012 3:14:05 PM (13 years ago)

Author:

vboxsync

Message:

PGM: More A20 fixes.

File:

• trunk/src/VBox/VMM/include/PGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -2526 +2526 @@
 #ifdef PGM_WITH_A20
 # define PGM_A20_IS_ENABLED(a_pVCpu)                        ((a_pVCpu)->pgm.s.fA20Enabled)
-# define PGM_A20_APPLY(a_pVCpu, a_GCPhys)                   ((a_pVCpu)->pgm.s.GCPhysA20Mask & (a_GCPhys))
+# define PGM_A20_APPLY(a_pVCpu, a_GCPhys)                   ((a_GCPhys) & (a_pVCpu)->pgm.s.GCPhysA20Mask)
 # define PGM_A20_APPLY_TO_VAR(a_pVCpu, a_GCPhysVar)         \
-    do { a_GCPhysVar = (a_pVCpu)->pgm.s.GCPhysA20Mask & a_GCPhysVar; } while (0)
+    do { a_GCPhysVar &= (a_pVCpu)->pgm.s.GCPhysA20Mask; } while (0)
+# define PGM_A20_ASSERT_MASKED(pVCpu, a_GCPhys)             Assert(PGM_A20_APPLY(pVCpu, a_GCPhys) == (a_GCPhys))
 #else
 # define PGM_A20_IS_ENABLED(a_pVCpu)                        (true)
 # define PGM_A20_APPLY(a_pVCpu, a_GCPhys)                   (a_GCPhys)
 # define PGM_A20_APPLY_TO_VAR(a_pVCpu, a_GCPhysVar)         do { } while (0)
+# define PGM_A20_ASSERT_MASKED(pVCpu, a_GCPhys)             do { } while (0)
 #endif
 /** @} */