vbox的更動 43872 路徑 trunk/src/VBox/VMM/VMMR3/PGMMap.cpp

時間撮記:

2012-11-15 上午08:52:11 (12 年 以前)

作者:

vboxsync

訊息:

Make VBOX_WITH_RAW_MODE= link.

檔案:

• trunk/src/VBox/VMM/VMMR3/PGMMap.cpp (修改) (10 筆差異)

trunk/src/VBox/VMM/VMMR3/PGMMap.cpp

@@ -37 +37 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+#ifndef PGM_WITHOUT_MAPPINGS
 static void pgmR3MapClearPDEs(PVM pVM, PPGMMAPPING pMap, unsigned iOldPDE);
 static void pgmR3MapSetPDEs(PVM pVM, PPGMMAPPING pMap, unsigned iNewPDE);
 static int  pgmR3MapIntermediateCheckOne(PVM pVM, uintptr_t uAddress, unsigned cPages, PX86PT pPTDefault, PX86PTPAE pPTPaeDefault);
 static void pgmR3MapIntermediateDoOne(PVM pVM, uintptr_t uAddress, RTHCPHYS HCPhys, unsigned cPages, PX86PT pPTDefault, PX86PTPAE pPTPaeDefault);
+#else
+# define pgmR3MapClearPDEs(pVM, pMap, iNewPDE) do { } while (0)
+# define pgmR3MapSetPDEs(pVM, pMap, iNewPDE)   do { } while (0)
+#endif
 
 
@@ -210 +215 @@
 }
 
+#ifdef VBOX_WITH_UNUSED_CODE
 
 /**
@@ -280 +286 @@
     return VERR_INVALID_PARAMETER;
 }
+
+#endif /* unused */
 
 
@@ -484 +492 @@
 {
     RTGCPTR cb = 0;
+#ifndef PGM_WITHOUT_MAPPINGS
     for (PPGMMAPPING pCur = pVM->pgm.s.pMappingsR3; pCur; pCur = pCur->pNextR3)
         cb += pCur->cb;
+#endif
 
     *pcb = cb;
@@ -507 +517 @@
          GCPtrBase, cb, pVM->pgm.s.fMappingsFixed, pVM->pgm.s.fMappingsDisabled));
 
-    /*
-     * Ignore the additions mapping fix call if disabled.
-     */
-    if (!pgmMapAreMappingsEnabled(pVM))
-    {
-        Assert(HMIsEnabled(pVM));
-        return VINF_SUCCESS;
-    }
-
-    /*
-     * Only applies to VCPU 0 as we don't support SMP guests with raw mode.
-     */
-    Assert(pVM->cCpus == 1);
-    PVMCPU pVCpu = &pVM->aCpus[0];
-
-    /*
-     * Before we do anything we'll do a forced PD sync to try make sure any
-     * pending relocations because of these mappings have been resolved.
-     */
-    PGMSyncCR3(pVCpu, CPUMGetGuestCR0(pVCpu), CPUMGetGuestCR3(pVCpu), CPUMGetGuestCR4(pVCpu), true);
-
-    return pgmR3MappingsFixInternal(pVM, GCPtrBase, cb);
-}
-
-
+#ifndef PGM_WITHOUT_MAPPINGS
+    if (pgmMapAreMappingsEnabled(pVM))
+    {
+        /*
+         * Only applies to VCPU 0 as we don't support SMP guests with raw mode.
+         */
+        Assert(pVM->cCpus == 1);
+        PVMCPU pVCpu = &pVM->aCpus[0];
+
+        /*
+         * Before we do anything we'll do a forced PD sync to try make sure any
+         * pending relocations because of these mappings have been resolved.
+         */
+        PGMSyncCR3(pVCpu, CPUMGetGuestCR0(pVCpu), CPUMGetGuestCR3(pVCpu), CPUMGetGuestCR4(pVCpu), true);
+
+        return pgmR3MappingsFixInternal(pVM, GCPtrBase, cb);
+    }
+#endif /* !PGM_WITHOUT_MAPPINGS */
+
+    Assert(HMIsEnabled(pVM));
+    return VINF_SUCCESS;
+}
+
+
+#ifndef PGM_WITHOUT_MAPPINGS
 /**
  * Internal worker for PGMR3MappingsFix and pgmR3Load.
@@ -671 +681 @@
     return VINF_SUCCESS;
 }
+#endif /*!PGM_WITHOUT_MAPPINGS*/
+
 
 
@@ -689 +701 @@
         return VINF_SUCCESS;
 
+#ifdef VBOX_WITH_RAW_MODE
     /*
      * Deactivate (only applies to Virtual CPU #0).
@@ -699 +712 @@
         AssertRCReturn(rc, rc);
     }
+#endif /* VBOX_WITH_RAW_MODE */
 
     /*
@@ -758 +772 @@
 }
 
+#ifndef PGM_WITHOUT_MAPPINGS
 
 /**
@@ -1345 +1360 @@
 }
 
+#endif /* !PGM_WITHOUT_MAPPINGS */
 
 /**