Changeset 32040 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 27, 2010 11:24:35 AM (14 years ago)

Author:

vboxsync

Message:

PGMAllPool.cpp: Added assertions to the table flushing code that check that we didn't set any bits we didn't intend to set.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (19 diffs)

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

@@ -4099 +4099 @@
 {
     for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pShwPT->a); i++)
+    {
+        Assert(!(pShwPT->a[i].u & RT_BIT_32(10)));
         if (pShwPT->a[i].n.u1Present)
         {
@@ -4107 +4109 @@
                 break;
         }
+    }
 }
 
@@ -4121 +4124 @@
 {
     for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pShwPT->a); i++)
+    {
+        Assert(   (PGMSHWPTEPAE_GET_U(pShwPT->a[i]) & UINT64_C(0x7ff0000000000400)) == 0
+               || (PGMSHWPTEPAE_GET_U(pShwPT->a[i]) & UINT64_C(0x7ff0000000000400)) == UINT64_C(0x7ff0000000000000));
         if (PGMSHWPTEPAE_IS_P(pShwPT->a[i]))
         {
@@ -4129 +4135 @@
                 break;
         }
+    }
 }
 
@@ -4143 +4150 @@
 {
     for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pShwPT->a); i++)
+    {
+        Assert(   (PGMSHWPTEPAE_GET_U(pShwPT->a[i]) & UINT64_C(0x7ff0000000000400)) == 0
+               || (PGMSHWPTEPAE_GET_U(pShwPT->a[i]) & UINT64_C(0x7ff0000000000400)) == UINT64_C(0x7ff0000000000000));
         if (PGMSHWPTEPAE_IS_P(pShwPT->a[i]))
         {
@@ -4151 +4161 @@
                 break;
         }
+    }
 }
 
@@ -4165 +4176 @@
     RTGCPHYS GCPhys = pPage->GCPhys + PAGE_SIZE * pPage->iFirstPresent;
     for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pShwPT->a); i++, GCPhys += PAGE_SIZE)
+    {
+        Assert(!(pShwPT->a[i].u & RT_BIT_32(10)));
         if (pShwPT->a[i].n.u1Present)
         {
@@ -4173 +4186 @@
                 break;
         }
+    }
 }
 
@@ -4187 +4201 @@
     RTGCPHYS GCPhys = pPage->GCPhys + PAGE_SIZE * pPage->iFirstPresent;
     for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pShwPT->a); i++, GCPhys += PAGE_SIZE)
+    {
+        Assert(   (PGMSHWPTEPAE_GET_U(pShwPT->a[i]) & UINT64_C(0x7ff0000000000400)) == 0
+               || (PGMSHWPTEPAE_GET_U(pShwPT->a[i]) & UINT64_C(0x7ff0000000000400)) == UINT64_C(0x7ff0000000000000));
         if (PGMSHWPTEPAE_IS_P(pShwPT->a[i]))
         {
@@ -4195 +4212 @@
                 break;
         }
+    }
 }
 
@@ -4209 +4227 @@
     RTGCPHYS GCPhys = pPage->GCPhys + PAGE_SIZE * pPage->iFirstPresent;
     for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pShwPT->a); i++, GCPhys += PAGE_SIZE)
+    {
+        Assert((pShwPT->a[i].u & UINT64_C(0xfff0000000000f80)) == 0);
         if (pShwPT->a[i].n.u1Present)
         {
@@ -4217 +4237 @@
                 break;
         }
+    }
 }
 
@@ -4232 +4253 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pShwPD->a); i++)
     {
+        Assert(!(pShwPD->a[i].u & RT_BIT_32(9)));
         if (    pShwPD->a[i].n.u1Present
             &&  !(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING)
@@ -4256 +4278 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pShwPD->a); i++)
     {
-        if (    pShwPD->a[i].n.u1Present
-            &&  !(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING)
-           )
+        Assert((pShwPD->a[i].u & (X86_PDE_PAE_MBZ_MASK_NX | UINT64_C(0x7ff0000000000200))) == 0);
+        if (   pShwPD->a[i].n.u1Present
+            && !(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING))
         {
 #ifdef PGM_WITH_LARGE_PAGES
@@ -4292 +4314 @@
     for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++)
     {
+        Assert((pShwPDPT->a[i].u & (X86_PDPE_PAE_MBZ_MASK | UINT64_C(0x7ff0000000000200))) == 0);
         if (    pShwPDPT->a[i].n.u1Present
             &&  !(pShwPDPT->a[i].u & PGM_PLXFLAGS_MAPPING)
@@ -4317 +4340 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pShwPDPT->a); i++)
     {
-        Assert(!(pShwPDPT->a[i].u & PGM_PLXFLAGS_MAPPING));
+        Assert((pShwPDPT->a[i].u & (X86_PDPE_LM_MBZ_MASK_NX | UINT64_C(0x7ff0000000000200))) == 0);
         if (pShwPDPT->a[i].n.u1Present)
         {
@@ -4342 +4365 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pShwPML4->a); i++)
     {
+        Assert((pShwPML4->a[i].u & (X86_PML4E_MBZ_MASK_NX | UINT64_C(0x7ff0000000000200))) == 0);
         if (pShwPML4->a[i].n.u1Present)
         {
@@ -4366 +4390 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pShwPD->a); i++)
     {
+        Assert((pShwPD->a[i].u & UINT64_C(0xfff0000000000f80)) == 0);
         if (pShwPD->a[i].n.u1Present)
         {
@@ -4401 +4426 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pShwPDPT->a); i++)
     {
+        Assert((pShwPDPT->a[i].u & UINT64_C(0xfff0000000000f80)) == 0);
         if (pShwPDPT->a[i].n.u1Present)
         {