VirtualBox

Changeset 9039

Show
Ignore:
Timestamp:
05/21/08 23:28:34 (8 months ago)
Author:
vboxsync
Message:

spaces and inverted comments.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/VBox/VMM/VMMAll/PGMAllShw.h

    r9023 r9039  
    114114#if PGM_SHW_TYPE == PGM_TYPE_NESTED 
    115115    return VERR_PAGE_TABLE_NOT_PRESENT; 
    116 #else 
     116 
     117#else /* PGM_SHW_TYPE != PGM_TYPE_NESTED */ 
    117118    /* 
    118119     * Get the PDE. 
    119120     */ 
    120 #if PGM_SHW_TYPE == PGM_TYPE_AMD64 
     121# if PGM_SHW_TYPE == PGM_TYPE_AMD64 
    121122    bool      fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE); 
    122123    X86PDEPAE Pde; 
     
    152153    Pde.n.u1NoExecute &= Pml4e.n.u1NoExecute & Pdpe.lm.u1NoExecute; 
    153154 
    154 #elif PGM_SHW_TYPE == PGM_TYPE_PAE 
     155# elif PGM_SHW_TYPE == PGM_TYPE_PAE 
    155156    bool           fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE); 
    156157    const unsigned iPDPT = (GCPtr >> SHW_PDPT_SHIFT) & SHW_PDPT_MASK; 
     
    158159    X86PDEPAE      Pde = CTXMID(pVM->pgm.s.ap,PaePDs)[iPDPT]->a[iPd]; 
    159160 
    160 #else /* PGM_TYPE_32BIT */ 
     161# else /* PGM_TYPE_32BIT */ 
    161162    const unsigned iPd = (GCPtr >> X86_PD_SHIFT) & X86_PD_MASK; 
    162163    X86PDE Pde = CTXMID(pVM->pgm.s.p,32BitPD)->a[iPd]; 
    163 #endif 
     164# endif 
    164165    if (!Pde.n.u1Present) 
    165166        return VERR_PAGE_TABLE_NOT_PRESENT; 
     
    179180    else /* mapping: */ 
    180181    { 
    181 #if PGM_SHW_TYPE == PGM_TYPE_AMD64 
     182# if PGM_SHW_TYPE == PGM_TYPE_AMD64 
    182183        AssertFailed(); /* can't happen */ 
    183 #else 
     184# else 
    184185        Assert(pgmMapAreMappingsEnabled(&pVM->pgm.s)); 
    185186 
    186187        PPGMMAPPING pMap = pgmGetMapping(pVM, (RTGCPTR)GCPtr); 
    187188        AssertMsgReturn(pMap, ("GCPtr=%VGv\n", GCPtr), VERR_INTERNAL_ERROR); 
    188 # if PGM_SHW_TYPE == PGM_TYPE_32BIT 
     189# if PGM_SHW_TYPE == PGM_TYPE_32BIT 
    189190        pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> X86_PD_SHIFT].CTXALLSUFF(pPT); 
    190 # else /* PAE */ 
     191# else /* PAE */ 
    191192        pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> X86_PD_SHIFT].CTXALLSUFF(paPaePTs); 
     193#  endif 
    192194# endif 
    193 #endif  
    194195    } 
    195196    const unsigned iPt = (GCPtr >> SHW_PT_SHIFT) & SHW_PT_MASK; 
     
    218219 
    219220    return VINF_SUCCESS; 
    220 #endif /* PGM_SHW_TYPE == PGM_TYPE_NESTED */ 
     221#endif /* PGM_SHW_TYPE != PGM_TYPE_NESTED */ 
    221222} 
    222223 
     
    238239PGM_SHW_DECL(int, ModifyPage)(PVM pVM, RTGCUINTPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask) 
    239240{ 
    240 #if PGM_SHW_TYPE == PGM_TYPE_NESTED 
     241# if PGM_SHW_TYPE == PGM_TYPE_NESTED 
    241242    return VERR_PAGE_TABLE_NOT_PRESENT; 
    242 #else 
     243 
     244# else /* PGM_SHW_TYPE != PGM_TYPE_NESTED */ 
    243245    int rc; 
    244246 
     
    251253         * Get the PDE. 
    252254         */ 
    253 #if PGM_SHW_TYPE == PGM_TYPE_AMD64 
     255# if PGM_SHW_TYPE == PGM_TYPE_AMD64 
    254256        X86PDEPAE Pde; 
    255257        /* PML4 */ 
     
    277279        Pde = pPd->a[iPd]; 
    278280 
    279 #elif PGM_SHW_TYPE == PGM_TYPE_PAE 
     281# elif PGM_SHW_TYPE == PGM_TYPE_PAE 
    280282        const unsigned iPDPT = (GCPtr >> SHW_PDPT_SHIFT) & SHW_PDPT_MASK; 
    281283        const unsigned iPd = (GCPtr >> X86_PD_PAE_SHIFT) & X86_PD_PAE_MASK; 
    282284        X86PDEPAE Pde = CTXMID(pVM->pgm.s.ap,PaePDs)[iPDPT]->a[iPd]; 
    283285 
    284 #else /* PGM_TYPE_32BIT */ 
     286# else /* PGM_TYPE_32BIT */ 
    285287        const unsigned iPd = (GCPtr >> X86_PD_SHIFT) & X86_PD_MASK; 
    286288        X86PDE Pde = CTXMID(pVM->pgm.s.p,32BitPD)->a[iPd]; 
    287 #endif 
     289# endif 
    288290        if (!Pde.n.u1Present) 
    289291            return VERR_PAGE_TABLE_NOT_PRESENT; 
     
    315317        } 
    316318    } 
    317 #endif /* PGM_SHW_TYPE == PGM_TYPE_NESTED */ 
     319# endif /* PGM_SHW_TYPE != PGM_TYPE_NESTED */ 
    318320} 
    319321 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy