Changeset 73 in vbox

Timestamp:

Jan 16, 2007 5:25:59 PM (18 years ago)

Author:

vboxsync

Message:

Just drop the inline assembly on 64-bit host.

File:

• trunk/include/VBox/hwacc_vmx.h (modified) (10 diffs)

trunk/include/VBox/hwacc_vmx.h

@@ -697 +697 @@
  * @param   pVMXOn      Physical address of VMXON structure
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
 DECLASM(int) VMXEnable(RTHCPHYS pVMXOn);
 #else
@@ -750 +750 @@
  * Executes VMXOFF
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
 DECLASM(void) VMXDisable(void);
 #else
@@ -777 +777 @@
  * @param   pVMCS       Physical address of VM control structure
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
 DECLASM(int) VMXClearVMCS(RTHCPHYS pVMCS);
 #else
@@ -824 +824 @@
  * @param   pVMCS       Physical address of VMCS structure
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
 DECLASM(int) VMXActivateVMCS(RTHCPHYS pVMCS);
 #else
@@ -872 +872 @@
  * @param   u64Val          16, 32 or 64 bits value
  */
-#if RT_INLINE_ASM_EXTERNAL
 DECLASM(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val);
-#else
-DECLINLINE(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val)
-{
-    int rc = VINF_SUCCESS;
-# if RT_INLINE_ASM_GNU_STYLE
-#  if HC_ARCH_BITS == 64
-#   error "todo"
-#  endif
-# else
-    __asm
-    {
-        push   dword ptr [u64Val+4]
-        push   dword ptr [u64Val]
-        mov    eax, [idxField]
-        _emit  0x0F
-        _emit  0x79
-        _emit  0x04
-        _emit  0x24     /* VMWRITE eax, [esp] */
-        jnc    valid_vmcs
-        mov    dword ptr [rc], VERR_VMX_INVALID_VMCS_PTR
-        jmp    the_end
-
-valid_vmcs:
-        jnz    the_end
-        mov    dword ptr [rc], VERR_VMX_INVALID_VMCS_FIELD
-the_end:
-        add    esp, 8
-    }
-# endif
-    return rc;
-}
-#endif
 
 /**
@@ -914 +881 @@
  * @param   u32Val          32 bits value
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
 DECLASM(int) VMXWriteVMCS32(uint32_t idxField, uint32_t u32Val);
 #else
@@ -973 +940 @@
  * @param   pData           Ptr to store VM field value
  */
-#if RT_INLINE_ASM_EXTERNAL
 DECLASM(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData);
-#else
-DECLINLINE(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData)
-{
-    int rc = VINF_SUCCESS;
-# if RT_INLINE_ASM_GNU_STYLE
-#  if HC_ARCH_BITS == 64
-#   error "todo"
-#  endif
-# else
-    __asm
-    {
-        sub     esp, 8
-        mov     dword ptr [esp], 0
-        mov     dword ptr [esp+4], 0
-        mov     eax, [idxField]
-        _emit   0x0F
-        _emit   0x78
-        _emit   0x04
-        _emit   0x24     /* VMREAD eax, [esp] */
-        mov     edx, pData
-        pop     dword ptr [edx]
-        pop     dword ptr [edx+4]
-        jnc     valid_vmcs
-        mov     dword ptr [rc], VERR_VMX_INVALID_VMCS_PTR
-        jmp     the_end
-
-valid_vmcs:
-        jnz     the_end
-        mov     dword ptr [rc], VERR_VMX_INVALID_VMCS_FIELD
-the_end:
-    }
-# endif
-    return rc;
-}
-#endif
-
 
 /**
@@ -1019 +949 @@
  * @param   pData           Ptr to store VM field value
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64
 DECLASM(int) VMXReadVMCS32(uint32_t idxField, uint32_t *pData);
 #else
@@ -1094 +1024 @@
  * @returns error value
  */
-uint32_t inline VMXGetLastError()
+DECLINLINE(uint32_t) VMXGetLastError(void)
 {
+#if HC_ARCH_BITS == 64
+    uint64_t uLastError = 0;
+    int rc = VMXReadVMCS(VMX_VMCS_RO_VM_INSTR_ERROR, &uLastError);
+    AssertRC(rc);
+    return (uint32_t)uLastError;
+
+#else /* 32-bit host: */
     uint32_t lasterr = 0;
     int      rc;
@@ -1102 +1039 @@
     AssertRC(rc);
     return lasterr;
+#endif
 }