VBox

Timestamp:

Aug 26, 2010 2:08:55 PM (14 years ago)

Author:

vboxsync

Message:

x86.h,*: Eliminated X86_PML4E_PG_MASK and renamed X86_PML4E_PG_MASK_FULL to X86_PML4E_PG_MASK.

Location:

trunk/include/VBox

Files:

trunk/include/VBox/hwacc_vmx.h

r31793	r32000
73	73
74	74	/** Bits 12-51 - - EPT - Physical Page number of the next level. */
75		#define EPT_PML4E_PG_MASK X86_PML4E_PG_MASK~~_FULL~~
	75	#define EPT_PML4E_PG_MASK X86_PML4E_PG_MASK
76	76	/** The page shift to get the PML4 index. */
77	77	#define EPT_PML4_SHIFT X86_PML4_SHIFT

-              r31490
+              r32000
 #define X86_PML4E_AVL_MASK                  (RT_BIT(9) | RT_BIT(10) | RT_BIT(11))
 /** 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. */
+#define X86_PML4E_PG_MASK                   ( 0x0000fffffffff000ULL )
+#define X86_PML4E_PG_MASK_FULL              ( 0x000ffffffffff000ULL )
+#else
+#define X86_PML4E_PG_MASK                   ( 0x000ffffffffff000ULL )
+#endif
+#define X86_PML4E_PG_MASK                   UINT64_C(0x000ffffffffff000)
 /** Bits 8, 7 - - MBZ bits when NX is active. */
 #define X86_PML4E_MBZ_MASK_NX               UINT64_C(0x0000000000000080)

-              r30969
+              r32000
 %define X86_PML4E_A                         RT_BIT(5)
 %define X86_PML4E_AVL_MASK                  (RT_BIT(9) | RT_BIT(10) | RT_BIT(11))
-%if 1
-%define X86_PML4E_PG_MASK                   ( 0x0000fffffffff000 )
-%define X86_PML4E_PG_MASK_FULL              ( 0x000ffffffffff000 )
-%else
 %define X86_PML4E_PG_MASK                   ( 0x000ffffffffff000 )
-%endif
 %define X86_PML4E_MBZ_MASK_NX               0x0000000000000080
 %define X86_PML4E_MBZ_MASK_NO_NX            0x8000000000000080

Note: See TracChangeset for help on using the changeset viewer.