Changeset 10397 in vbox for trunk

Timestamp:

Jul 9, 2008 9:05:42 AM (17 years ago)

Author:

vboxsync

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

33053

Message:

Wrong assertions and order.

File:

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

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

@@ -2600 +2600 @@
     {
         case PGMPOOLKIND_ROOT_32BIT_PD:
-            Assert(!(u.pau32[pUser->iUser] & PGM_PDFLAGS_MAPPING));
             Assert(pUser->iUserTable < X86_PG_ENTRIES);
+            Assert(!(u.pau32[pUser->iUserTable] & PGM_PDFLAGS_MAPPING));
             break;
         case PGMPOOLKIND_ROOT_PAE_PD:
-            Assert(!(u.pau64[pUser->iUser] & PGM_PDFLAGS_MAPPING));
             Assert(pUser->iUserTable < 2048 && pUser->iUser == PGMPOOL_IDX_PAE_PD);
+            Assert(!(u.pau64[pUser->iUserTable] & PGM_PDFLAGS_MAPPING));
             break;
         case PGMPOOLKIND_ROOT_PDPT:
+            Assert(pUser->iUserTable < 4);
             Assert(!(u.pau64[pUser->iUserTable] & PGM_PLXFLAGS_PERMANENT));
-            Assert(pUser->iUserTable < 4);
             break;
         case PGMPOOLKIND_PAE_PD_FOR_32BIT_PD:
@@ -2616 +2616 @@
             break;
         case PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD:
-            Assert(!(u.pau64[pUser->iUser] & PGM_PDFLAGS_MAPPING));
             Assert(pUser->iUserTable < X86_PG_PAE_ENTRIES);
+            Assert(!(u.pau64[pUser->iUserTable] & PGM_PDFLAGS_MAPPING));
             break;
         case PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT:
+            Assert(pUser->iUserTable < X86_PG_PAE_ENTRIES);
             Assert(!(u.pau64[pUser->iUserTable] & PGM_PLXFLAGS_PERMANENT));
-            Assert(pUser->iUserTable < X86_PG_PAE_ENTRIES);
             break;
         case PGMPOOLKIND_64BIT_PML4_FOR_64BIT_PML4: