Changeset 14138 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

build fix

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (2 diffs)
• VMMAll/PGMAllBth.h (modified) (2 diffs)
• VMMAll/PGMAllShw.h (modified) (2 diffs)
• VMMSwitcher.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3839 +3839 @@
  * @param   GCPtr       Address.
  */
-DECLINLINE(X86PGPAEUINT) pgmShwGetPaePDE(PPGM pPGM, RTGCPTR GCPtr)
+DECLINLINE(X86PDEPAE) pgmShwGetPaePDE(PPGM pPGM, RTGCPTR GCPtr)
 {
     const unsigned  iPdpt = (GCPtr >> X86_PDPT_SHIFT)   & X86_PDPT_MASK_PAE;
@@ -3846 +3846 @@
     PCX86PDPAE      pPD;
     int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->aHCPhysPaePDs[iPdpt], &pPD);
-    AssertRCReturn(rc, 0);
-    return pPD->a[iPd].u;
-#else
-    return pPGM->CTX_SUFF(apShwPaePDs)[iPdpt]->a[iPd].u;
+    if (RT_FAILURE(rc))
+    {
+        X86PDEPAE ZeroPDE = {0};
+        return ZeroPDE;
+    }
+    return pPD->a[iPd];
+#else
+    return pPGM->CTX_SUFF(apShwPaePDs)[iPdpt]->a[iPd];
 #endif
 }

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

@@ -1862 +1862 @@
     X86PDE          PdeDst = pVM->pgm.s.CTXMID(p,32BitPD)->a[iPDDst];
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
-    X86PDEPAE       PdeDst;
-    PdeDst.u = pgmShwGetPaePDE(&pVM->pgm.s, GCPtrPage);
+    X86PDEPAE       PdeDst = pgmShwGetPaePDE(&pVM->pgm.s, GCPtrPage);
 
 # elif PGM_SHW_TYPE == PGM_TYPE_AMD64
@@ -2858 +2857 @@
         const X86PDE    PdeDst = pVM->pgm.s.CTXMID(p,32BitPD)->a[GCPtrPage >> SHW_PD_SHIFT];
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
-        X86PDEPAE       PdeDst;
-        PdeDst.u = pgmShwGetPaePDE(&pVM->pgm.s, GCPtrPage);
+        const X86PDEPAE PdeDst = pgmShwGetPaePDE(&pVM->pgm.s, GCPtrPage);
 # elif PGM_SHW_TYPE == PGM_TYPE_AMD64
         const unsigned  iPDDst = ((GCPtrPage >> SHW_PD_SHIFT) & SHW_PD_MASK);

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

@@ -180 +180 @@
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
     bool            fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE);
-    X86PDEPAE       Pde;
-    Pde.u = pgmShwGetPaePDE(&pVM->pgm.s, GCPtr);
+    X86PDEPAE       Pde = pgmShwGetPaePDE(&pVM->pgm.s, GCPtr);
 
 # elif PGM_SHW_TYPE == PGM_TYPE_EPT
@@ -319 +318 @@
 
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
-        X86PDEPAE       Pde;
-        Pde.u = pgmShwGetPaePDE(&pVM->pgm.s, GCPtr);
+        X86PDEPAE       Pde = pgmShwGetPaePDE(&pVM->pgm.s, GCPtr);
 
 # elif PGM_SHW_TYPE == PGM_TYPE_EPT

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -853 +853 @@
 
 /**
+ * Relocator for the 32-Bit to AMD64 world switcher.
+ */
+DECLCALLBACK(void) vmmR3Switcher32BitToPAE_Relocate(PVM pVM, PVMMSWITCHERDEF pSwitcher, RTR0PTR R0PtrCode, uint8_t *pu8CodeR3, RTGCPTR GCPtrCode, uint32_t u32IDCode)
+{
+    vmmR3SwitcherGenericRelocate(pVM, pSwitcher, R0PtrCode, pu8CodeR3, GCPtrCode, u32IDCode,
+                                 SELMGetHyperCS(pVM), SELMGetHyperDS(pVM), SELMGetHyperTSS(pVM), SELMGetHyperGDT(pVM), 0);
+}
+
+
+/**
  * Relocator for the PAE to 32-Bit world switcher.
  */