Changeset 32009 in vbox for trunk/include

Timestamp:

Aug 26, 2010 4:41:19 PM (15 years ago)

Author:

vboxsync

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

65256

Message:

Removed GST_PDPE_PG_MASK and renamed GST_PDPE_PG_MASK_FULL to GST_PDPE_PG_MASK.

Location:

trunk/include/VBox

Files:

trunk/include/VBox/hwacc_vmx.h

r32000	r32009
140	140
141	141	/** Bits 12-51 - - EPT - Physical Page number of the next level. */
142		#define EPT_PDPTE_PG_MASK X86_PDPE_PG_MASK~~_FULL~~
	142	#define EPT_PDPTE_PG_MASK X86_PDPE_PG_MASK
143	143	/** The page shift to get the PDPT index. */
144	144	#define EPT_PDPT_SHIFT X86_PDPT_SHIFT

-              r32000
+              r32009
 #define X86_PDPE_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_PDPE_PG_MASK                    UINT64_C(0x0000fffffffff000)
-/** @todo Get rid of the above hack; makes code unreadable. */
-#define X86_PDPE_PG_MASK_FULL               UINT64_C(0x000ffffffffff000)
-#else
 #define X86_PDPE_PG_MASK                    UINT64_C(0x000ffffffffff000)
-#endif
 /** Bits 63-52, 8-5, 2-1 - - PAE - MBZ bits (NX is long mode only). */
 #define X86_PDPE_PAE_MBZ_MASK               UINT64_C(0xfff00000000001e6)

-              r32000
+              r32009
 %define X86_PDPE_LM_PS                      RT_BIT(7)
 %define X86_PDPE_AVL_MASK                   (RT_BIT(9) | RT_BIT(10) | RT_BIT(11))
-%if 1
-%define X86_PDPE_PG_MASK                    0x0000fffffffff000
-%define X86_PDPE_PG_MASK_FULL               0x000ffffffffff000
-%else
 %define X86_PDPE_PG_MASK                    0x000ffffffffff000
-%endif
 %define X86_PDPE_PAE_MBZ_MASK               0xfff00000000001e6
 %define X86_PDPE_LM_NX                      RT_BIT_64(63)

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