Changeset 80112 in vbox for trunk/include/VBox/vmm

Timestamp:

Aug 2, 2019 2:47:35 PM (5 years ago)

Author:

vboxsync

Message:

hmvmxinline.h: Add GNU inline assembly for VMX operations on 64-bit hosts. Previously we were always using external asm functions. Old code is disabled for now.

File:

• trunk/include/VBox/vmm/hmvmxinline.h (modified) (19 diffs)

trunk/include/VBox/vmm/hmvmxinline.h

@@ -251 +251 @@
  * @param   HCPhysVmxOn      Physical address of VMXON structure.
  */
-#if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
+#if RT_INLINE_ASM_EXTERNAL && !VMX_USE_MSC_INTRINSICS
 DECLASM(int) VMXEnable(RTHCPHYS HCPhysVmxOn);
 #else
 DECLINLINE(int) VMXEnable(RTHCPHYS HCPhysVmxOn)
 {
-# if RT_INLINE_ASM_GNU_STYLE
-    int rc = VINF_SUCCESS;
+# if VMX_USE_MSC_INTRINSICS
+    unsigned char rcMsc = __vmx_on(&HCPhysVmxOn);
+    if (RT_LIKELY(rcMsc == 0))
+        return VINF_SUCCESS;
+    return rcMsc == 2 ? VERR_VMX_INVALID_VMXON_PTR : VERR_VMX_VMXON_FAILED;
+
+# elif RT_INLINE_ASM_GNU_STYLE
+#  ifdef RT_ARCH_AMD64
+    int rc;
+    __asm__ __volatile__ (
+       "pushq    %2                                             \n\t"
+       ".byte    0xf3, 0x0f, 0xc7, 0x34, 0x24  # VMXON [esp]    \n\t"
+       "ja       2f                                             \n\t"
+       "je       1f                                             \n\t"
+       "movl     $" RT_XSTR(VERR_VMX_INVALID_VMXON_PTR)", %0    \n\t"
+       "jmp      2f                                             \n\t"
+       "1:                                                      \n\t"
+       "movl     $" RT_XSTR(VERR_VMX_VMXON_FAILED)", %0         \n\t"
+       "2:                                                      \n\t"
+       "add      $8, %%rsp                                      \n\t"
+       :"=rm"(rc)
+       :"0"(VINF_SUCCESS),
+        "ir"(HCPhysVmxOn)                   /* don't allow direct memory reference here, */
+                                            /* this would not work with -fomit-frame-pointer */
+       :"memory"
+       );
+    return rc;
+#  else
+    int rc;
     __asm__ __volatile__ (
        "push     %3                                             \n\t"
@@ -277 +304 @@
        );
     return rc;
-
-# elif VMX_USE_MSC_INTRINSICS
-    unsigned char rcMsc = __vmx_on(&HCPhysVmxOn);
-    if (RT_LIKELY(rcMsc == 0))
-        return VINF_SUCCESS;
-    return rcMsc == 2 ? VERR_VMX_INVALID_VMXON_PTR : VERR_VMX_VMXON_FAILED;
-
-# else
+#  endif
+
+# elif defined(RT_ARCH_X86)
     int rc = VINF_SUCCESS;
     __asm
@@ -306 +328 @@
     }
     return rc;
-# endif
-}
+
+# else
+#  error "Shouldn't be here..."
+# endif
+}
+#endif
+
+
+#if 0
+#if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
+DECLASM(int) VMXEnable(RTHCPHYS HCPhysVmxOn);
+#else
+DECLINLINE(int) VMXEnable(RTHCPHYS HCPhysVmxOn)
+{
+# if RT_INLINE_ASM_GNU_STYLE
+    int rc = VINF_SUCCESS;
+    __asm__ __volatile__ (
+       "push     %3                                             \n\t"
+       "push     %2                                             \n\t"
+       ".byte    0xf3, 0x0f, 0xc7, 0x34, 0x24  # VMXON [esp]    \n\t"
+       "ja       2f                                             \n\t"
+       "je       1f                                             \n\t"
+       "movl     $" RT_XSTR(VERR_VMX_INVALID_VMXON_PTR)", %0    \n\t"
+       "jmp      2f                                             \n\t"
+       "1:                                                      \n\t"
+       "movl     $" RT_XSTR(VERR_VMX_VMXON_FAILED)", %0         \n\t"
+       "2:                                                      \n\t"
+       "add      $8, %%esp                                      \n\t"
+       :"=rm"(rc)
+       :"0"(VINF_SUCCESS),
+        "ir"((uint32_t)HCPhysVmxOn),        /* don't allow direct memory reference here, */
+        "ir"((uint32_t)(HCPhysVmxOn >> 32)) /* this would not work with -fomit-frame-pointer */
+       :"memory"
+       );
+    return rc;
+
+# elif VMX_USE_MSC_INTRINSICS
+    unsigned char rcMsc = __vmx_on(&HCPhysVmxOn);
+    if (RT_LIKELY(rcMsc == 0))
+        return VINF_SUCCESS;
+    return rcMsc == 2 ? VERR_VMX_INVALID_VMXON_PTR : VERR_VMX_VMXON_FAILED;
+
+# else
+    int rc = VINF_SUCCESS;
+    __asm
+    {
+        push    dword ptr [HCPhysVmxOn + 4]
+        push    dword ptr [HCPhysVmxOn]
+        _emit   0xf3
+        _emit   0x0f
+        _emit   0xc7
+        _emit   0x34
+        _emit   0x24     /* VMXON [esp] */
+        jnc     vmxon_good
+        mov     dword ptr [rc], VERR_VMX_INVALID_VMXON_PTR
+        jmp     the_end
+
+vmxon_good:
+        jnz     the_end
+        mov     dword ptr [rc], VERR_VMX_VMXON_FAILED
+the_end:
+        add     esp, 8
+    }
+    return rc;
+# endif
+}
+#endif
 #endif
 
@@ -314 +401 @@
  * Executes VMXOFF.
  */
-#if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
+#if RT_INLINE_ASM_EXTERNAL && !VMX_USE_MSC_INTRINSICS
 DECLASM(void) VMXDisable(void);
 #else
 DECLINLINE(void) VMXDisable(void)
 {
-# if RT_INLINE_ASM_GNU_STYLE
+# if VMX_USE_MSC_INTRINSICS
+    __vmx_off();
+
+# elif RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__ (
        ".byte 0x0f, 0x01, 0xc4  # VMXOFF                        \n\t"
        );
 
-# elif VMX_USE_MSC_INTRINSICS
-    __vmx_off();
-
-# else
+# elif defined(RT_ARCH_X86)
     __asm
     {
@@ -334 +421 @@
         _emit   0xc4   /* VMXOFF */
     }
-# endif
-}
+
+# else
+#  error "Shouldn't be here..."
+# endif
+}
+#endif
+
+
+#if 0
+#if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
+DECLASM(void) VMXDisable(void);
+#else
+DECLINLINE(void) VMXDisable(void)
+{
+# if RT_INLINE_ASM_GNU_STYLE
+    __asm__ __volatile__ (
+       ".byte 0x0f, 0x01, 0xc4  # VMXOFF                        \n\t"
+       );
+
+# elif VMX_USE_MSC_INTRINSICS
+    __vmx_off();
+
+# else
+    __asm
+    {
+        _emit   0x0f
+        _emit   0x01
+        _emit   0xc4   /* VMXOFF */
+    }
+# endif
+}
+#endif
 #endif
 
@@ -345 +462 @@
  * @param   HCPhysVmcs       Physical address of VM control structure.
  */
+#if RT_INLINE_ASM_EXTERNAL && !VMX_USE_MSC_INTRINSICS
+DECLASM(int) VMXClearVmcs(RTHCPHYS HCPhysVmcs);
+#else
+DECLINLINE(int) VMXClearVmcs(RTHCPHYS HCPhysVmcs)
+{
+# if VMX_USE_MSC_INTRINSICS
+    unsigned char rcMsc = __vmx_vmclear(&HCPhysVmcs);
+    if (RT_LIKELY(rcMsc == 0))
+        return VINF_SUCCESS;
+    return VERR_VMX_INVALID_VMCS_PTR;
+
+# elif RT_INLINE_ASM_GNU_STYLE
+#  ifdef RT_ARCH_AMD64
+    int rc;
+    __asm__ __volatile__ (
+       "pushq   %2                                              \n\t"
+       ".byte   0x66, 0x0f, 0xc7, 0x34, 0x24  # VMCLEAR [esp]   \n\t"
+       "jnc     1f                                              \n\t"
+       "movl    $" RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0      \n\t"
+       "1:                                                      \n\t"
+       "add     $8, %%rsp                                       \n\t"
+       :"=rm"(rc)
+       :"0"(VINF_SUCCESS),
+        "ir"(HCPhysVmcs)                    /* don't allow direct memory reference here, */
+                                            /* this would not work with -fomit-frame-pointer */
+       :"memory"
+       );
+    return rc;
+#  else
+    int rc;
+    __asm__ __volatile__ (
+       "push    %3                                              \n\t"
+       "push    %2                                              \n\t"
+       ".byte   0x66, 0x0f, 0xc7, 0x34, 0x24  # VMCLEAR [esp]   \n\t"
+       "jnc     1f                                              \n\t"
+       "movl    $" RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0      \n\t"
+       "1:                                                      \n\t"
+       "add     $8, %%esp                                       \n\t"
+       :"=rm"(rc)
+       :"0"(VINF_SUCCESS),
+        "ir"((uint32_t)HCPhysVmcs),         /* don't allow direct memory reference here, */
+        "ir"((uint32_t)(HCPhysVmcs >> 32))  /* this would not work with -fomit-frame-pointer */
+       :"memory"
+       );
+    return rc;
+#  endif
+
+# elif defined(RT_ARCH_X86)
+    int rc = VINF_SUCCESS;
+    __asm
+    {
+        push    dword ptr [HCPhysVmcs + 4]
+        push    dword ptr [HCPhysVmcs]
+        _emit   0x66
+        _emit   0x0f
+        _emit   0xc7
+        _emit   0x34
+        _emit   0x24     /* VMCLEAR [esp] */
+        jnc     success
+        mov     dword ptr [rc], VERR_VMX_INVALID_VMCS_PTR
+success:
+        add     esp, 8
+    }
+    return rc;
+
+# else
+#  error "Shouldn't be here..."
+# endif
+}
+#endif
+
+
+#if 0
 #if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
 DECLASM(int) VMXClearVmcs(RTHCPHYS HCPhysVmcs);
@@ -394 +584 @@
 }
 #endif
+#endif
 
 
@@ -402 +593 @@
  * @param   HCPhysVmcs       Physical address of VMCS structure.
  */
+#if RT_INLINE_ASM_EXTERNAL && !VMX_USE_MSC_INTRINSICS
+DECLASM(int) VMXLoadVmcs(RTHCPHYS HCPhysVmcs);
+#else
+DECLINLINE(int) VMXLoadVmcs(RTHCPHYS HCPhysVmcs)
+{
+# if VMX_USE_MSC_INTRINSICS
+    unsigned char rcMsc = __vmx_vmptrld(&HCPhysVmcs);
+    if (RT_LIKELY(rcMsc == 0))
+        return VINF_SUCCESS;
+    return VERR_VMX_INVALID_VMCS_PTR;
+
+# elif RT_INLINE_ASM_GNU_STYLE
+#  ifdef RT_ARCH_AMD64
+    int rc;
+    __asm__ __volatile__ (
+       "pushq   %2                                              \n\t"
+       ".byte   0x0f, 0xc7, 0x34, 0x24  # VMPTRLD [esp]         \n\t"
+       "jnc     1f                                              \n\t"
+       "movl    $" RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0      \n\t"
+       "1:                                                      \n\t"
+       "add     $8, %%rsp                                       \n\t"
+       :"=rm"(rc)
+       :"0"(VINF_SUCCESS),
+        "ir"(HCPhysVmcs)                    /* don't allow direct memory reference here, */
+                                            /* this will not work with -fomit-frame-pointer */
+       :"memory"
+       );
+    return rc;
+#  else
+    int rc;
+    __asm__ __volatile__ (
+       "push    %3                                              \n\t"
+       "push    %2                                              \n\t"
+       ".byte   0x0f, 0xc7, 0x34, 0x24  # VMPTRLD [esp]         \n\t"
+       "jnc     1f                                              \n\t"
+       "movl    $" RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0      \n\t"
+       "1:                                                      \n\t"
+       "add     $8, %%esp                                       \n\t"
+       :"=rm"(rc)
+       :"0"(VINF_SUCCESS),
+        "ir"((uint32_t)HCPhysVmcs),         /* don't allow direct memory reference here, */
+        "ir"((uint32_t)(HCPhysVmcs >> 32))  /* this will not work with -fomit-frame-pointer */
+       :"memory"
+       );
+    return rc;
+#  endif
+
+# elif defined(RT_ARCH_X86)
+    int rc = VINF_SUCCESS;
+    __asm
+    {
+        push    dword ptr [HCPhysVmcs + 4]
+        push    dword ptr [HCPhysVmcs]
+        _emit   0x0f
+        _emit   0xc7
+        _emit   0x34
+        _emit   0x24     /* VMPTRLD [esp] */
+        jnc     success
+        mov     dword ptr [rc], VERR_VMX_INVALID_VMCS_PTR
+success:
+        add     esp, 8
+    }
+    return rc;
+
+# else
+#  error "Shouldn't be here..."
+# endif
+}
+#endif
+
+#if 0
 #if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
 DECLASM(int) VMXLoadVmcs(RTHCPHYS HCPhysVmcs);
@@ -450 +712 @@
 }
 #endif
+#endif
 
 
@@ -476 +739 @@
  *          will be VERR_VMX_INVALID_VMCS_PTR.
  */
-#if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
+#if RT_INLINE_ASM_EXTERNAL && !VMX_USE_MSC_INTRINSICS
 DECLASM(int) VMXWriteVmcs32(uint32_t uFieldEnc, uint32_t u32Val);
 #else
 DECLINLINE(int) VMXWriteVmcs32(uint32_t uFieldEnc, uint32_t u32Val)
 {
-# if RT_INLINE_ASM_GNU_STYLE
-    int rc = VINF_SUCCESS;
+# if VMX_USE_MSC_INTRINSICS
+     unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u32Val);
+     if (RT_LIKELY(rcMsc == 0))
+         return VINF_SUCCESS;
+     return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+
+# elif RT_INLINE_ASM_GNU_STYLE
+    int rc;
     __asm__ __volatile__ (
        ".byte  0x0f, 0x79, 0xc2        # VMWRITE eax, edx       \n\t"
@@ -499 +768 @@
     return rc;
 
-# elif VMX_USE_MSC_INTRINSICS
-     unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u32Val);
-     if (RT_LIKELY(rcMsc == 0))
-         return VINF_SUCCESS;
-     return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
-
-#else
+# elif defined(RT_ARCH_X86)
     int rc = VINF_SUCCESS;
     __asm
@@ -518 +781 @@
         mov    dword ptr [rc], VERR_VMX_INVALID_VMCS_PTR
         jmp    the_end
-
 valid_vmcs:
         jnz    the_end
@@ -526 +788 @@
     }
     return rc;
-# endif
-}
+
+# else
+#  error "Shouldn't be here..."
+# endif
+}
+#endif
+
+
+#if 0
+#if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
+DECLASM(int) VMXWriteVmcs32(uint32_t uFieldEnc, uint32_t u32Val);
+#else
+DECLINLINE(int) VMXWriteVmcs32(uint32_t uFieldEnc, uint32_t u32Val)
+{
+# if RT_INLINE_ASM_GNU_STYLE
+    int rc = VINF_SUCCESS;
+    __asm__ __volatile__ (
+       ".byte  0x0f, 0x79, 0xc2        # VMWRITE eax, edx       \n\t"
+       "ja     2f                                               \n\t"
+       "je     1f                                               \n\t"
+       "movl   $" RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0       \n\t"
+       "jmp    2f                                               \n\t"
+       "1:                                                      \n\t"
+       "movl   $" RT_XSTR(VERR_VMX_INVALID_VMCS_FIELD)", %0     \n\t"
+       "2:                                                      \n\t"
+       :"=rm"(rc)
+       :"0"(VINF_SUCCESS),
+        "a"(uFieldEnc),
+        "d"(u32Val)
+       );
+    return rc;
+
+# elif VMX_USE_MSC_INTRINSICS
+     unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u32Val);
+     if (RT_LIKELY(rcMsc == 0))
+         return VINF_SUCCESS;
+     return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+
+#else
+    int rc = VINF_SUCCESS;
+    __asm
+    {
+        push   dword ptr [u32Val]
+        mov    eax, [uFieldEnc]
+        _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, 4
+    }
+    return rc;
+# endif
+}
+#endif
 #endif
 
@@ -545 +867 @@
  *          will be VERR_VMX_INVALID_VMCS_PTR.
  */
-#if (defined(RT_ARCH_AMD64) && VMX_USE_MSC_INTRINSICS)
+#if defined(RT_ARCH_X86) || (RT_INLINE_ASM_EXTERNAL && !VMX_USE_MSC_INTRINSICS)
+DECLASM(int) VMXWriteVmcs64(uint32_t uFieldEnc, uint64_t u64Val);
+#else
 DECLINLINE(int) VMXWriteVmcs64(uint32_t uFieldEnc, uint64_t u64Val)
 {
+# if VMX_USE_MSC_INTRINSICS
     unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u64Val);
     if (RT_LIKELY(rcMsc == 0))
         return VINF_SUCCESS;
     return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+
+# elif RT_INLINE_ASM_GNU_STYLE
+    int rc;
+    __asm__ __volatile__ (
+       ".byte  0x0f, 0x79, 0xc2        # VMWRITE eax, edx        \n\t"
+       "ja     2f                                                \n\t"
+       "je     1f                                                \n\t"
+       "movl   $" RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0        \n\t"
+       "jmp    2f                                                \n\t"
+       "1:                                                       \n\t"
+       "movl   $" RT_XSTR(VERR_VMX_INVALID_VMCS_FIELD)", %0      \n\t"
+       "2:                                                       \n\t"
+       :"=rm"(rc)
+       :"0"(VINF_SUCCESS),
+        "a"(uFieldEnc),
+        "d"(u64Val)
+       );
+    return rc;
+
+# else
+#  error "Shouldn't be here..."
+# endif
+}
+#endif
+
+
+#if 0
+#if (defined(RT_ARCH_AMD64) && VMX_USE_MSC_INTRINSICS)
+DECLINLINE(int) VMXWriteVmcs64(uint32_t uFieldEnc, uint64_t u64Val)
+{
+    unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u64Val);
+    if (RT_LIKELY(rcMsc == 0))
+        return VINF_SUCCESS;
+    return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
 }
 #else
 DECLASM(int) VMXWriteVmcs64(uint32_t uFieldEnc, uint64_t u64Val);
+#endif
 #endif
 
@@ -623 +983 @@
  *          will be VERR_VMX_INVALID_VMCS_PTR.
  */
-#if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
+#if RT_INLINE_ASM_EXTERNAL && !VMX_USE_MSC_INTRINSICS
 DECLASM(int) VMXReadVmcs32(uint32_t uFieldEnc, uint32_t *pData);
 #else
 DECLINLINE(int) VMXReadVmcs32(uint32_t uFieldEnc, uint32_t *pData)
 {
-# if RT_INLINE_ASM_GNU_STYLE
-    int rc = VINF_SUCCESS;
+# if VMX_USE_MSC_INTRINSICS
+    unsigned char rcMsc;
+    uint64_t u64Tmp;
+    rcMsc = __vmx_vmread(uFieldEnc, &u64Tmp);
+    *pData = (uint32_t)u64Tmp;
+    if (RT_LIKELY(rcMsc == 0))
+        return VINF_SUCCESS;
+    return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+
+# elif RT_INLINE_ASM_GNU_STYLE
+    int rc;
     __asm__ __volatile__ (
        "movl   $" RT_XSTR(VINF_SUCCESS)", %0                     \n\t"
@@ -647 +1016 @@
     return rc;
 
+# elif defined(RT_ARCH_X86)
+    int rc = VINF_SUCCESS;
+    __asm
+    {
+        sub     esp, 4
+        mov     dword ptr [esp], 0
+        mov     eax, [uFieldEnc]
+        _emit   0x0f
+        _emit   0x78
+        _emit   0x04
+        _emit   0x24     /* VMREAD eax, [esp] */
+        mov     edx, pData
+        pop     dword ptr [edx]
+        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:
+    }
+    return rc;
+
+# else
+#  error "Shouldn't be here..."
+# endif
+}
+#endif
+
+#if 0
+#if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS)
+DECLASM(int) VMXReadVmcs32(uint32_t uFieldEnc, uint32_t *pData);
+#else
+DECLINLINE(int) VMXReadVmcs32(uint32_t uFieldEnc, uint32_t *pData)
+{
+# if RT_INLINE_ASM_GNU_STYLE
+    int rc = VINF_SUCCESS;
+    __asm__ __volatile__ (
+       "movl   $" RT_XSTR(VINF_SUCCESS)", %0                     \n\t"
+       ".byte  0x0f, 0x78, 0xc2        # VMREAD eax, edx         \n\t"
+       "ja     2f                                                \n\t"
+       "je     1f                                                \n\t"
+       "movl   $" RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0        \n\t"
+       "jmp    2f                                                \n\t"
+       "1:                                                       \n\t"
+       "movl   $" RT_XSTR(VERR_VMX_INVALID_VMCS_FIELD)", %0      \n\t"
+       "2:                                                       \n\t"
+       :"=&r"(rc),
+        "=d"(*pData)
+       :"a"(uFieldEnc),
+        "d"(0)
+       );
+    return rc;
+
 # elif VMX_USE_MSC_INTRINSICS
     unsigned char rcMsc;
@@ -686 +1109 @@
 }
 #endif
+#endif
 
 
@@ -702 +1126 @@
  *          will be VERR_VMX_INVALID_VMCS_PTR.
  */
+#if defined(RT_ARCH_X86) || (RT_INLINE_ASM_EXTERNAL && !VMX_USE_MSC_INTRINSICS)
+DECLASM(int) VMXReadVmcs64(uint32_t uFieldEnc, uint64_t *pData);
+#else
+DECLINLINE(int) VMXReadVmcs64(uint32_t uFieldEnc, uint64_t *pData)
+{
+# if VMX_USE_MSC_INTRINSICS
+    unsigned char rcMsc;
+    rcMsc = __vmx_vmread(uFieldEnc, pData);
+    if (RT_LIKELY(rcMsc == 0))
+        return VINF_SUCCESS;
+    return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+
+# elif RT_INLINE_ASM_GNU_STYLE
+    int rc;
+    __asm__ __volatile__ (
+       "movl   $" RT_XSTR(VINF_SUCCESS)", %0                     \n\t"
+       ".byte  0x0f, 0x78, 0xc2        # VMREAD eax, edx         \n\t"
+       "ja     2f                                                \n\t"
+       "je     1f                                                \n\t"
+       "movl   $" RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0        \n\t"
+       "jmp    2f                                                \n\t"
+       "1:                                                       \n\t"
+       "movl   $" RT_XSTR(VERR_VMX_INVALID_VMCS_FIELD)", %0      \n\t"
+       "2:                                                       \n\t"
+       :"=&r"(rc),
+        "=d"(*pData)
+       :"a"(uFieldEnc),
+        "d"(0)
+       );
+    return rc;
+
+# else
+#  error "Shouldn't be here..."
+# endif
+}
+#endif
+
+
+#if 0
 #if (!defined(RT_ARCH_X86) && !VMX_USE_MSC_INTRINSICS)
 DECLASM(int) VMXReadVmcs64(uint32_t uFieldEnc, uint64_t *pData);
@@ -736 +1199 @@
 }
 #endif
+#endif