Changeset 32034 in vbox for trunk/include

Timestamp:

Aug 27, 2010 10:05:25 AM (15 years ago)

Author:

vboxsync

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

65288

Message:

Removed X86_PDE_PAE_PG_MASK, renamed X86_PDE_PAE_PG_MASK_FULL to X86_PDE_PAE_PG_MASK.

Location:

trunk/include/VBox

Files:

• hwacc_vmx.h (modified) (1 diff)
• x86.h (modified) (1 diff)
• x86.mac (modified) (1 diff)

trunk/include/VBox/hwacc_vmx.h

@@ -210 +210 @@
 
 /** Bits 12-51 - - EPT - Physical Page number of the next level. */
-#define EPT_PDE_PG_MASK         X86_PDE_PAE_PG_MASK_FULL
+#define EPT_PDE_PG_MASK         X86_PDE_PAE_PG_MASK
 /** The page shift to get the PD index. */
 #define EPT_PD_SHIFT            X86_PD_PAE_SHIFT

trunk/include/VBox/x86.h

@@ -1315 +1315 @@
 
 /** Bits 12-51 - - PAE - Physical Page number of the next level. */
-#if 1 /* we're using this internally and have to mask of the top 16-bit. */
-/* Note: This is kind of dangerous if the guest uses these bits (legally or illegally);
- *       we partly or that part into shadow page table entries. Will be corrected
- *       soon.
- */
-#define X86_PDE_PAE_PG_MASK                 ( 0x0000fffffffff000ULL )
-#define X86_PDE_PAE_PG_MASK_FULL            ( 0x000ffffffffff000ULL )
-#else
-#define X86_PDE_PAE_PG_MASK                 ( 0x000ffffffffff000ULL )
-#endif
+#define X86_PDE_PAE_PG_MASK                 UINT64_C(0x000ffffffffff000)
 /** Bits 63 - NX - PAE/LM - No execution flag. */
 #define X86_PDE_PAE_NX                      RT_BIT_64(63)

trunk/include/VBox/x86.mac

@@ -381 +381 @@
 %define X86_PDE_AVL_MASK                    (RT_BIT(9) | RT_BIT(10) | RT_BIT(11))
 %define X86_PDE_PG_MASK                     ( 0xfffff000 )
-%if 1
-%define X86_PDE_PAE_PG_MASK                 ( 0x0000fffffffff000 )
-%define X86_PDE_PAE_PG_MASK_FULL            ( 0x000ffffffffff000 )
-%else
 %define X86_PDE_PAE_PG_MASK                 ( 0x000ffffffffff000 )
-%endif
 %define X86_PDE_PAE_NX                      RT_BIT_64(63)
 %define X86_PDE_PAE_MBZ_MASK_NX             0x7ff0000000000080