Changeset 30895 in vbox

Timestamp:

Jul 17, 2010 2:25:17 AM (15 years ago)

Author:

vboxsync

Message:

build fixes.

Location:

trunk/src/VBox/VMM

Files:

• PGMInline.h (modified) (3 diffs)
• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (1 diff)

trunk/src/VBox/VMM/PGMInline.h

@@ -679 +679 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PDPT pGuestPDPT = NULL;
-    int rc = pgmR0DynMapGCPageOffInlined(&pVCpu->CTX_SUCC(pVM)->pgm.s, pPGM->GCPhysCR3, (void **)&pGuestPDPT);
+    int rc = pgmR0DynMapGCPageOffInlined(&pVCpu->CTX_SUFF(pVM)->pgm.s, pVCpu->pgm.s.GCPhysCR3, (void **)&pGuestPDPT);
     AssertRCReturn(rc, NULL);
 #else
@@ -798 +798 @@
 {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    int rc = pgmR0DynMapGCPageInlined(&pVCpu->CTX_SUFF(pVM)->pgm.s, pPGM->GCPhysCR3, (void **)ppPml4);
+    int rc = pgmR0DynMapGCPageInlined(&pVCpu->CTX_SUFF(pVM)->pgm.s, pVCpu->pgm.s.GCPhysCR3, (void **)ppPml4);
     if (RT_FAILURE(rc))
     {
@@ -840 +840 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PML4 pGuestPml4;
-    int rc = pgmR0DynMapGCPageInlined(PGMCPU2PGM(pPGM), pPGM->GCPhysCR3, (void **)&pGuestPml4);
+    int rc = pgmR0DynMapGCPageInlined(&pVCpu->CTX_SUFF(pVM)->pgm.s, pVCpu->pgm.s.GCPhysCR3, (void **)&pGuestPml4);
     AssertRCReturn(rc, NULL);
 #else

trunk/src/VBox/VMM/PGMInternal.h

@@ -289 +289 @@
  */
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-# define PGM_RCPHYS_2_PTR_BY_VMCPU(pVCpu, GCPhys, ppv) \
+# define PGM_GCPHYS_2_PTR_BY_VMCPU(pVCpu, GCPhys, ppv) \
      pgmR0DynMapGCPageInlined(&(pVCpu)->CTX_SUFF(pVM)->pgm.s, GCPhys, (void **)(ppv))
 #else

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

@@ -3501 +3501 @@
 
 #  elif PGM_GST_TYPE == PGM_TYPE_AMD64
-    unsigned        iPDSrc;
-    PX86PML4E       pPml4eSrc;
+    unsigned        iPDSrc = 0;         /* shut up gcc */
+    PX86PML4E       pPml4eSrc = NULL;   /* ditto */
     X86PDPE         PdpeSrc;
     PGSTPD          pPDSrc = pgmGstGetLongModePDPtr(pVCpu, GCPtrPage, &pPml4eSrc, &PdpeSrc, &iPDSrc);