Changeset 18948 in vbox for trunk

Timestamp:

Apr 16, 2009 2:04:05 PM (16 years ago)

Author:

vboxsync

Message:

Wrong Mac fixes

File:

• trunk/src/VBox/VMM/PGMInternal.h (modified) (12 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3414 +3414 @@
 {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    PVM     pVM = PGMCPU2VM(pPGM);
     PCX86PD pGuestPD = NULL;
-    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPD);
+    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPD);
     if (RT_FAILURE(rc))
     {
@@ -3443 +3442 @@
 {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    PVM     pVM = PGMCPU2VM(pPGM);
     PX86PD  pGuestPD = NULL;
-
-    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPD);
+    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPD);
     AssertRCReturn(rc, NULL);
 #else
@@ -3468 +3465 @@
 {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    PVM     pVM = PGMCPU2VM(pPGM);
     PX86PD  pGuestPD = NULL;
-
-    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPD);
+    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPD);
     AssertRCReturn(rc, NULL);
 #else
@@ -3494 +3489 @@
 {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    PVM      pVM = PGMCPU2VM(pPGM);
     PX86PDPT pGuestPDPT = NULL;
-
-    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPDPT);
+    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPDPT);
     AssertRCReturn(rc, NULL);
 #else
@@ -3524 +3517 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PDPT pGuestPDPT = 0;
-    PVM      pVM = PGMCPU2VM(pPGM);
-
-    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPDPT);
+    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPDPT);
     AssertRCReturn(rc, 0);
 #else
@@ -3558 +3549 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
         PX86PDPAE   pGuestPD = NULL;
-        PVM         pVM = PGMCPU2VM(pPGM);
-
-        int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
+        int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
         AssertRCReturn(rc, NULL);
 #else
@@ -3595 +3584 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
         PX86PDPAE   pGuestPD = NULL;
-        PVM         pVM = PGMCPU2VM(pPGM);
-
-        int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
+        int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
         AssertRCReturn(rc, NULL);
 #else
@@ -3633 +3620 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
             PX86PDPAE   pGuestPD = NULL;
-            PVM         pVM = PGMCPU2VM(pPGM);
-
-            int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
+            int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
             AssertRCReturn(rc, ZeroPde);
 #else
@@ -3675 +3660 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
         PX86PDPAE   pGuestPD = NULL;
-        PVM         pVM = PGMCPU2VM(pPGM);
-
-        int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
+        int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pGuestPDPT->a[iPdpt].u & X86_PDPE_PG_MASK, (void **)&pGuestPD);
         AssertRCReturn(rc, NULL);
 #else
@@ -3704 +3687 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PML4 pGuestPml4;
-    PVM      pVM = PGMCPU2VM(pPGM);
-
-    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPml4);
+    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPml4);
     AssertRCReturn(rc, NULL);
 #else
@@ -3731 +3712 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PML4 pGuestPml4;
-    PVM      pVM = PGMCPU2VM(pPGM);
-
-    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPml4);
+    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPml4);
     AssertRCReturn(rc, NULL);
 #else
@@ -3758 +3737 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PML4 pGuestPml4;
-    PVM      pVM = PGMCPU2VM(pPGM);
-
-    int rc = pgmR0DynMapGCPageInlined(&pVM->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPml4);
+    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPml4);
     if (RT_FAILURE(rc))
     {