Changeset 13923 in vbox

Timestamp:

Nov 6, 2008 3:01:24 PM (16 years ago)

Author:

vboxsync

Message:

PGM: darwin fix.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (2 diffs)

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

@@ -1010 +1010 @@
          * Check if the modified PDEs are present and mappings.
          */
-        const RTGCUINTPTR offPD = GCPhysFault & PAGE_OFFSET_MASK;
+        const RTGCUINTPTR   offPD = GCPhysFault & PAGE_OFFSET_MASK;
         const unsigned      iPD1  = offPD / sizeof(X86PDE);
         const unsigned      iPD2  = (offPD + cb - 1) / sizeof(X86PDE);
 
         Assert(cb > 0 && cb <= 8);
-        Assert(iPD1 < RT_ELEMENTS(pVM->pgm.s.CTX_SUFF(pGuestPD)->a)); /// @todo R3/R0 separation.
-        Assert(iPD2 < RT_ELEMENTS(pVM->pgm.s.CTX_SUFF(pGuestPD)->a));
+        Assert(iPD1 < X86_PG_ENTRIES);
+        Assert(iPD2 < X86_PG_ENTRIES);
 
 #ifdef DEBUG
@@ -1026 +1026 @@
         if (!pVM->pgm.s.fMappingsFixed)
         {
-            PX86PD pPDSrc = pVM->pgm.s.CTX_SUFF(pGuestPD);
+            PX86PD pPDSrc = pgmGstGet32bitPDPtr(&pVM->pgm.s);
             if (    (   pPDSrc->a[iPD1].n.u1Present
                      && pgmGetMapping(pVM, (RTGCPTR)(iPD1 << X86_PD_SHIFT)) )