儲存庫 vbox 的更動 30824

時間撮記:

2010-7-14 下午12:25:12 (14 年 以前)

作者:

vboxsync

訊息:

Must also deal with zero cr3 translation ptrs in ring 0.

位置:

trunk/src/VBox/VMM

檔案:

• PGMInline.h (修改) (8 筆差異)
• VMMAll/PGMAll.cpp (修改) (4 筆差異)

trunk/src/VBox/VMM/PGMInline.h

@@ -590 +590 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef IN_RING3
-    if (!pGuestPD)
+    if (RT_UNLIKELY(!pGuestPD))
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 #endif
     return pGuestPD->a[GCPtr >> X86_PD_SHIFT];
@@ -614 +612 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef IN_RING3
-    if (!pGuestPD)
+    if (RT_UNLIKELY(!pGuestPD))
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 #endif
     return &pGuestPD->a[GCPtr >> X86_PD_SHIFT];
@@ -637 +633 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef IN_RING3
-    if (!pGuestPD)
+    if (RT_UNLIKELY(!pGuestPD))
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 #endif
     return pGuestPD;
@@ -661 +655 @@
 #else
     PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
-# ifdef IN_RING3
-    if (!pGuestPDPT)
+    if (RT_UNLIKELY(!pGuestPDPT))
         pGuestPDPT = pgmGstLazyMapPaePDPT(pPGM);
-# endif
 #endif
     return pGuestPDPT;
@@ -688 +680 @@
 #else
     PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
-# ifdef IN_RING3
-    if (!pGuestPDPT)
+    if (RT_UNLIKELY(!pGuestPDPT))
         pGuestPDPT = pgmGstLazyMapPaePDPT(pPGM);
-# endif
 #endif
     return &pGuestPDPT->a[(GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE];
@@ -858 +848 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
-    if (!pGuestPml4)
+    if (RT_UNLIKELY(!pGuestPml4))
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
     Assert(pGuestPml4);
 #endif
@@ -883 +871 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
-    if (!pGuestPml4)
+    if (RT_UNLIKELY(!pGuestPml4))
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
     Assert(pGuestPml4);
 #endif
@@ -912 +898 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
     if (!pGuestPml4)
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
     Assert(pGuestPml4);
 #endif

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

@@ -1367 +1367 @@
 }
 
-#ifdef IN_RING3
 
 /**
@@ -1426 +1425 @@
 }
 
-#endif /* IN_RING3  */
 
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
@@ -1492 +1490 @@
 #endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
 
-
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
+#ifndef IN_RC
 /**
  * Performs the lazy mapping of the 32-bit guest PD.
@@ -1521 +1518 @@
     return pPGM->CTX_SUFF(pGstAmd64Pml4);
 }
-#endif /* VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 */
-
+#endif
 
 /**