Changeset 14364 in vbox for trunk

Timestamp:

Nov 19, 2008 5:07:11 PM (16 years ago)

Author:

vboxsync

Message:

Preparations

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMAll/PGMAllGst.h (modified) (5 diffs)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -520 +520 @@
 VMMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu();
 
+DECLASM(int) SVMVMRun(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx);
+DECLASM(int) SVMVMRun64(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx);
+DECLASM(int) SVMVMSwitcherRun64(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx);
+
+
 #ifdef VBOX_STRICT
 VMMR0DECL(void) HWACCMDumpRegs(PVM pVM, PCPUMCTX pCtx);

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

@@ -3136 +3136 @@
     return VINF_SUCCESS;
 
-#elif PGM_SHW_TYPE == PGM_TYPE_AMD64
+#elif PGM_SHW_TYPE == PGM_TYPE_AMD64 || defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
     /*
      * AMD64 (Shw & Gst) - No need to check all paging levels; we zero

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

@@ -131 +131 @@
 PGM_GST_DECL(int, MapCR3)(PVM pVM, RTGCPHYS GCPhysCR3);
 PGM_GST_DECL(int, UnmapCR3)(PVM pVM);
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
 PGM_GST_DECL(int, MonitorCR3)(PVM pVM, RTGCPHYS GCPhysCR3);
 PGM_GST_DECL(int, UnmonitorCR3)(PVM pVM);
+#endif
 PGM_GST_DECL(bool, HandlerVirtualUpdate)(PVM pVM, uint32_t cr4);
-#ifndef IN_RING3
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+# ifndef IN_RING3
 PGM_GST_DECL(int, WriteHandlerCR3)(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
-# if PGM_GST_TYPE == PGM_TYPE_PAE \
+#  if PGM_GST_TYPE == PGM_TYPE_PAE \
   || PGM_GST_TYPE == PGM_TYPE_AMD64
 PGM_GST_DECL(int, PAEWriteHandlerPD)(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
+#  endif
 # endif
 #endif
@@ -619 +623 @@
 
 
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+
 #undef LOG_GROUP
 #define LOG_GROUP LOG_GROUP_PGM_POOL
@@ -798 +804 @@
 #undef LOG_GROUP
 #define LOG_GROUP LOG_GROUP_PGM
+
+#endif /* VBOX_WITH_PGMPOOL_PAGING_ONLY */
 
 
@@ -1006 +1014 @@
 }
 
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
 
 #if PGM_GST_TYPE == PGM_TYPE_32BIT && !defined(IN_RING3)
@@ -1240 +1249 @@
 #endif /* PGM_TYPE_PAE && !IN_RING3 */
 
+#endif /* !VBOX_WITH_PGMPOOL_PAGING_ONLY */

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

@@ -759 +759 @@
     if (pCtx->msrEFER & MSR_K6_EFER_LMA)
     {
-#if !defined(VBOX_WITH_64_BITS_GUESTS) || HC_ARCH_BITS != 64
+#if !defined(VBOX_WITH_64_BITS_GUESTS)
         return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
+#elif HC_ARCH_BITS == 32
+        pVCpu->hwaccm.s.svm.pfnVMRun = SVMVMSwitcherRun64;
 #else
         pVCpu->hwaccm.s.svm.pfnVMRun = SVMVMRun64;
@@ -2257 +2259 @@
     return VINF_SUCCESS;
 }
+
+#ifdef HC_ARCH_BITS == 32
+/**
+ * Prepares for and executes VMRUN (64 bits guests).
+ *
+ * @returns VBox status code.
+ * @param   pVMCBHostPhys   Physical address of host VMCB.
+ * @param   pVMCBPhys       Physical address of the VMCB.
+ * @param   pCtx            Guest context.
+ */
+DECLASM(int) SVMVMSwitcherRun64(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+#endif /* HC_ARCH_BITS == 32 */