Changeset 9001 in vbox

Timestamp:

May 21, 2008 9:14:26 AM (17 years ago)

Author:

vboxsync

Message:

Enabled the PGMMODE_PROTECTED (Guest) & PGMMODE_AMD64 (shadow) combination again.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (2 diffs)
• VMMAll/PGMAll.cpp (modified) (3 diffs)
• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMR0/PGMR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1721 +1721 @@
 #define PGM_BTH_NAME_PAE_32BIT(name)    PGM_CTX(pgm,BthPAE32Bit##name)
 #define PGM_BTH_NAME_PAE_PAE(name)      PGM_CTX(pgm,BthPAEPAE##name)
+#define PGM_BTH_NAME_AMD64_PROT(name)   PGM_CTX(pgm,BthAMD64Prot##name)
 #define PGM_BTH_NAME_AMD64_AMD64(name)  PGM_CTX(pgm,BthAMD64AMD64##name)
 #define PGM_BTH_NAME_GC_32BIT_REAL_STR(name)   "pgmGCBth32BitReal" #name
@@ -1737 +1738 @@
 #define PGM_BTH_NAME_R0_PAE_32BIT_STR(name)    "pgmR0BthPAE32Bit" #name
 #define PGM_BTH_NAME_R0_PAE_PAE_STR(name)      "pgmR0BthPAEPAE" #name
+#define PGM_BTH_NAME_R0_AMD64_PROT_STR(name)   "pgmR0BthAMD64Prot" #name
 #define PGM_BTH_NAME_R0_AMD64_AMD64_STR(name)  "pgmR0BthAMD64AMD64" #name
 #define PGM_BTH_DECL(type, name)        PGM_CTX_DECL(type) PGM_BTH_NAME(name)

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

@@ -69 +69 @@
 *******************************************************************************/
 
-#if 1///@todo ndef RT_ARCH_AMD64
 /*
  * Shadow - 32-bit mode
@@ -117 +116 @@
 #undef PGM_SHW_TYPE
 #undef PGM_SHW_NAME
-#endif /* !RT_ARCH_AMD64 */
 
 
@@ -189 +187 @@
 #define PGM_SHW_NAME(name)          PGM_SHW_NAME_AMD64(name)
 #include "PGMAllShw.h"
+
+/* 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_AMD64_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 - AMD64 mode */

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_32BIT || PGM_SHW_TYPE == PGM_TYPE_PAE)
+    && !(PGM_SHW_TYPE == PGM_TYPE_32BIT || PGM_SHW_TYPE == PGM_TYPE_PAE || PGM_SHW_TYPE == PGM_TYPE_AMD64)
 # error "Invalid combination; real or protected mode without paging implies 32 bits or PAE shadow paging."
 #endif

trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

@@ -33 +33 @@
 #define PGM_BTH_NAME(name)          PGM_BTH_NAME_32BIT_PROT(name)
 #include "PGMR0Bth.h"
+#undef PGM_BTH_NAME
 
 #define PGM_BTH_NAME(name)          PGM_BTH_NAME_PAE_PROT(name)
 #include "PGMR0Bth.h"
-/*
+#undef PGM_BTH_NAME
+
 #define PGM_BTH_NAME(name)          PGM_BTH_NAME_AMD64_PROT(name)
 #include "PGMR0Bth.h"
-*/
+#undef PGM_BTH_NAME
+
 __END_DECLS
 
@@ -123 +126 @@
     /*
      * Call the worker.
+     *
+     * We pretend the guest is in protected mode without paging, so we can use existing code to build the 
+     * nested page tables.
      */
     switch(enmShwPagingMode)
@@ -132 +138 @@
         rc = PGM_BTH_NAME_PAE_PROT(Trap0eHandler)(pVM, uErr, pRegFrame, pvFault);
         break;
-        /*
     case PGMMODE_AMD64:
         rc = PGM_BTH_NAME_AMD64_PROT(Trap0eHandler)(pVM, uErr, pRegFrame, pvFault);
         break;
-        */
     }
     if (rc == VINF_PGM_SYNCPAGE_MODIFIED_PDE)