Changeset 14366 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 19, 2008 5:20:49 PM (16 years ago)

Author:

vboxsync

Message:

Cleaned up some more.

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWACCMR0A.asm (modified) (8 diffs)
• VMMR0/HWSVMR0.cpp (modified) (6 diffs)
• VMMR0/HWSVMR0.h (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.h (modified) (1 diff)

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

trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm

@@ -939 +939 @@
 ; * @param   pCtx           Guest context
 ; */
-BEGINPROC SVMVMRun
+BEGINPROC SVMR0VMRun
 %ifdef RT_ARCH_AMD64 ; fake a cdecl stack frame
  %ifdef ASM_CALL64_GCC
@@ -1036 +1036 @@
 %endif
     ret
-ENDPROC SVMVMRun
+ENDPROC SVMR0VMRun
 
 %ifdef RT_ARCH_AMD64
@@ -1047 +1047 @@
 ; * @param   pCtx           Guest context
 ; */
-BEGINPROC SVMVMRun64
+BEGINPROC SVMR0VMRun64
     ; fake a cdecl stack frame
  %ifdef ASM_CALL64_GCC
@@ -1157 +1157 @@
     add     rsp, 4*xS
     ret
-ENDPROC SVMVMRun64
+ENDPROC SVMR0VMRun64
 %endif ; RT_ARCH_AMD64
 
@@ -1168 +1168 @@
 ; @param   uASID    msc:rdx  gcc:rsi  x86:[esp+0C]  Tagged TLB id
 ;
-;DECLASM(void) SVMInvlpgA(RTGCPTR pPageGC, uint32_t uASID);
-BEGINPROC SVMInvlpgA
+;DECLASM(void) SVMR0InvlpgA(RTGCPTR pPageGC, uint32_t uASID);
+BEGINPROC SVMR0InvlpgA
 %ifdef RT_ARCH_AMD64
  %ifdef ASM_CALL64_GCC
@@ -1188 +1188 @@
     invlpga [xAX], ecx
     ret
-ENDPROC SVMInvlpgA
+ENDPROC SVMR0InvlpgA
 
 %else
@@ -1197 +1197 @@
 ; @param   uASID    msc:edx  gcc:esi  x86:[esp+08]  Tagged TLB id
 ;
-;DECLASM(void) SVMInvlpgA(RTGCPTR pPageGC, uint32_t uASID);
-BEGINPROC SVMInvlpgA
+;DECLASM(void) SVMR0InvlpgA(RTGCPTR pPageGC, uint32_t uASID);
+BEGINPROC SVMR0InvlpgA
 %ifdef RT_ARCH_AMD64
  %ifdef ASM_CALL64_GCC
@@ -1217 +1217 @@
     invlpga [xAX], ecx
     ret
-ENDPROC SVMInvlpgA
+ENDPROC SVMR0InvlpgA
 
 %endif ; GC_ARCH_BITS != 64

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

@@ -762 +762 @@
         return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
 #elif HC_ARCH_BITS == 32
-        pVCpu->hwaccm.s.svm.pfnVMRun = SVMVMSwitcherRun64;
+        pVCpu->hwaccm.s.svm.pfnVMRun = SVMR0VMSwitcherRun64;
 #else
-        pVCpu->hwaccm.s.svm.pfnVMRun = SVMVMRun64;
+        pVCpu->hwaccm.s.svm.pfnVMRun = SVMR0VMRun64;
 #endif
         /* Unconditionally update these as wrmsr might have changed them. (HWACCM_CHANGED_GUEST_SEGMENT_REGS will not be set) */
@@ -775 +775 @@
         pVMCB->guest.u64EFER &= ~MSR_K6_EFER_LME;
 
-        pVCpu->hwaccm.s.svm.pfnVMRun = SVMVMRun;
+        pVCpu->hwaccm.s.svm.pfnVMRun = SVMR0VMRun;
     }
 
@@ -2155 +2155 @@
     {
         /* Manually invalidate the page for the VM's TLB. */
-        Log(("SVMInvlpgA %RGv ASID=%d\n", addr, uASID));
-        SVMInvlpgA(addr, uASID);
+        Log(("SVMR0InvlpgA %RGv ASID=%d\n", addr, uASID));
+        SVMR0InvlpgA(addr, uASID);
         return VINF_SUCCESS;
     }
@@ -2237 +2237 @@
 
         STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatFlushPageManual);
-        SVMInvlpgA(GCVirt, pVMCB->ctrl.TLBCtrl.n.u32ASID);
+        SVMR0InvlpgA(GCVirt, pVMCB->ctrl.TLBCtrl.n.u32ASID);
     }
     return VINF_SUCCESS;
@@ -2262 +2262 @@
 #ifdef HC_ARCH_BITS == 32
 /**
- * Prepares for and executes VMRUN (64 bits guests).
+ * Prepares for and executes VMRUN (64 bits guests from a 32 bits hosts).
  *
  * @returns VBox status code.
@@ -2269 +2269 @@
  * @param   pCtx            Guest context.
  */
-DECLASM(int) SVMVMSwitcherRun64(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx)
+DECLASM(int) SVMR0VMSwitcherRun64(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx)
 {
     return VERR_NOT_IMPLEMENTED;

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

@@ -138 +138 @@
 VMMR0DECL(int) SVMR0LoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
 
+/** 
+ * Prepares for and executes VMRUN (32 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) SVMR0VMRun(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx); 
+
+/** 
+ * 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) SVMR0VMRun64(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx); 
+
+/**
+ * Prepares for and executes VMRUN (64 bits guests from a 32 bits hosts).
+ *
+ * @returns VBox status code.
+ * @param   pVMCBHostPhys   Physical address of host VMCB.
+ * @param   pVMCBPhys       Physical address of the VMCB.
+ * @param   pCtx            Guest context.
+ */
+DECLASM(int) SVMR0VMSwitcherRun64(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx);
+
+/**
+ * Executes INVLPGA.
+ *
+ * @param   pPageGC         Virtual page to invalidate.
+ * @param   u32ASID         Tagged TLB id.
+ */
+DECLASM(void) SVMR0InvlpgA(RTGCPTR pPageGC, uint32_t u32ASID);
 
 /** Convert hidden selector attribute word between VMX and SVM formats. */

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

@@ -3351 +3351 @@
     }
 }
+
+#if HC_ARCH_BITS == 32
+/**
+ * Prepares for and executes VMLAUNCH (64 bits guest mode)
+ *
+ * @returns VBox status code
+ * @param   fResume     vmlauch/vmresume
+ * @param   pCtx        Guest context
+ */
+DECLASM(int) VMXR0SwitcherStartVM64(RTHCUINT fResume, PCPUMCTX pCtx)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+#endif
+
+

trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

@@ -208 +208 @@
 DECLASM(int) VMXR0StartVM64(RTHCUINT fResume, PCPUMCTX pCtx);
 
+/**
+ * Prepares for and executes VMLAUNCH (64 bits guest mode)
+ *
+ * @returns VBox status code
+ * @param   fResume     vmlauch/vmresume
+ * @param   pCtx        Guest context
+ */
+DECLASM(int) VMXR0SwitcherStartVM64(RTHCUINT fResume, PCPUMCTX pCtx);
+
 #endif /* IN_RING0 */