Changeset 14141 in vbox for trunk/src/VBox

Timestamp:

Nov 12, 2008 7:12:30 PM (16 years ago)

Author:

vboxsync

Message:

PGM: More union returns.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (5 diffs)
• VMMAll/PGMAll.cpp (modified) (2 diffs)
• VMMAll/PGMAllGst.h (modified) (3 diffs)
• VMMAll/PGMAllShw.h (modified) (2 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3297 +3297 @@
  * @param   GCPtr       The address.
  */
-DECLINLINE(X86PGUINT) pgmGstGet32bitPDE(PPGM pPGM, RTGCPTR GCPtr)
+DECLINLINE(X86PDE) pgmGstGet32bitPDE(PPGM pPGM, RTGCPTR GCPtr)
 {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PCX86PD pGuestPD = 0;
     int rc = PGMDynMapGCPage(PGM2VM(pPGM), pPGM->GCPhysCR3, (void **)pGuestPD);
-    AssertRCReturn(rc, 0);
-    return pGuestPD->a[GCPtr >> X86_PD_SHIFT].u;
-#else
-    return pPGM->CTX_SUFF(pGuestPD)->a[GCPtr >> X86_PD_SHIFT].u;
+    if (RT_FAILURE(rc))
+    {
+        X86PDE ZeroPde = {0};
+        AssertMsgFailedReturn(("%Rrc\n", rc), ZeroPde);
+    }
+    return pGuestPD->a[GCPtr >> X86_PD_SHIFT];
+#else
+    return pPGM->CTX_SUFF(pGuestPD)->a[GCPtr >> X86_PD_SHIFT];
 #endif
 }
@@ -3606 +3610 @@
  * @param   iPml4       The index.
  */
-DECLINLINE(X86PGPAEUINT) pgmGstGetLongModePML4E(PPGM pPGM, unsigned int iPml4)
+DECLINLINE(X86PML4E) pgmGstGetLongModePML4E(PPGM pPGM, unsigned int iPml4)
 {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PML4 pGuestPml4;
     int rc = PGMDynMapGCPage(PGM2VM(pPGM), pPGM->GCPhysCR3, (void **)pGuestPml4);
-    AssertRCReturn(rc, 0);
-    return pGuestPml4->a[iPml4].u;
+    if (RT_FAILURE(rc))
+    {
+        X86PML4E ZeroPml4e = {0};
+        AssertMsgFailedReturn(("%Rrc\n", rc), ZeroPml4e);
+    }
+    return pGuestPml4->a[iPml4];
 #else
     Assert(pPGM->CTX_SUFF(pGstAmd64PML4));
-    return pPGM->CTX_SUFF(pGstAmd64PML4)->a[iPml4].u;
+    return pPGM->CTX_SUFF(pGstAmd64PML4)->a[iPml4];
 #endif
 }
@@ -3848 +3856 @@
     if (RT_FAILURE(rc))
     {
-        X86PDEPAE ZeroPDE = {0};
-        return ZeroPDE;
+        X86PDEPAE ZeroPde = {0};
+        AssertMsgFailedReturn(("%Rrc\n", rc), ZeroPde);
     }
     return pPD->a[iPd];
@@ -3910 +3918 @@
  * @param   GCPtr       The address.
  */
-DECLINLINE(X86PGPAEUINT) pgmShwGetLongModePML4E(PPGM pPGM, RTGCPTR GCPtr)
+DECLINLINE(X86PML4E) pgmShwGetLongModePML4E(PPGM pPGM, RTGCPTR GCPtr)
 {
     const unsigned  iPml4 = ((RTGCUINTPTR64)GCPtr >> X86_PML4_SHIFT) & X86_PML4_MASK;
@@ -3917 +3925 @@
     Assert(pPGM->HCPhysPaePML4 != 0 && pPGM->HCPhysPaePML4 != NIL_RTHCPHYS);
     int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysPaePML4, &pShwPml4);
-    AssertRCReturn(rc, 0);
-    return pShwPml4->a[iPml4].u;
+    if (RT_FAILURE(rc))
+    {
+        X86PML4E ZeroPml4e = {0};
+        AssertMsgFailedReturn(("%Rrc\n", rc), ZeroPml4e);
+    }
+    return pShwPml4->a[iPml4];
 # else
     Assert(pPGM->CTX_SUFF(pShwPaePml4));
-    return pPGM->CTX_SUFF(pShwPaePml4)->a[iPml4].u;
+    return pPGM->CTX_SUFF(pShwPaePml4)->a[iPml4];
 # endif
 }

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -932 +932 @@
              *        are fine.) */
             Assert(pVM->pgm.s.CTX_SUFF(pShwAmd64CR3));
-            Pml4eGst.u = pgmGstGetLongModePML4E(&pVM->pgm.s, iPml4);
+            Pml4eGst = pgmGstGetLongModePML4E(&pVM->pgm.s, iPml4);
 
             rc = pgmPoolAlloc(pVM, Pml4eGst.u & X86_PML4E_PG_MASK,
@@ -971 +971 @@
             /** @todo why are we looking up the guest PDPTE here?  Isn't pGstPdpe
              *        trustworthy? */
-            Pml4eGst.u = pgmGstGetLongModePML4E(&pVM->pgm.s, iPml4);
+            Pml4eGst = pgmGstGetLongModePML4E(&pVM->pgm.s, iPml4);
             PX86PDPT pPdptGst;
             rc = PGM_GCPHYS_2_PTR(pVM, Pml4eGst.u & X86_PML4E_PG_MASK, &pPdptGst);

trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

@@ -179 +179 @@
      */
 # if PGM_GST_TYPE == PGM_TYPE_32BIT
-    X86PDE Pde;
-    Pde.u = pgmGstGet32bitPDE(&pVM->pgm.s, GCPtr);
+    X86PDE      Pde = pgmGstGet32bitPDE(&pVM->pgm.s, GCPtr);
 
 #elif PGM_GST_TYPE == PGM_TYPE_PAE
-    X86PDEPAE    Pde;
-    bool         fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE);
+    X86PDEPAE   Pde;
+    bool        fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE);
 
     /* pgmGstGetPaePDE will return 0 if the PDPTE is marked as not present
@@ -192 +191 @@
 
 #elif PGM_GST_TYPE == PGM_TYPE_AMD64
-    PX86PML4E    pPml4e;
-    X86PDPE      Pdpe;
-    X86PDEPAE    Pde;
-    bool         fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE);
+    PX86PML4E   pPml4e;
+    X86PDPE     Pdpe;
+    X86PDEPAE   Pde;
+    bool        fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE);
 
     Pde.u = pgmGstGetLongModePDE(&pVM->pgm.s, GCPtr, &pPml4e, &Pdpe);
@@ -401 +400 @@
 
 # if PGM_GST_TYPE == PGM_TYPE_32BIT
-    X86PDE    Pde;
-    Pde.u = pgmGstGet32bitPDE(&pVM->pgm.s, GCPtr);
+    X86PDE    Pde = pgmGstGet32bitPDE(&pVM->pgm.s, GCPtr);
 # elif PGM_GST_TYPE == PGM_TYPE_PAE
     X86PDEPAE Pde;

trunk/src/VBox/VMM/VMMAll/PGMAllShw.h

@@ -149 +149 @@
 
     /* PML4 */
-    X86PML4E        Pml4e;
-    Pml4e.u = pgmShwGetLongModePML4E(&pVM->pgm.s, GCPtr);
+    X86PML4E        Pml4e = pgmShwGetLongModePML4E(&pVM->pgm.s, GCPtr);
     if (!Pml4e.n.u1Present)
         return VERR_PAGE_TABLE_NOT_PRESENT;
@@ -294 +293 @@
         X86PDEPAE       Pde;
         /* PML4 */
-        X86PML4E        Pml4e;
-        Pml4e.u = pgmShwGetLongModePML4E(&pVM->pgm.s, GCPtr);
+        X86PML4E        Pml4e = pgmShwGetLongModePML4E(&pVM->pgm.s, GCPtr);
         if (!Pml4e.n.u1Present)
             return VERR_PAGE_TABLE_NOT_PRESENT;