VirtualBox

Changeset 12934 in vbox for trunk


Ignore:
Timestamp:
Oct 2, 2008 11:56:15 AM (16 years ago)
Author:
vboxsync
Message:

Missed update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/VBox/hwacc_vmx.h

    r12920 r12934  
    4848 * Number of page table entries in the EPT. (PDPTE/PDE/PTE)
    4949 */
    50 #define EPT_PG_ENTRIES                  512
     50#define EPT_PG_ENTRIES          X86_PG_PAE_ENTRIES
    5151
    5252/**
     
    7474
    7575/** Bits 12-51 - - EPT - Physical Page number of the next level. */
    76 #define EPT_PML4E_PG_MASK       ( 0x000ffffffffff000ULL )
     76#define EPT_PML4E_PG_MASK       X86_PML4E_PG_MASK_FULL
     77/** The page shift to get the PML4 index. */
     78#define EPT_PML4_SHIFT          X86_PML4_SHIFT
     79/** The PML4 index mask (apply to a shifted page address). */
     80#define EPT_PML4_MASK           X86_PML4_MASK
    7781
    7882/**
     
    8286typedef union EPTPML4
    8387{
    84     EPTPML4EBITS n;
     88    /** Normal view. */
     89    EPTPML4EBITS    n;
     90    /** Unsigned integer view. */
     91    X86PGUINT       u;
    8592    /** 64 bit unsigned integer view. */
    86     uint64_t    au64[1];
     93    uint64_t        au64[1];
     94    /** 32 bit unsigned integer view. */
     95    uint32_t        au32[2];
    8796} EPTPML4;
    8897#pragma pack()
     
    117126
    118127/** Bits 12-51 - - EPT - Physical Page number of the next level. */
    119 #define EPT_PDPTE_PG_MASK       ( 0x000ffffffffff000ULL )
     128#define EPT_PDPTE_PG_MASK       X86_PDPE_PG_MASK_FULL
     129/** The page shift to get the PDPT index. */
     130#define EPT_PDPT_SHIFT          X86_PDPT_SHIFT
     131/** The PDPT index mask (apply to a shifted page address). */
     132#define EPT_PDPT_MASK           X86_PDPT_MASK_AMD64
    120133
    121134/**
     
    125138typedef union EPTPDPTE
    126139{
    127     EPTPDPTEBITS n;
     140    /** Normal view. */
     141    EPTPDPTEBITS    n;
     142    /** Unsigned integer view. */
     143    X86PGUINT       u;
    128144    /** 64 bit unsigned integer view. */
    129     uint64_t    au64[1];
     145    uint64_t        au64[1];
     146    /** 32 bit unsigned integer view. */
     147    uint32_t        au32[2];
    130148} EPTPDPTE;
    131149#pragma pack()
     
    177195
    178196/** Bits 12-51 - - EPT - Physical Page number of the next level. */
    179 #define EPT_PDE_PG_MASK         ( 0x000ffffffffff000ULL )
     197#define EPT_PDE_PG_MASK         X86_PDE_PAE_PG_MASK_FULL
     198/** The page shift to get the PD index. */
     199#define EPT_PD_SHIFT            X86_PD_PAE_SHIFT
     200/** The PD index mask (apply to a shifted page address). */
     201#define EPT_PD_MASK             X86_PD_PAE_MASK
    180202
    181203/**
     
    217239typedef union EPTPDE
    218240{
     241    /** Normal view. */
    219242    EPTPDEBITS      n;
     243    /** 2MB view (big). */
    220244    EPTPDE2MBITS    b;
     245    /** Unsigned integer view. */
     246    X86PGUINT       u;
    221247    /** 64 bit unsigned integer view. */
    222248    uint64_t        au64[1];
     249    /** 32 bit unsigned integer view. */
     250    uint32_t        au32[2];
    223251} EPTPDE;
    224252#pragma pack()
     
    269297#pragma pack()
    270298
     299/** Bits 12-51 - - EPT - Physical Page number of the next level. */
     300#define EPT_PTE_PG_MASK         X86_PTE_PAE_PG_MASK_FULL
     301/** The page shift to get the EPT PTE index. */
     302#define EPT_PT_SHIFT            X86_PT_PAE_SHIFT
     303/** The EPT PT index mask (apply to a shifted page address). */
     304#define EPT_PT_MASK             X86_PT_PAE_MASK
     305
    271306/**
    272307 * EPT Page Table Entry.
     
    275310typedef union EPTPTE
    276311{
     312    /** Normal view. */
    277313    EPTPTEBITS      n;
     314    /** Unsigned integer view. */
     315    X86PGUINT       u;
    278316    /** 64 bit unsigned integer view. */
    279317    uint64_t        au64[1];
     318    /** 32 bit unsigned integer view. */
     319    uint32_t        au32[2];
    280320} EPTPTE;
    281321#pragma pack()
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette