Changeset 7598 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 27, 2008 4:08:49 PM (17 years ago)

Author:

vboxsync

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

29098

Message:

Corrected wrong macro use to mask physical addresses

Location:

trunk/src/VBox/VMM

Files:

• PGMPhys.h (modified) (2 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMPhys.h

@@ -41 +41 @@
     else
     if (    ASMBitTest(&pVM->pgm.s.pgmphysreadcache.aEntries, (iCacheIndex = ((GCPhys >> PAGE_SHIFT) & PGM_MAX_PHYSCACHE_ENTRIES_MASK)))
-        &&  pVM->pgm.s.pgmphysreadcache.Entry[iCacheIndex].GCPhys == PAGE_ADDRESS(GCPhys) /** @todo r=bird: wrong macro. You don't want an uintptr_t! */
+        &&  pVM->pgm.s.pgmphysreadcache.Entry[iCacheIndex].GCPhys == PHYS_PAGE_ADDRESS(GCPhys)
 #if PGMPHYS_DATASIZE != 1
-        &&  PAGE_ADDRESS(GCPhys) == PAGE_ADDRESS(GCPhys + sizeof(PGMPHYS_DATATYPE) - 1) /** (GCPhys & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(PGMPHYS_DATATYPE) */
+        &&  PHYS_PAGE_ADDRESS(GCPhys) == PHYS_PAGE_ADDRESS(GCPhys + sizeof(PGMPHYS_DATATYPE) - 1) /** (GCPhys & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(PGMPHYS_DATATYPE) */
 #endif
        )
@@ -83 +83 @@
     else
     if (    ASMBitTest(&pVM->pgm.s.pgmphyswritecache.aEntries, (iCacheIndex = ((GCPhys >> PAGE_SHIFT) & PGM_MAX_PHYSCACHE_ENTRIES_MASK)))
-        &&  pVM->pgm.s.pgmphyswritecache.Entry[iCacheIndex].GCPhys == PAGE_ADDRESS(GCPhys)
+        &&  pVM->pgm.s.pgmphyswritecache.Entry[iCacheIndex].GCPhys == PHYS_PAGE_ADDRESS(GCPhys)
 #if PGMPHYS_DATASIZE != 1
-        &&  PAGE_ADDRESS(GCPhys) == PAGE_ADDRESS(GCPhys + sizeof(val) - 1)
+        &&  PHYS_PAGE_ADDRESS(GCPhys) == PHYS_PAGE_ADDRESS(GCPhys + sizeof(val) - 1)
 #endif
        )

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

@@ -1064 +1064 @@
     Assert(VM_IS_EMT(pVM));
 
-    GCPhys = GCPhys & X86_PTE_PAE_PG_MASK;
+    GCPhys = PHYS_PAGE_ADDRESS(GCPhys);
     pbHC   = (uint8_t *)PAGE_ADDRESS(pbHC);