VirtualBox

Changeset 9041

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

spaces.

Files:

Legend:

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

    r9032 r9041  
    7878PGM_BTH_DECL(int, Trap0eHandler)(PVM pVM, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault) 
    7979{ 
    80 #if (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT || PGM_GST_TYPE == PGM_TYPE_PAE || PGM_GST_TYPE == PGM_TYPE_AMD64) \ 
     80#if   (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT || PGM_GST_TYPE == PGM_TYPE_PAE || PGM_GST_TYPE == PGM_TYPE_AMD64) \ 
    8181    && PGM_SHW_TYPE != PGM_TYPE_NESTED 
    8282 
     
    565565            else 
    566566            { 
    567                 /* When the guest accesses invalid physical memory (e.g. probing of RAM or accessing a remapped MMIO range), then we'll fall  
     567                /* When the guest accesses invalid physical memory (e.g. probing of RAM or accessing a remapped MMIO range), then we'll fall 
    568568                 * back to the recompiler to emulate the instruction. 
    569569                 */ 
     
    14181418    LogFlow(("SyncPage: GCPtrPage=%VGv cPages=%d uErr=%#x\n", GCPtrPage, cPages, uErr)); 
    14191419 
    1420 #if    (PGM_GST_TYPE == PGM_TYPE_32BIT \ 
    1421     || PGM_GST_TYPE == PGM_TYPE_PAE) \ 
     1420#if    (   PGM_GST_TYPE == PGM_TYPE_32BIT \ 
     1421        || PGM_GST_TYPE == PGM_TYPE_PAE) \ 
    14221422    && PGM_SHW_TYPE != PGM_TYPE_NESTED 
    14231423 
     
    16621662 
    16631663#elif (PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT) \ 
    1664       && PGM_SHW_TYPE != PGM_TYPE_NESTED 
     1664    && PGM_SHW_TYPE != PGM_TYPE_NESTED 
    16651665 
    16661666# ifdef PGM_SYNC_N_PAGES 
     
    20282028 
    20292029UpperLevelPageFault: 
    2030     /* Pagefault detected while checking the PML4E, PDPE or PDE.  
     2030    /* Pagefault detected while checking the PML4E, PDPE or PDE. 
    20312031     * Single exit handler to get rid of duplicate code paths. 
    20322032     */ 
     
    20372037    LogFlow(("CheckPageFault: real page fault at %VGv (%d)\n", GCPtrPage, uPageFaultLevel)); 
    20382038 
    2039     if (     
     2039    if ( 
    20402040#  if PGM_GST_TYPE == PGM_TYPE_AMD64 
    20412041            pPml4eSrc->n.u1Present && 
     
    25232523PGM_BTH_DECL(int, PrefetchPage)(PVM pVM, RTGCUINTPTR GCPtrPage) 
    25242524{ 
    2525 #if (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT || PGM_GST_TYPE == PGM_TYPE_PAE) \ 
     2525#if   (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT || PGM_GST_TYPE == PGM_TYPE_PAE) \ 
    25262526    && PGM_SHW_TYPE != PGM_TYPE_AMD64 && PGM_SHW_TYPE != PGM_TYPE_NESTED 
    25272527    /* 
     
    26032603 
    26042604    Assert(!HWACCMIsNestedPagingActive(pVM)); 
    2605 #if (PGM_GST_TYPE == PGM_TYPE_32BIT ||  PGM_GST_TYPE == PGM_TYPE_REAL ||  PGM_GST_TYPE == PGM_TYPE_PROT || PGM_GST_TYPE == PGM_TYPE_PAE) \ 
     2605#if   (PGM_GST_TYPE == PGM_TYPE_32BIT ||  PGM_GST_TYPE == PGM_TYPE_REAL ||  PGM_GST_TYPE == PGM_TYPE_PROT || PGM_GST_TYPE == PGM_TYPE_PAE) \ 
    26062606    && PGM_SHW_TYPE != PGM_TYPE_AMD64 && PGM_SHW_TYPE != PGM_TYPE_NESTED 
    26072607 
     
    27602760{ 
    27612761#if PGM_SHW_TYPE == PGM_TYPE_NESTED 
    2762     /* @todo check if this is really necessary */ 
     2762    /** @todo check if this is really necessary */ 
    27632763    HWACCMFlushTLB(pVM); 
    27642764    return VINF_SUCCESS; 
    2765 #else 
     2765 
     2766#else /* PGM_SHW_TYPE != PGM_TYPE_NESTED */ 
    27662767    if (VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3)) 
    27672768        fGlobal = true; /* Change this CR3 reload to be a global one. */ 
     
    27802781    STAM_PROFILE_STOP(&pVM->pgm.s.CTXMID(Stat,SyncCR3Handlers), h); 
    27812782 
    2782 #ifdef PGMPOOL_WITH_MONITORING 
     2783# ifdef PGMPOOL_WITH_MONITORING 
    27832784    /* 
    27842785     * When monitoring shadowed pages, we reset the modification counters on CR3 sync. 
     
    27912792    else 
    27922793    { 
    2793 # ifdef IN_RING3 
     2794# ifdef IN_RING3 
    27942795        pVM->pgm.s.fSyncFlags &= ~PGM_SYNC_CLEAR_PGM_POOL; 
    27952796        pgmPoolClearAll(pVM); 
    2796 # else 
     2797# else 
    27972798        LogFlow(("SyncCR3: PGM_SYNC_CLEAR_PGM_POOL is set -> VINF_PGM_SYNC_CR3\n")); 
    27982799        return VINF_PGM_SYNC_CR3; 
    2799 # endif 
    2800     } 
    2801 #endif 
     2800# endif 
     2801    } 
     2802# endif 
    28022803 
    28032804    Assert(fGlobal || (cr4 & X86_CR4_PGE)); 
    28042805    MY_STAM_COUNTER_INC(fGlobal ? &pVM->pgm.s.CTXMID(Stat,SyncCR3Global) : &pVM->pgm.s.CTXMID(Stat,SyncCR3NotGlobal)); 
    28052806 
    2806 #if PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE 
     2807# if PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE 
    28072808    /* 
    28082809     * Get page directory addresses. 
     
    28632864                for (unsigned iPD = 0; iPD < ELEMENTS(pPDSrc->a); iPD++) 
    28642865                { 
    2865                     if (   pPDEDst[iPD].n.u1Present  
     2866                    if (   pPDEDst[iPD].n.u1Present 
    28662867                        && !(pPDEDst[iPD].u & PGM_PDFLAGS_MAPPING)) 
    28672868                    { 
     
    30233024                } 
    30243025            } 
    3025  if PGM_GST_TYPE == PGM_TYPE_PAE 
     3026if PGM_GST_TYPE == PGM_TYPE_PAE 
    30263027            else if (iPD + iPDPTE * X86_PG_PAE_ENTRIES != iPdNoMapping) 
    3027  else 
     3028else 
    30283029            else if (iPD != iPdNoMapping) 
    3029  endif 
     3030endif 
    30303031            { 
    30313032                /* 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy