Changeset 10364 in vbox

Timestamp:

Jul 8, 2008 1:09:13 PM (17 years ago)

Author:

vboxsync

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

33001

Message:

Cleaned up

File:

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

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

@@ -248 +248 @@
 {
     Assert(pPage->iMonitoredPrev == NIL_PGMPOOL_IDX);
-    const unsigned off = GCPhysFault & PAGE_OFFSET_MASK;
-
-    LogFlow(("pgmPoolMonitorChainChanging: %VGv phys=%VGp kind=%d\n", pvAddress, GCPhysFault, pPage->enmKind));
+    const unsigned off     = GCPhysFault & PAGE_OFFSET_MASK;
+    const unsigned cbWrite = pgmPoolDisasWriteSize(pCpu);
+
+    LogFlow(("pgmPoolMonitorChainChanging: %VGv phys=%VGp kind=%d cbWrite=%d\n", pvAddress, GCPhysFault, pPage->enmKind, cbWrite));
 
     for (;;)
@@ -322 +323 @@
                 if (   pCpu
                     && (off & 7)
-                    && (off & 7) + pgmPoolDisasWriteSize(pCpu) > sizeof(X86PTEPAE))
+                    && (off & 7) + cbWrite > sizeof(X86PTEPAE))
                 {
-                    const unsigned iShw2 = (off + pgmPoolDisasWriteSize(pCpu) - 1) / sizeof(X86PTEPAE);
+                    const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PTEPAE);
                     AssertReturnVoid(iShw2 < ELEMENTS(uShw.pPTPae->a));
 
@@ -352 +353 @@
                 else if (   pCpu
                          && (off & 3)
-                         && (off & 3) + pgmPoolDisasWriteSize(pCpu) > sizeof(X86PTE))
+                         && (off & 3) + cbWrite > sizeof(X86PTE))
                 {
-                    const unsigned iShw2 = (off + pgmPoolDisasWriteSize(pCpu) - 1) / sizeof(X86PTE);
+                    const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PTE);
                     if (    iShw2 != iShw
                         &&  iShw2 < ELEMENTS(uShw.pPD->a)
@@ -393 +394 @@
                     else if (   pCpu
                              && (off & 3)
-                             && (off & 3) + pgmPoolDisasWriteSize(pCpu) > 4)
+                             && (off & 3) + cbWrite > 4)
                     {
                         const unsigned iShw2 = iShw + 2;
@@ -451 +452 @@
                 if (   pCpu
                     && (off & 7)
-                    && (off & 7) + pgmPoolDisasWriteSize(pCpu) > sizeof(X86PDEPAE))
+                    && (off & 7) + cbWrite > sizeof(X86PDEPAE))
                 {
-                    const unsigned iShw2 = (off + pgmPoolDisasWriteSize(pCpu) - 1) / sizeof(X86PDEPAE);
+                    const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PDEPAE);
                     AssertReturnVoid(iShw2 < ELEMENTS(uShw.pPDPae->a));
 
@@ -498 +499 @@
                     else if (   pCpu
                             && (off & 7)
-                            && (off & 7) + pgmPoolDisasWriteSize(pCpu) > sizeof(X86PDPE))
+                            && (off & 7) + cbWrite > sizeof(X86PDPE))
                     {
-                        const unsigned iShw2 = (off + pgmPoolDisasWriteSize(pCpu) - 1) / sizeof(X86PDPE);
+                        const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PDPE);
                         if (    iShw2 != iShw
                             &&  iShw2 < X86_PG_PAE_PDPE_ENTRIES
@@ -541 +542 @@
                 if (   pCpu
                     && (off & 7)
-                    && (off & 7) + pgmPoolDisasWriteSize(pCpu) > sizeof(X86PDEPAE))
+                    && (off & 7) + cbWrite > sizeof(X86PDEPAE))
                 {
-                    const unsigned iShw2 = (off + pgmPoolDisasWriteSize(pCpu) - 1) / sizeof(X86PDEPAE);
+                    const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PDEPAE);
                     AssertReturnVoid(iShw2 < ELEMENTS(uShw.pPDPae->a));
 
@@ -584 +585 @@
                     if (   pCpu
                         && (off & 7)
-                        && (off & 7) + pgmPoolDisasWriteSize(pCpu) > sizeof(X86PDPE))
+                        && (off & 7) + cbWrite > sizeof(X86PDPE))
                     {
-                        const unsigned iShw2 = (off + pgmPoolDisasWriteSize(pCpu) - 1) / sizeof(X86PDPE);
+                        const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PDPE);
                         if (uShw.pPDPT->a[iShw2].n.u1Present)
                         {
@@ -615 +616 @@
                     if (   pCpu
                         && (off & 7)
-                        && (off & 7) + pgmPoolDisasWriteSize(pCpu) > sizeof(X86PDPE))
+                        && (off & 7) + cbWrite > sizeof(X86PDPE))
                     {
-                        const unsigned iShw2 = (off + pgmPoolDisasWriteSize(pCpu) - 1) / sizeof(X86PML4E);
+                        const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PML4E);
                         if (uShw.pPML4->a[iShw2].n.u1Present)
                         {