儲存庫 vbox 的更動 15172

時間撮記:

2008-12-9 下午02:02:13 (16 年 以前)

作者:

vboxsync

訊息:

Shadow paging fixes for amd64 on 32 bits hosts.

檔案:

• trunk/src/VBox/VMM/PGM.cpp (修改) (3 筆差異)

trunk/src/VBox/VMM/PGM.cpp

@@ -2885 +2885 @@
     switch(pVM->pgm.s.enmHostMode)
     {
+#ifdef HC_ARCH_BITS == 32
     case SUPPAGINGMODE_32_BIT:
     case SUPPAGINGMODE_32_BIT_GLOBAL:
-#ifdef VBOX_WITH_64_BITS_GUESTS
-        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
-#else
         for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_PAE;i++)
-#endif
         {
             pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
             rc = PGM_SHW_NAME_32BIT(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)];
+        rc = PGM_SHW_NAME_AMD64(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+# endif
         break;
 
@@ -2902 +2903 @@
     case SUPPAGINGMODE_PAE_GLOBAL:
     case SUPPAGINGMODE_PAE_GLOBAL_NX:
-#ifdef VBOX_WITH_64_BITS_GUESTS
-        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
-#else
         for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_PAE;i++)
-#endif
         {
             pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
             rc = PGM_SHW_NAME_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)];
+        rc = PGM_SHW_NAME_AMD64(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+# endif
         break;
-
+#else /* HC_ARCH_BITS != 32 */
     case SUPPAGINGMODE_AMD64:
     case SUPPAGINGMODE_AMD64_GLOBAL:
     case SUPPAGINGMODE_AMD64_NX:
     case SUPPAGINGMODE_AMD64_GLOBAL_NX:
-#ifdef VBOX_WITH_64_BITS_GUESTS
+# ifdef VBOX_WITH_64_BITS_GUESTS
         for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
-#else
+# else
         for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_PAE;i++)
-#endif
+# endif
         {
             pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
@@ -2927 +2928 @@
         }
         break;
+#endif /* HC_ARCH_BITS != 32 */
     default:
         AssertFailed();