儲存庫 vbox 的更動 17119

時間撮記:

2009-2-25 上午11:05:12 (16 年 以前)

作者:

vboxsync

訊息:

ifndef IN_RING0 for code that doesn't apply there.

檔案:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (修改) (18 筆差異)

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

@@ -380 +380 @@
                     for (unsigned i=0;i<2;i++)
                     {
+#  ifndef IN_RING0
                         if ((uShw.pPDPae->a[iShw + i].u & (PGM_PDFLAGS_MAPPING | X86_PDE_P)) == (PGM_PDFLAGS_MAPPING | X86_PDE_P))
                         {
@@ -388 +389 @@
                         }
                         else
+#  endif /* !IN_RING0 */
                         if (uShw.pPDPae->a[iShw+i].n.u1Present)
                         {
@@ -406 +408 @@
                             if (iShw2 < RT_ELEMENTS(uShw.pPDPae->a))
                             {
+#  ifndef IN_RING0
                                 if ((uShw.pPDPae->a[iShw2].u & (PGM_PDFLAGS_MAPPING | X86_PDE_P)) == (PGM_PDFLAGS_MAPPING | X86_PDE_P))
                                 {
@@ -414 +417 @@
                                 }
                                 else
+#  endif /* !IN_RING0 */
                                 if (uShw.pPDPae->a[iShw2].n.u1Present)
                                 {
@@ -492 +496 @@
                 LogFlow(("pgmPoolMonitorChainChanging: PGMPOOLKIND_32BIT_PD %x\n", iShw));
 #  endif
+#  ifndef IN_RING0
                 if (uShw.pPD->a[iShw].u & PGM_PDFLAGS_MAPPING)
                 {
@@ -500 +505 @@
                     break;
                 }
+#  endif /* !IN_RING0 */
 #  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+#   ifndef IN_RING0
                 else
+#   endif /* !IN_RING0 */
                 {
                     if (uShw.pPD->a[iShw].n.u1Present)
@@ -523 +531 @@
                         &&  iShw2 < RT_ELEMENTS(uShw.pPD->a))
                     {
-
+#  ifndef IN_RING0
                         if (uShw.pPD->a[iShw2].u & PGM_PDFLAGS_MAPPING)
                         {
@@ -531 +539 @@
                             LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
                         }
+#  endif /* !IN_RING0 */
 #  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+#   ifndef IN_RING0
                         else
+#   endif /* !IN_RING0 */
                         {
                             if (uShw.pPD->a[iShw2].n.u1Present)
@@ -615 +626 @@
                 uShw.pv = PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage);
                 const unsigned iShw = off / sizeof(X86PDEPAE);
+#ifndef IN_RING0
                 if (uShw.pPDPae->a[iShw].u & PGM_PDFLAGS_MAPPING)
                 {
@@ -623 +635 @@
                     break;
                 }
+#endif /* !IN_RING0 */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
                 /*
@@ -656 +669 @@
                     AssertReturnVoid(iShw2 < RT_ELEMENTS(uShw.pPDPae->a));
 
+#ifndef IN_RING0
                     if (    iShw2 != iShw
                         &&  uShw.pPDPae->a[iShw2].u & PGM_PDFLAGS_MAPPING)
@@ -664 +678 @@
                         LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
                     }
+#endif /* !IN_RING0 */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-                    else if (uShw.pPDPae->a[iShw2].n.u1Present)
+# ifndef IN_RING0
+                    else 
+# endif /* !IN_RING0 */
+                    if (uShw.pPDPae->a[iShw2].n.u1Present)
                     {
                         LogFlow(("pgmPoolMonitorChainChanging: pae pd iShw2=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPDPae->a[iShw2].u));
@@ -706 +724 @@
                 if (iShw < X86_PG_PAE_PDPE_ENTRIES)          /* don't use RT_ELEMENTS(uShw.pPDPT->a), because that's for long mode only */
                 {
+# ifndef IN_RING0
                     if (uShw.pPDPT->a[iShw].u & PGM_PLXFLAGS_MAPPING)
                     {
@@ -714 +733 @@
                         break;
                     }
+# endif /* !IN_RING0 */
 # ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+#  ifndef IN_RING0
                     else
+#  endif /* !IN_RING0 */
                     if (uShw.pPDPT->a[iShw].n.u1Present)
                     {
@@ -736 +758 @@
                             &&  iShw2 < X86_PG_PAE_PDPE_ENTRIES)
                         {
+# ifndef IN_RING0
                             if (uShw.pPDPT->a[iShw2].u & PGM_PLXFLAGS_MAPPING)
                             {
@@ -743 +766 @@
                                 LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
                             }
+# endif /* !IN_RING0 */
 # ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+#  ifndef IN_RING0
                             else
+#  endif /* !IN_RING0 */
                             if (uShw.pPDPT->a[iShw2].n.u1Present)
                             {
@@ -766 +792 @@
                 uShw.pv = PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage);
                 const unsigned iShw = off / sizeof(X86PDEPAE);
-                if (uShw.pPDPae->a[iShw].u & PGM_PDFLAGS_MAPPING)
+                Assert(!(uShw.pPDPae->a[iShw].u & PGM_PDFLAGS_MAPPING));
+                if (uShw.pPDPae->a[iShw].n.u1Present)
                 {
-                    Assert(pgmMapAreMappingsEnabled(&pPool->CTX_SUFF(pVM)->pgm.s));
-                    VM_FF_SET(pPool->CTX_SUFF(pVM), VM_FF_PGM_SYNC_CR3);
-                    LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw=%#x!\n", iShw));
-                }
-                else
-                {
-                    if (uShw.pPDPae->a[iShw].n.u1Present)
-                    {
-                        LogFlow(("pgmPoolMonitorChainChanging: pae pd iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPDPae->a[iShw].u));
-                        pgmPoolFree(pPool->CTX_SUFF(pVM),
-                                    uShw.pPDPae->a[iShw].u & X86_PDE_PAE_PG_MASK,
-                                    pPage->idx,
-                                    iShw);
-                        uShw.pPDPae->a[iShw].u = 0;
-                    }
+                    LogFlow(("pgmPoolMonitorChainChanging: pae pd iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPDPae->a[iShw].u));
+                    pgmPoolFree(pPool->CTX_SUFF(pVM),
+                                uShw.pPDPae->a[iShw].u & X86_PDE_PAE_PG_MASK,
+                                pPage->idx,
+                                iShw);
+                    uShw.pPDPae->a[iShw].u = 0;
                 }
                 /* paranoia / a bit assumptive. */
@@ -792 +810 @@
                     AssertReturnVoid(iShw2 < RT_ELEMENTS(uShw.pPDPae->a));
 
-                    if (    iShw2 != iShw
-                        &&  uShw.pPDPae->a[iShw2].u & PGM_PDFLAGS_MAPPING)
-                    {
-                        Assert(pgmMapAreMappingsEnabled(&pPool->CTX_SUFF(pVM)->pgm.s));
-                        VM_FF_SET(pPool->CTX_SUFF(pVM), VM_FF_PGM_SYNC_CR3);
-                        LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
-                    }
-                    else
+                    Assert(!(uShw.pPDPae->a[iShw2].u & PGM_PDFLAGS_MAPPING));
                     if (uShw.pPDPae->a[iShw2].n.u1Present)
                     {