Changeset 74338 in vbox for trunk/src/VBox

Timestamp:

Sep 18, 2018 10:02:32 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 remove unused macro.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (1 diff)
• IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)

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

@@ -12539 +12539 @@
  *  64-bit code segment when in long mode (applicable to all VMX instructions
  *  except VMCALL).
- *
- *  @note Update IEM_VMX_INSTR_CHECKS() if changes are made here.
  */
 #define IEMOP_HLP_VMX_INSTR(a_szInstr, a_InsDiagPrefix) \

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -389 +389 @@
     { \
         (a_pVCpu)->cpum.GstCtx.hwvirt.vmx.GCPhysVmcs = NIL_RTGCPHYS; \
-    } while (0)
-
-/** Check the common VMX instruction preconditions.
- * @note Any changes here, also check if IEMOP_HLP_VMX_INSTR needs updating.
- */
-#define IEM_VMX_INSTR_CHECKS(a_pVCpu, a_szInstr, a_InsDiagPrefix) \
-    do { \
-        if (   !IEM_IS_REAL_OR_V86_MODE(a_pVCpu) \
-            && (   !IEM_IS_LONG_MODE(a_pVCpu) \
-                ||  IEM_IS_64BIT_CODE(a_pVCpu))) \
-        { /* likely */ } \
-        else \
-        { \
-            if (IEM_IS_REAL_OR_V86_MODE(a_pVCpu)) \
-            { \
-                Log((a_szInstr ": Real or v8086 mode -> #UD\n")); \
-                (a_pVCpu)->cpum.GstCtx.hwvirt.vmx.enmDiag = a_InsDiagPrefix##_RealOrV86Mode; \
-                return iemRaiseUndefinedOpcode(a_pVCpu); \
-            } \
-            if (IEM_IS_LONG_MODE(a_pVCpu) && !IEM_IS_64BIT_CODE(a_pVCpu)) \
-            { \
-                Log((a_szInstr ": Long mode without 64-bit code segment -> #UD\n")); \
-                (a_pVCpu)->cpum.GstCtx.hwvirt.vmx.enmDiag = a_InsDiagPrefix##_LongModeCS; \
-                return iemRaiseUndefinedOpcode(a_pVCpu); \
-            } \
-        } \
     } while (0)