VirtualBox

Changeset 18945 in vbox for trunk/src/VBox/VMM


Ignore:
Timestamp:
Apr 16, 2009 1:53:20 PM (16 years ago)
Author:
vboxsync
Message:

More Mac build fixes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/PGMInternal.h

    r18937 r18945  
    34143414{
    34153415#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     3416    PVM     pVM = PGMCPU2VM(pPGM);
    34163417    PCX86PD pGuestPD = NULL;
    3417     int rc = pgmR0DynMapGCPageInlined(pPGM, pPGM->GCPhysCR3, (void **)&pGuestPD);
     3418    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPD);
    34183419    if (RT_FAILURE(rc))
    34193420    {
    … …  
    34423443{
    34433444#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    3444     PX86PD pGuestPD = NULL;
    3445     int rc = pgmR0DynMapGCPageInlined(pPGM, pPGM->GCPhysCR3, (void **)&pGuestPD);
     3445    PVM     pVM = PGMCPU2VM(pPGM);
     3446    PX86PD  pGuestPD = NULL;
     3447
     3448    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPD);
    34463449    AssertRCReturn(rc, NULL);
    34473450#else
    … …  
    34653468{
    34663469#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    3467     PX86PD pGuestPD = NULL;
    3468     int rc = pgmR0DynMapGCPageInlined(pPGM, pPGM->GCPhysCR3, (void **)&pGuestPD);
     3470    PVM     pVM = PGMCPU2VM(pPGM);
     3471    PX86PD  pGuestPD = NULL;
     3472
     3473    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPD);
    34693474    AssertRCReturn(rc, NULL);
    34703475#else
    … …  
    34893494{
    34903495#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     3496    PVM      pVM = PGMCPU2VM(pPGM);
    34913497    PX86PDPT pGuestPDPT = NULL;
    3492     int rc = pgmR0DynMapGCPageInlined(pPGM, pPGM->GCPhysCR3, (void **)&pGuestPDPT);
     3498
     3499    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPDPT);
    34933500    AssertRCReturn(rc, NULL);
    34943501#else
    … …  
    35173524#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    35183525    PX86PDPT pGuestPDPT = 0;
    3519     int rc = pgmR0DynMapGCPageInlined(pPGM, pPGM->GCPhysCR3, (void **)&pGuestPDPT);
     3526    PVM      pVM = PGMCPU2VM(pPGM);
     3527
     3528    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPDPT);
    35203529    AssertRCReturn(rc, 0);
    35213530#else
    … …  
    35493558#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    35503559        PX86PDPAE   pGuestPD = NULL;
    3551         int rc = pgmR0DynMapGCPageInlined(pPGM, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
     3560        PVM         pVM = PGMCPU2VM(pPGM);
     3561
     3562        int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
    35523563        AssertRCReturn(rc, NULL);
    35533564#else
    … …  
    35843595#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    35853596        PX86PDPAE   pGuestPD = NULL;
    3586         int rc = pgmR0DynMapGCPageInlined(pPGM, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
     3597        PVM         pVM = PGMCPU2VM(pPGM);
     3598
     3599        int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
    35873600        AssertRCReturn(rc, NULL);
    35883601#else
    … …  
    36203633#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    36213634            PX86PDPAE   pGuestPD = NULL;
    3622             int rc = pgmR0DynMapGCPageInlined(pPGM, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
     3635            PVM         pVM = PGMCPU2VM(pPGM);
     3636
     3637            int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
    36233638            AssertRCReturn(rc, ZeroPde);
    36243639#else
    … …  
    36603675#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    36613676        PX86PDPAE   pGuestPD = NULL;
    3662         int rc = pgmR0DynMapGCPageInlined(pPGM, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
     3677        PVM         pVM = PGMCPU2VM(pPGM);
     3678
     3679        int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
    36633680        AssertRCReturn(rc, NULL);
    36643681#else
    … …  
    36873704#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    36883705    PX86PML4 pGuestPml4;
    3689     int rc = pgmR0DynMapGCPageInlined(pPGM, pPGM->GCPhysCR3, (void **)&pGuestPml4);
     3706    PVM      pVM = PGMCPU2VM(pPGM);
     3707
     3708    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPml4);
    36903709    AssertRCReturn(rc, NULL);
    36913710#else
    … …  
    37123731#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    37133732    PX86PML4 pGuestPml4;
    3714     int rc = pgmR0DynMapGCPageInlined(pPGM, pPGM->GCPhysCR3, (void **)&pGuestPml4);
     3733    PVM      pVM = PGMCPU2VM(pPGM);
     3734
     3735    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPml4);
    37153736    AssertRCReturn(rc, NULL);
    37163737#else
    … …  
    37373758#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
    37383759    PX86PML4 pGuestPml4;
    3739     int rc = pgmR0DynMapGCPageInlined(pPGM, pPGM->GCPhysCR3, (void **)&pGuestPml4);
     3760    PVM      pVM = PGMCPU2VM(pPGM);
     3761
     3762    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPml4);
    37403763    if (RT_FAILURE(rc))
    37413764    {
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