Changeset 14366

Timestamp:

11/19/08 18:20:49 (2 months ago)

Author:

vboxsync

Message:

Cleaned up some more.

Files:

• trunk/include/VBox/hwacc_svm.h (modified) (1 diff)
• trunk/src/VBox/VMM/HWACCMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm (modified) (8 diffs)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.h (modified) (1 diff)

trunk/include/VBox/hwacc_svm.h

@@ -667 +667 @@
-#pragma pack()
-
-/**
- * Executes INVLPGA.
- *
- * @param   pPageGC         Virtual page to invalidate.
- * @param   u32ASID         Tagged TLB id.
- */
-DECLASM(void) SVMInvlpgA(RTGCPTR pPageGC, uint32_t u32ASID);
-
-#ifdef IN_RING0
-VMMR0DECL(int) SVMR0InvalidatePage(PVM pVM, PVMCPU pVCpu, RTGCPTR GCVirt);

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
-; */
-
+R0
-%ifdef RT_ARCH_AMD64 ; fake a cdecl stack frame
- %ifdef ASM_CALL64_GCC
@@ -1036 +1036 @@
-%endif
-    ret
-
+R0
-
-%ifdef RT_ARCH_AMD64
@@ -1047 +1047 @@
-; * @param   pCtx           Guest context
-; */
-
+R0
-    ; fake a cdecl stack frame
- %ifdef ASM_CALL64_GCC
@@ -1157 +1157 @@
-    add     rsp, 4*xS
-    ret
-
+R0
-%endif ; RT_ARCH_AMD64
-
@@ -1168 +1168 @@
-; @param   uASID    msc:rdx  gcc:rsi  x86:[esp+0C]  Tagged TLB id
-;
-
-
+R0
+R0
-%ifdef RT_ARCH_AMD64
- %ifdef ASM_CALL64_GCC
@@ -1188 +1188 @@
-    invlpga [xAX], ecx
-    ret
-
+R0
-
-%else
@@ -1197 +1197 @@
-; @param   uASID    msc:edx  gcc:esi  x86:[esp+08]  Tagged TLB id
-;
-
-
+R0
+R0
-%ifdef RT_ARCH_AMD64
- %ifdef ASM_CALL64_GCC
@@ -1217 +1217 @@
-    invlpga [xAX], ecx
-    ret
-
+R0
-
-%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
-
+R0
-#else
-
+R0
-#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;
-
-
+R0
-    }
-
@@ -2155 +2155 @@
-    {
-        /* Manually invalidate the page for the VM's TLB. */
-
-
+R0
+R0
-        return VINF_SUCCESS;
-    }
@@ -2237 +2237 @@
-
-        STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatFlushPageManual);
-
+R0
-    }
-    return VINF_SUCCESS;
@@ -2262 +2262 @@
-#ifdef HC_ARCH_BITS == 32
-/**
-
+ from a 32 bits hosts
- *
- * @returns VBox status code.
@@ -2269 +2269 @@
- * @param   pCtx            Guest context.
- */
-
+R0
-{
-    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 */
-