Changeset 6243 in vbox for trunk

Timestamp:

Jan 4, 2008 6:45:34 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27082

Message:

Just use the assembly version of SVMInvlpgA everywhere (was asserting/nop in the gcc country).

Location:

trunk

Files:

• include/VBox/hwacc_svm.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HWACCMR0A.asm (modified) (2 diffs)

trunk/include/VBox/hwacc_svm.h

@@ -400 +400 @@
         uint32_t    u19Reserved         : 19;
         uint32_t    u1Valid             : 1;
-        uint32_t    u32ErrorCode        : 32;    
+        uint32_t    u32ErrorCode        : 32;
     } n;
     uint64_t    au64[1];
@@ -631 +631 @@
 
 /**
- * Prepares for and executes VMRUN
+ * Prepares for and executes VMRUN.
  *
- * @returns VBox status code
- * @param   pVMCBHostPhys  Physical address of host VMCB
- * @param   pVMCBPhys      Physical address of the VMCB
- * @param   pCtx           Guest context
+ * @returns VBox status code.
+ * @param   pVMCBHostPhys   Physical address of host VMCB.
+ * @param   pVMCBPhys       Physical address of the VMCB.
+ * @param   pCtx            Guest context.
  */
 DECLASM(int) SVMVMRun(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx);
 
-
-/**
- * Executes INVLPGA
+/**
+ * Executes INVLPGA.
  *
- * @param   pPageGC     Virtual page to invalidate
- * @param   uASID       Tagged TLB id
- */
-#if RT_INLINE_ASM_EXTERNAL
-DECLASM(void) SVMInvlpgA(RTGCPTR pPageGC, uint32_t uASID);
-#else
-DECLINLINE(void) SVMInvlpgA(RTGCPTR pPageGC, uint32_t uASID)
-{
-# if RT_INLINE_ASM_GNU_STYLE
-    AssertFailed();
-# else
-    __asm
-    {
-#   ifdef RT_ARCH_AMD64
-        mov     rax, pPageGC
-#   else
-        mov     eax, pPageGC
-#   endif
-        push    ecx
-        mov     ecx, uASID
-        _emit   0x0F
-        _emit   0x01
-        _emit   0xDF   /* invlpga rAX, ECX */
-
-        pop     ecx
-    }
-# endif
-}
+ * @param   pPageGC         Virtual page to invalidate.
+ * @param   u32ASID         Tagged TLB id.
+ */
+DECLASM(void) SVMInvlpgA(RTGCPTR pPageGC, uint32_t u32ASID);
+
+/** @} */
+
 #endif
 
-
-
-/** @} */
-
-#endif
-

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

@@ -778 +778 @@
 ENDPROC SVMVMRun
 
-%ifdef RT_ARCH_AMD64
-%ifdef RT_OS_WINDOWS
-
 ;;
 ; Executes INVLPGA
@@ -805 +802 @@
     ret
 ENDPROC SVMInvlpgA
-%endif
-%endif
+