Changeset 1823 in vbox for trunk/src/VBox

Timestamp:

Mar 30, 2007 11:29:22 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

20009

Message:

Extra safety check.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (1 diff)

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

@@ -1627 +1627 @@
                  */
                 PPGMPOOLPAGE    pShwPage = pgmPoolGetPageByHCPhys(pVM, pPdeDst->u & SHW_PDE_PG_MASK);
-                PSHWPT          pPTDst   = (PSHWPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage);
-                PSHWPTE         pPteDst  = &pPTDst->a[(GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK];
-                if (    pPteDst->n.u1Present    /** @todo Optimize accessed bit emulation? */
-                    &&  (pPteDst->u & PGM_PTFLAGS_TRACK_DIRTY))
-                {
-                    LogFlow(("DIRTY page trap addr=%VGv\n", GCPtrPage));
+
+                if (pShwPage)
+                {
+                    PSHWPT          pPTDst   = (PSHWPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage);
+                    PSHWPTE         pPteDst  = &pPTDst->a[(GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK];
+                    if (    pPteDst->n.u1Present    /** @todo Optimize accessed bit emulation? */
+                        &&  (pPteDst->u & PGM_PTFLAGS_TRACK_DIRTY))
+                    {
+                        LogFlow(("DIRTY page trap addr=%VGv\n", GCPtrPage));
 #ifdef VBOX_STRICT
-                    RTHCPHYS HCPhys;
-                    rc = PGMRamGCPhys2HCPhysWithFlags(&pVM->pgm.s, pPteSrc->u & X86_PTE_PG_MASK, &HCPhys);
-                    if (VBOX_SUCCESS(rc))
-                        AssertMsg(!(HCPhys & (MM_RAM_FLAGS_PHYSICAL_ALL | MM_RAM_FLAGS_VIRTUAL_ALL | MM_RAM_FLAGS_PHYSICAL_WRITE | MM_RAM_FLAGS_VIRTUAL_WRITE)),
-                                  ("Unexpected dirty bit tracking on monitored page %VGv (phys %VGp)!!!!!!\n", GCPtrPage, pPteSrc->u & X86_PTE_PAE_PG_MASK));
+                        RTHCPHYS HCPhys;
+                        rc = PGMRamGCPhys2HCPhysWithFlags(&pVM->pgm.s, pPteSrc->u & X86_PTE_PG_MASK, &HCPhys);
+                        if (VBOX_SUCCESS(rc))
+                            AssertMsg(!(HCPhys & (MM_RAM_FLAGS_PHYSICAL_ALL | MM_RAM_FLAGS_VIRTUAL_ALL | MM_RAM_FLAGS_PHYSICAL_WRITE | MM_RAM_FLAGS_VIRTUAL_WRITE)),
+                                      ("Unexpected dirty bit tracking on monitored page %VGv (phys %VGp)!!!!!!\n", GCPtrPage, pPteSrc->u & X86_PTE_PAE_PG_MASK));
 #endif
-                    STAM_COUNTER_INC(&pVM->pgm.s.CTXMID(Stat,DirtyPageTrap));
-
-                    Assert(pPteSrc->n.u1Write);
-
-                    pPteDst->n.u1Write    = 1;
-                    pPteDst->n.u1Dirty    = 1;
-                    pPteDst->n.u1Accessed = 1;
-                    pPteDst->au32[0]     &= ~PGM_PTFLAGS_TRACK_DIRTY;
-                    PGM_INVL_PG(GCPtrPage);
-
-                    STAM_PROFILE_STOP(&pVM->pgm.s.CTXMID(Stat,DirtyBitTracking), a);
-                    return VINF_PGM_HANDLED_DIRTY_BIT_FAULT;
-                }
+                        STAM_COUNTER_INC(&pVM->pgm.s.CTXMID(Stat,DirtyPageTrap));
+
+                        Assert(pPteSrc->n.u1Write);
+
+                        pPteDst->n.u1Write    = 1;
+                        pPteDst->n.u1Dirty    = 1;
+                        pPteDst->n.u1Accessed = 1;
+                        pPteDst->au32[0]     &= ~PGM_PTFLAGS_TRACK_DIRTY;
+                        PGM_INVL_PG(GCPtrPage);
+
+                        STAM_PROFILE_STOP(&pVM->pgm.s.CTXMID(Stat,DirtyBitTracking), a);
+                        return VINF_PGM_HANDLED_DIRTY_BIT_FAULT;
+                    }
+                }
+                else
+                    AssertMsgFailed(("pgmPoolGetPageByHCPhys %VGp failed!\n", pPdeDst->u & SHW_PDE_PG_MASK));
             }
         }