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

Timestamp:

Aug 2, 2018 8:45:43 AM (7 years ago)

Author:

vboxsync

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

124067

Message:

VMM/IEM: Nested VMX: bugref:9180 VMX instruction common macros.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -324 +324 @@
 
 /**
+ * Check if we're currently executing in a 64-bit code segment.
+ *
+ * @returns @c true if it is, @c false if not.
+ * @param   a_pVCpu         The cross context virtual CPU structure of the calling thread.
+ */
+#define IEM_IS_64BIT_CODE(a_pVCpu)          (CPUMIsGuestIn64BitCodeEx(IEM_GET_CTX(a_pVCpu)))
+
+/**
  * Check if we're currently executing in real mode.
  *
@@ -374 +382 @@
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) || defined(DOXYGEN_RUNNING)
 # define IEM_USE_UNALIGNED_DATA_ACCESS
+#endif
+
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+/**
+ * Check the common VMX instruction preconditions.
+ */
+#define IEM_VMX_INSTR_COMMON_CHECKS(a_pVCpu, a_Instr) \
+    do { \
+    { \
+        if (!IEM_IS_VMX_ENABLED(a_pVCpu)) \
+        { \
+            Log((RT_STR(a_Instr) ": CR4.VMXE not enabled -> #UD\n")); \
+            return iemRaiseUndefinedOpcode(a_pVCpu); \
+        } \
+        if (IEM_IS_REAL_OR_V86_MODE(a_pVCpu)) \
+        { \
+            Log((RT_STR(a_Instr) ": Real or v8086 mode -> #UD\n")); \
+            return iemRaiseUndefinedOpcode(a_pVCpu); \
+        } \
+        if (IEM_IS_LONG_MODE(a_pVCpu) && !IEM_IS_64BIT_CODE(a_pVCpu)) \
+        { \
+            Log((RT_STR(a_Instr) ": Long mode without 64-bit code segment -> #UD\n")); \
+            return iemRaiseUndefinedOpcode(a_pVCpu); \
+        } \
+} while (0)
+
+/**
+ * Check if VMX is enabled.
+ */
+# define IEM_IS_VMX_ENABLED(a_pVCpu)                         (CPUMIsGuestVmxEnabled(IEM_GET_CTX(a_pVCpu)))
+
+#else
+# define IEM_VMX_INSTR_COMMON_CHECKS(a_pVCpu, a_Instr)       do { } while (0)
+# define IEM_IS_VMX_ENABLED(a_pVCpu)                         (false)
+
 #endif
 
@@ -409 +452 @@
 
 /**
- * Check if an SVM is enabled.
+ * Check if SVM is enabled.
  */
 # define IEM_IS_SVM_ENABLED(a_pVCpu)                         (CPUMIsGuestSvmEnabled(IEM_GET_CTX(a_pVCpu)))
@@ -484 +527 @@
 # define IEM_RETURN_SVM_CRX_VMEXIT(a_pVCpu, a_uExitCode, a_enmAccessCrX, a_iGReg)         do { return VERR_SVM_IPE_1; } while (0)
 
-#endif /* VBOX_WITH_NESTED_HWVIRT_SVM */
+#endif