Changeset 13106 in vbox for trunk/src

Timestamp:

Oct 9, 2008 8:46:19 AM (16 years ago)

Author:

vboxsync

Message:

leave some modes out if 64-bit guests are not enabled (so far on 32-bit hosts)

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (17 diffs)
• VMMAll/PGMAll.cpp (modified) (6 diffs)
• VMMGC/PGMGC.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -846 +846 @@
 #include "PGMShw.h"
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
 /* Guest - AMD64 mode */
 #define PGM_GST_TYPE                PGM_TYPE_AMD64
@@ -867 +868 @@
 #undef PGM_GST_NAME_RC_STR
 #undef PGM_GST_NAME_R0_STR
+#endif
 
 #undef PGM_SHW_TYPE
@@ -962 +964 @@
 #undef PGM_GST_NAME_R0_STR
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
 /* Guest - AMD64 mode */
 #define PGM_GST_TYPE                PGM_TYPE_AMD64
@@ -982 +985 @@
 #undef PGM_GST_NAME_RC_STR
 #undef PGM_GST_NAME_R0_STR
+#endif
 
 #undef PGM_SHW_TYPE
@@ -1077 +1081 @@
 #undef PGM_GST_NAME_R0_STR
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
 /* Guest - AMD64 mode */
 #define PGM_GST_TYPE                PGM_TYPE_AMD64
@@ -1097 +1102 @@
 #undef PGM_GST_NAME_RC_STR
 #undef PGM_GST_NAME_R0_STR
+#endif
 
 #undef PGM_SHW_TYPE
@@ -2737 +2743 @@
     rc = PGM_BTH_NAME_PAE_PAE(InitData)(    pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
     pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_AMD64, PGM_TYPE_AMD64)];
     pModeData->uShwType = PGM_TYPE_AMD64;
@@ -2743 +2750 @@
     rc = PGM_GST_NAME_AMD64(InitData)(       pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_BTH_NAME_AMD64_AMD64(InitData)( pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+#endif
 
     /* The nested paging mode. */
@@ -2769 +2777 @@
     rc = PGM_BTH_NAME_NESTED_PAE(InitData)(  pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
     pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, PGM_TYPE_AMD64)];
     pModeData->uShwType = PGM_TYPE_NESTED;
@@ -2774 +2783 @@
     rc = PGM_GST_NAME_AMD64(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_BTH_NAME_NESTED_AMD64(InitData)( pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+#endif
+
+#ifdef VBOX_WITH_64_BITS_GUESTS
+# define PGM_TYPE_MAX_SHADOW  PGM_TYPE_AMD64
+#else
+# define PGM_TYPE_MAX_SHADOW  PGM_TYPE_PAE
+#endif
 
     /* The shadow part of the nested callback mode depends on the host paging mode (AMD-V only). */
@@ -2780 +2796 @@
     case SUPPAGINGMODE_32_BIT:
     case SUPPAGINGMODE_32_BIT_GLOBAL:
-        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
+        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_MAX_SHADOW;i++)
         {
             pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
@@ -2791 +2807 @@
     case SUPPAGINGMODE_PAE_GLOBAL:
     case SUPPAGINGMODE_PAE_GLOBAL_NX:
-        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
+        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_MAX_SHADOW;i++)
         {
             pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
@@ -2802 +2818 @@
     case SUPPAGINGMODE_AMD64_NX:
     case SUPPAGINGMODE_AMD64_GLOBAL_NX:
-        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
+        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_MAX_SHADOW;i++)
         {
             pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
@@ -2842 +2858 @@
     rc = PGM_BTH_NAME_EPT_PAE(InitData)(    pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
     pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_EPT, PGM_TYPE_AMD64)];
     pModeData->uShwType = PGM_TYPE_EPT;
@@ -2848 +2865 @@
     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
     return VINF_SUCCESS;
 }
@@ -3376 +3394 @@
         }
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
         case PGMMODE_AMD64_NX:
         case PGMMODE_AMD64:
@@ -3399 +3418 @@
             }
             break;
+#endif
 
         default:

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

@@ -200 +200 @@
 #undef PGM_GST_NAME
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
 /* Guest - AMD64 mode */
 #define PGM_GST_TYPE                PGM_TYPE_AMD64
@@ -213 +214 @@
 #undef PGM_GST_TYPE
 #undef PGM_GST_NAME
+#endif
 
 #undef PGM_SHW_TYPE
@@ -260 +262 @@
 #undef PGM_GST_NAME
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
 /* Guest - AMD64 mode */
 #define PGM_GST_TYPE                PGM_TYPE_AMD64
@@ -268 +271 @@
 #undef PGM_GST_TYPE
 #undef PGM_GST_NAME
+#endif
 
 #undef PGM_SHW_TYPE
@@ -323 +327 @@
 #undef PGM_GST_NAME
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
 /* Guest - AMD64 mode */
 #define PGM_GST_TYPE                PGM_TYPE_AMD64
@@ -333 +338 @@
 #undef PGM_GST_TYPE
 #undef PGM_GST_NAME
+#endif
 
 #undef PGM_SHW_TYPE

trunk/src/VBox/VMM/VMMGC/PGMGC.cpp

@@ -151 +151 @@
 #include "PGMGCShw.h"
 
+#ifdef VBOX_WITH_64_BITS_GUESTS
 /* Guest - AMD64 mode */
 #define PGM_GST_TYPE                PGM_TYPE_AMD64
@@ -160 +161 @@
 #undef PGM_GST_TYPE
 #undef PGM_GST_NAME
+#endif
 
 #undef PGM_SHW_TYPE