Changeset 10822

Timestamp:

07/23/08 11:02:58 (3 months ago)

Author:

vboxsync

Message:

Prepare for EPT.

Files:

• trunk/include/VBox/hwacc_vmx.h (modified) (1 diff)
• trunk/include/VBox/hwaccm.h (modified) (1 diff)
• trunk/include/VBox/pgm.h (modified) (1 diff)
• trunk/src/VBox/VMM/PGM.cpp (modified) (12 diffs)
• trunk/src/VBox/VMM/PGMBth.h (modified) (1 diff)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (5 diffs)
• trunk/src/VBox/VMM/PGMShw.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (5 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)

trunk/include/VBox/hwacc_vmx.h

@@ -127 +127 @@
-/** Pointer to a const extended table entry. */
-typedef const VTXEPTE *PCVTXEPTE;
+
+/**
+ * Number of page table entries in the EPT.
+ */
+#define VTX_PT_ENTRIES                  512
+
+/**
+ * Extended Page Directory Table.
+ */
+#pragma pack(1)
+typedef union VTXEPT
+{
+    VTXEPTE     a[VTX_PT_ENTRIES];
+} VTXEPT;
+#pragma pack()
+/** Pointer to an extended page table. */
+typedef VTXEPT *PVTXEPT;
+/** Pointer to a const extended table. */
+typedef const VTXEPT *PCVTXEPT;
-
-/** VMX Basic Exit Reasons.

trunk/include/VBox/hwaccm.h

@@ -103 +103 @@
-HWACCMDECL(bool) HWACCMIsNestedPagingActive(PVM pVM);
-
+/**
+ * Return the shadow paging mode for nested paging/ept
+ *
+ * @returns shadow paging mode
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMDECL(PGMMODE) HWACCMGetPagingMode(PVM pVM);
+
-#else
-/* Nop in GC */

trunk/include/VBox/pgm.h

@@ -265 +265 @@
-    /** Nested paging mode (shadow only; guest physical to host physical). */
-    PGMMODE_NESTED,
+    /** Extended paging (Intel) mode. */
+    PGMMODE_EPT,
-    /** The max number of modes */
-    PGMMODE_MAX,

trunk/src/VBox/VMM/PGM.cpp

@@ -983 +983 @@
-#undef PGM_SHW_NAME_R0_STR
-
+
+#ifdef PGM_WITH_EPT
+/*
+ * Shadow - EPT
+ */
+#define PGM_SHW_TYPE                PGM_TYPE_EPT
+#define PGM_SHW_NAME(name)          PGM_SHW_NAME_EPT(name)
+#define PGM_SHW_NAME_GC_STR(name)   PGM_SHW_NAME_GC_EPT_STR(name)
+#define PGM_SHW_NAME_R0_STR(name)   PGM_SHW_NAME_R0_EPT_STR(name)
+#include "PGMShw.h"
+
+/* Guest - real mode */
+#define PGM_GST_TYPE                PGM_TYPE_REAL
+#define PGM_GST_NAME(name)          PGM_GST_NAME_REAL(name)
+#define PGM_GST_NAME_GC_STR(name)   PGM_GST_NAME_GC_REAL_STR(name)
+#define PGM_GST_NAME_R0_STR(name)   PGM_GST_NAME_R0_REAL_STR(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_REAL(name)
+#define PGM_BTH_NAME_GC_STR(name)   PGM_BTH_NAME_GC_EPT_REAL_STR(name)
+#define PGM_BTH_NAME_R0_STR(name)   PGM_BTH_NAME_R0_EPT_REAL_STR(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PHYS
+#include "PGMBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_BTH_NAME_GC_STR
+#undef PGM_BTH_NAME_R0_STR
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+#undef PGM_GST_NAME_GC_STR
+#undef PGM_GST_NAME_R0_STR
+
+/* Guest - protected mode */
+#define PGM_GST_TYPE                PGM_TYPE_PROT
+#define PGM_GST_NAME(name)          PGM_GST_NAME_PROT(name)
+#define PGM_GST_NAME_GC_STR(name)   PGM_GST_NAME_GC_PROT_STR(name)
+#define PGM_GST_NAME_R0_STR(name)   PGM_GST_NAME_R0_PROT_STR(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_PROT(name)
+#define PGM_BTH_NAME_GC_STR(name)   PGM_BTH_NAME_GC_EPT_PROT_STR(name)
+#define PGM_BTH_NAME_R0_STR(name)   PGM_BTH_NAME_R0_EPT_PROT_STR(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PHYS
+#include "PGMBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_BTH_NAME_GC_STR
+#undef PGM_BTH_NAME_R0_STR
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+#undef PGM_GST_NAME_GC_STR
+#undef PGM_GST_NAME_R0_STR
+
+/* Guest - 32-bit mode */
+#define PGM_GST_TYPE                PGM_TYPE_32BIT
+#define PGM_GST_NAME(name)          PGM_GST_NAME_32BIT(name)
+#define PGM_GST_NAME_GC_STR(name)   PGM_GST_NAME_GC_32BIT_STR(name)
+#define PGM_GST_NAME_R0_STR(name)   PGM_GST_NAME_R0_32BIT_STR(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_32BIT(name)
+#define PGM_BTH_NAME_GC_STR(name)   PGM_BTH_NAME_GC_EPT_32BIT_STR(name)
+#define PGM_BTH_NAME_R0_STR(name)   PGM_BTH_NAME_R0_EPT_32BIT_STR(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_32BIT_PT
+#define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB
+#include "PGMBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_BIG
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_BTH_NAME_GC_STR
+#undef PGM_BTH_NAME_R0_STR
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+#undef PGM_GST_NAME_GC_STR
+#undef PGM_GST_NAME_R0_STR
+
+/* Guest - PAE mode */
+#define PGM_GST_TYPE                PGM_TYPE_PAE
+#define PGM_GST_NAME(name)          PGM_GST_NAME_PAE(name)
+#define PGM_GST_NAME_GC_STR(name)   PGM_GST_NAME_GC_PAE_STR(name)
+#define PGM_GST_NAME_R0_STR(name)   PGM_GST_NAME_R0_PAE_STR(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_PAE(name)
+#define PGM_BTH_NAME_GC_STR(name)   PGM_BTH_NAME_GC_EPT_PAE_STR(name)
+#define PGM_BTH_NAME_R0_STR(name)   PGM_BTH_NAME_R0_EPT_PAE_STR(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PAE_PT
+#define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_PAE_PT_FOR_PAE_2MB
+#include "PGMBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_BIG
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_BTH_NAME_GC_STR
+#undef PGM_BTH_NAME_R0_STR
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+#undef PGM_GST_NAME_GC_STR
+#undef PGM_GST_NAME_R0_STR
+
+/* Guest - AMD64 mode */
+#define PGM_GST_TYPE                PGM_TYPE_AMD64
+#define PGM_GST_NAME(name)          PGM_GST_NAME_AMD64(name)
+#define PGM_GST_NAME_GC_STR(name)   PGM_GST_NAME_GC_AMD64_STR(name)
+#define PGM_GST_NAME_R0_STR(name)   PGM_GST_NAME_R0_AMD64_STR(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_AMD64(name)
+#define PGM_BTH_NAME_GC_STR(name)   PGM_BTH_NAME_GC_EPT_AMD64_STR(name)
+#define PGM_BTH_NAME_R0_STR(name)   PGM_BTH_NAME_R0_EPT_AMD64_STR(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PAE_PT
+#define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_PAE_PT_FOR_PAE_2MB
+#include "PGMBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_BIG
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_BTH_NAME_GC_STR
+#undef PGM_BTH_NAME_R0_STR
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+#undef PGM_GST_NAME_GC_STR
+#undef PGM_GST_NAME_R0_STR
+
+#undef PGM_SHW_TYPE
+#undef PGM_SHW_NAME
+#undef PGM_SHW_NAME_GC_STR
+#undef PGM_SHW_NAME_R0_STR
+#endif /* PGM_WITH_EPT */
-
-/**
@@ -1346 +1463 @@
-        LogFlow(("pgmR3InitPaging: returns successfully\n"));
-#if HC_ARCH_BITS == 64
-
-
-
-
-
-
-
-
-
-
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
-#endif
-
@@ -2478 +2595 @@
-        case PGMMODE_AMD64_NX:  return PGM_TYPE_AMD64;
-        case PGMMODE_NESTED:    return PGM_TYPE_NESTED;
+        case PGMMODE_EPT:       return PGM_TYPE_EPT;
-        default:
-            AssertFatalMsgFailed(("pgmMode=%d\n", pgmMode));
@@ -2674 +2792 @@
-        break;
-    }
+
+#ifdef PGM_WITH_EPT
+    /* Extended paging (EPT) / Intel VT-x */
+    pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_EPT, PGM_TYPE_REAL)];
+    pModeData->uShwType = PGM_TYPE_EPT;
+    pModeData->uGstType = PGM_TYPE_REAL;
+    rc = PGM_SHW_NAME_EPT(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_GST_NAME_REAL(InitData)(       pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_BTH_NAME_EPT_REAL(InitData)(   pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+
+    pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_EPT, PGM_TYPE_PROT)];
+    pModeData->uShwType = PGM_TYPE_EPT;
+    pModeData->uGstType = PGM_TYPE_PROT;
+    rc = PGM_SHW_NAME_EPT(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_GST_NAME_PROT(InitData)(       pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_BTH_NAME_EPT_PROT(InitData)(   pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+
+    pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_EPT, PGM_TYPE_32BIT)];
+    pModeData->uShwType = PGM_TYPE_EPT;
+    pModeData->uGstType = PGM_TYPE_32BIT;
+    rc = PGM_SHW_NAME_EPT(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_GST_NAME_32BIT(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_BTH_NAME_EPT_32BIT(InitData)(  pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+
+    pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_EPT, PGM_TYPE_PAE)];
+    pModeData->uShwType = PGM_TYPE_EPT;
+    pModeData->uGstType = PGM_TYPE_PAE;
+    rc = PGM_SHW_NAME_EPT(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_GST_NAME_PAE(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_BTH_NAME_EPT_PAE(InitData)(    pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+
+    pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_EPT, PGM_TYPE_AMD64)];
+    pModeData->uShwType = PGM_TYPE_EPT;
+    pModeData->uGstType = PGM_TYPE_AMD64;
+    rc = PGM_SHW_NAME_EPT(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_GST_NAME_AMD64(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+    rc = PGM_BTH_NAME_EPT_AMD64(InitData)(  pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+#endif /* PGM_WITH_EPT */
-    return VINF_SUCCESS;
-}
@@ -2950 +3106 @@
-    /* Override the shadow mode is nested paging is active. */
-    if (HWACCMIsNestedPagingActive(pVM))
-PGMMODE_NESTED
+HWACCMGetPagingMode(pVM)
-
-    *penmSwitcher = enmSwitcher;
@@ -2990 +3146 @@
-        case PGMMODE_NESTED:
-            return "Nested";
+
+        case PGMMODE_EPT:
+            return "EPT";
-
-        default:
@@ -3087 +3246 @@
-                rc = PGM_SHW_NAME_NESTED(Enter)(pVM);
-                break;
+#ifdef PGM_WITH_EPT
+            case PGMMODE_EPT:
+                rc = PGM_SHW_NAME_EPT(Enter)(pVM);
+                break;
+#endif
-            case PGMMODE_REAL:
-            case PGMMODE_PROTECTED:
@@ -3124 +3288 @@
-                    rc2 = PGM_BTH_NAME_NESTED_REAL(Enter)(pVM, NIL_RTGCPHYS);
-                    break;
+#ifdef PGM_WITH_EPT
+                case PGMMODE_EPT:
+                    rc2 = PGM_BTH_NAME_EPT_REAL(Enter)(pVM, NIL_RTGCPHYS);
+                    break;
+#endif
-                case PGMMODE_AMD64:
-                case PGMMODE_AMD64_NX:
@@ -3145 +3314 @@
-                    rc2 = PGM_BTH_NAME_NESTED_PROT(Enter)(pVM, NIL_RTGCPHYS);
-                    break;
+#ifdef PGM_WITH_EPT
+                case PGMMODE_EPT:
+                    rc2 = PGM_BTH_NAME_EPT_PROT(Enter)(pVM, NIL_RTGCPHYS);
+                    break;
+#endif
-                case PGMMODE_AMD64:
-                case PGMMODE_AMD64_NX:
@@ -3167 +3341 @@
-                    rc2 = PGM_BTH_NAME_NESTED_32BIT(Enter)(pVM, GCPhysCR3);
-                    break;
+#ifdef PGM_WITH_EPT
+                case PGMMODE_EPT:
+                    rc2 = PGM_BTH_NAME_EPT_32BIT(Enter)(pVM, GCPhysCR3);
+                    break;
+#endif
-                case PGMMODE_AMD64:
-                case PGMMODE_AMD64_NX:
@@ -3205 +3384 @@
-                    rc2 = PGM_BTH_NAME_NESTED_PAE(Enter)(pVM, GCPhysCR3);
-                    break;
+#ifdef PGM_WITH_EPT
+                case PGMMODE_EPT:
+                    rc2 = PGM_BTH_NAME_EPT_PAE(Enter)(pVM, GCPhysCR3);
+                    break;
+#endif
-                case PGMMODE_32_BIT:
-                case PGMMODE_AMD64:
@@ -3227 +3411 @@
-                    rc2 = PGM_BTH_NAME_NESTED_AMD64(Enter)(pVM, GCPhysCR3);
-                    break;
+#ifdef PGM_WITH_EPT
+                case PGMMODE_EPT:
+                    rc2 = PGM_BTH_NAME_EPT_AMD64(Enter)(pVM, GCPhysCR3);
+                    break;
+#endif
-                case PGMMODE_32_BIT:
-                case PGMMODE_PAE:

trunk/src/VBox/VMM/PGMBth.h

@@ -68 +68 @@
-        int rc;
-
-
+&& PGM_SHW_TYPE != PGM_TYPE_EPT 
-        /* GC */
-        rc = PDMR3GetSymbolGC(pVM, NULL, PGM_BTH_NAME_GC_STR(Trap0eHandler),  &pModeData->pfnGCBthTrap0eHandler);

trunk/src/VBox/VMM/PGMInternal.h

@@ -192 +192 @@
-#define PGM_TYPE_AMD64      5
-#define PGM_TYPE_NESTED     6
+#define PGM_TYPE_EPT        7
-/** @} */
-
@@ -198 +199 @@
- * @remark  ASSUMES certain order of the PGM_TYPE_* values.
- */
-
+ && (uType) != PGM_TYPE_EPT
-
-/** Macro for checking if the guest supports the NX bit.
@@ -204 +205 @@
- * @remark  ASSUMES certain order of the PGM_TYPE_* values.
- */
-
+ && (uType) != PGM_TYPE_EPT
-
-
@@ -1731 +1732 @@
-#define PGM_SHW_NAME_GC_NESTED_STR(name) "pgmGCShwNested" #name
-#define PGM_SHW_NAME_R0_NESTED_STR(name) "pgmR0ShwNested" #name
+#define PGM_SHW_NAME_EPT(name)          PGM_CTX(pgm,ShwEPT##name)
+#define PGM_SHW_NAME_GC_EPT_STR(name)   "pgmGCShwEPT" #name
+#define PGM_SHW_NAME_R0_EPT_STR(name)   "pgmR0ShwEPT" #name
-#define PGM_SHW_DECL(type, name)        PGM_CTX_DECL(type) PGM_SHW_NAME(name)
-#define PGM_SHW_PFN(name, pVM)          ((pVM)->pgm.s.PGM_CTX(pfn,Shw##name))
@@ -1749 +1753 @@
-#define PGM_BTH_NAME_NESTED_PAE(name)   PGM_CTX(pgm,BthNestedPAE##name)
-#define PGM_BTH_NAME_NESTED_AMD64(name) PGM_CTX(pgm,BthNestedAMD64##name)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define PGM_BTH_DECL(type, name)        PGM_CTX_DECL(type) PGM_BTH_NAME(name)

trunk/src/VBox/VMM/PGMShw.h

@@ -113 +113 @@
-        int rc;
-
-
+&& PGM_SHW_TYPE != PGM_TYPE_EPT 
-        /* GC */
-        rc = PDMR3GetSymbolGC(pVM, NULL, PGM_SHW_NAME_GC_STR(GetPage),  &pModeData->pfnGCShwGetPage);

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

@@ -90 +90 @@
-}
-
+/**
+ * Return the shadow paging mode for nested paging/ept
+ *
+ * @returns shadow paging mode
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMDECL(PGMMODE) HWACCMGetPagingMode(PVM pVM)
+{
+    Assert(HWACCMIsNestedPagingActive(pVM));
+    if (pVM->hwaccm.s.svm.fSupported)
+        return PGMMODE_NESTED;
+    Assert(pVM->hwaccm.s.vmx.fSupported);
+    return PGMMODE_EPT;
+}
-
-/**

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

@@ -286 +286 @@
-#undef PGM_SHW_TYPE
-#undef PGM_SHW_NAME
+
+
+#ifdef PGM_WITH_EPT
+/*
+ * Shadow - EPT
+ */
+#define PGM_SHW_TYPE                PGM_TYPE_EPT
+#define PGM_SHW_NAME(name)          PGM_SHW_NAME_EPT(name)
+#include "PGMAllShw.h"
+
+/* Guest - real mode */
+#define PGM_GST_TYPE                PGM_TYPE_REAL
+#define PGM_GST_NAME(name)          PGM_GST_NAME_REAL(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_REAL(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PHYS
+#include "PGMAllBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+
+/* Guest - protected mode */
+#define PGM_GST_TYPE                PGM_TYPE_PROT
+#define PGM_GST_NAME(name)          PGM_GST_NAME_PROT(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_PROT(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PHYS
+#include "PGMAllBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+
+/* Guest - 32-bit mode */
+#define PGM_GST_TYPE                PGM_TYPE_32BIT
+#define PGM_GST_NAME(name)          PGM_GST_NAME_32BIT(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_32BIT(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_32BIT_PT
+#define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB
+#include "PGMAllBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_BIG
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+
+/* Guest - PAE mode */
+#define PGM_GST_TYPE                PGM_TYPE_PAE
+#define PGM_GST_NAME(name)          PGM_GST_NAME_PAE(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_PAE(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PAE_PT
+#define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_PAE_PT_FOR_PAE_2MB
+#include "PGMAllBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_BIG
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+
+/* Guest - AMD64 mode */
+#define PGM_GST_TYPE                PGM_TYPE_AMD64
+#define PGM_GST_NAME(name)          PGM_GST_NAME_AMD64(name)
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_AMD64(name)
+#define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PAE_PT
+#define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_PAE_PT_FOR_PAE_2MB
+#include "PGMAllBth.h"
+#undef BTH_PGMPOOLKIND_PT_FOR_BIG
+#undef BTH_PGMPOOLKIND_PT_FOR_PT
+#undef PGM_BTH_NAME
+#undef PGM_GST_TYPE
+#undef PGM_GST_NAME
+
+#undef PGM_SHW_TYPE
+#undef PGM_SHW_NAME
+#endif /* PGM_WITH_EPT */
+
-#endif
-
@@ -1078 +1153 @@
-            return pVM->pgm.s.HCPhysPaePML4;
-
+        case PGMMODE_EPT:
+            return pVM->pgm.s.HCPhysNestedRoot;
+
-        case PGMMODE_NESTED:
-            return PGMGetNestedCR3(pVM, PGMGetHostMode(pVM));
@@ -1199 +1277 @@
-            return pVM->pgm.s.HCPhysInterPaePML4;
-
+        case PGMMODE_EPT:
-        case PGMMODE_NESTED:
-            return 0; /* not relevant */
@@ -1332 +1411 @@
-    Assert(pVM->pgm.s.fMappingsFixed);
-    Assert(!(pVM->pgm.s.fSyncFlags & PGM_SYNC_MONITOR_CR3));
-
+ || pVM->pgm.s.enmShadowMode == PGMMODE_EPT
-
-    /*
@@ -1567 +1646 @@
-        case PGMMODE_AMD64_NX:  return "AMD64+NX";
-        case PGMMODE_NESTED:    return "Nested";
+        case PGMMODE_EPT:       return "EPT";
-        default:                return "unknown mode value";
-    }

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -49 +49 @@
-
-#if     (PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT) \
-
+ || PGM_SHW_TYPE == PGM_TYPE_EPT
-# error "Invalid combination; real or protected mode without paging implies 32 bits or PAE shadow paging."
-#endif
-
-#if     (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE) \
-
+ || PGM_SHW_TYPE == PGM_TYPE_EPT
-# error "Invalid combination; 32 bits guest paging or PAE implies 32 bits or PAE shadow paging."
-#endif
-
-
+ && PGM_SHW_TYPE != PGM_TYPE_EPT
-    || (PGM_SHW_TYPE == PGM_TYPE_AMD64 && PGM_GST_TYPE != PGM_TYPE_AMD64 && PGM_GST_TYPE != PGM_TYPE_PROT)
-# error "Invalid combination; AMD64 guest implies AMD64 shadow and vice versa"
@@ -167 +167 @@
-    }
-    Assert(pPDDst);
+# elif PGM_SHW_TYPE == PGM_TYPE_EPT
+    const unsigned  iPDDst = (((RTGCUINTPTR)pvFault >> SHW_PD_SHIFT) & SHW_PD_MASK);
+    PX86PDPAE       pPDDst;
+
+    AssertFailed();
-# endif
-