Changeset 9701 in vbox

Timestamp:

Jun 16, 2008 8:57:21 AM (16 years ago)

Author:

vboxsync

Message:

Fixed mask issues in 64 bits mode

Location:

trunk

Files:

• include/VBox/x86.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (2 diffs)

trunk/include/VBox/x86.h

@@ -920 +920 @@
 #if 1 /* we're using this internally and have to mask of the top 16-bit. */
 #define X86_PTE_PAE_PG_MASK                 ( 0x0000fffffffff000ULL )
+/** @todo Get rid of the above hack; makes code unreadable. */
+#define X86_PTE_PAE_PG_MASK_FULL            ( 0x000ffffffffff000ULL )
 #else
 #define X86_PTE_PAE_PG_MASK                 ( 0x000ffffffffff000ULL )

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

@@ -90 +90 @@
 #  define GST_PDPT_SHIFT            X86_PDPT_SHIFT
 #  define GST_PDPT_MASK             X86_PDPT_MASK_PAE
+#  define GST_PTE_PG_MASK           X86_PTE_PAE_PG_MASK
 # else
 #  define GST_TOTAL_PD_ENTRIES      (X86_PG_AMD64_ENTRIES * X86_PG_AMD64_PDPE_ENTRIES)
@@ -95 +96 @@
 #  define GST_PDPT_SHIFT            X86_PDPT_SHIFT
 #  define GST_PDPT_MASK             X86_PDPT_MASK_AMD64
-# endif
-# define GST_PTE_PG_MASK            X86_PTE_PAE_PG_MASK
+#  define GST_PTE_PG_MASK           X86_PTE_PAE_PG_MASK_FULL
+# endif
 # define GST_PT_SHIFT               X86_PT_PAE_SHIFT
 # define GST_PT_MASK                X86_PT_PAE_MASK