Changeset 99958 in vbox for trunk/src/VBox/VMM/include

Timestamp:

May 24, 2023 2:47:30 PM (22 months ago)

Author:

vboxsync

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

157616

Message:

IEM: Consistently use DONE_VEX_DECODING_EX macros to check for CPU feature bits. Removed the non-EX variants of the macros as they are no longer used.

File:

• trunk/src/VBox/VMM/include/IEMOpHlp.h (modified) (4 diffs)

trunk/src/VBox/VMM/include/IEMOpHlp.h

@@ -453 +453 @@
 /**
  * Done decoding VEX instruction, raise \#UD exception if any lock, rex, repz,
- * repnz or size prefixes are present, or if in real or v8086 mode.
- */
-#define IEMOP_HLP_DONE_VEX_DECODING() \
-    do \
-    { \
-        if (RT_LIKELY(   !(  pVCpu->iem.s.fPrefixes \
-                           & (IEM_OP_PRF_LOCK | IEM_OP_PRF_REPZ | IEM_OP_PRF_REPNZ | IEM_OP_PRF_SIZE_OP | IEM_OP_PRF_REX)) \
-                      && !IEM_IS_REAL_OR_V86_MODE(pVCpu) )) \
-        { /* likely */ } \
-        else \
-            return IEMOP_RAISE_INVALID_OPCODE(); \
-    } while (0)
-
-/**
- * Done decoding VEX instruction, raise \#UD exception if any lock, rex, repz,
  * repnz or size prefixes are present, if in real or v8086 mode, or if the
- * a_fFeature is present in the guest CPU.
+ * a_fFeature is not present in the guest CPU.
  */
 #define IEMOP_HLP_DONE_VEX_DECODING_EX(a_fFeature) \
@@ -485 +470 @@
 /**
  * Done decoding VEX instruction, raise \#UD exception if any lock, rex, repz,
- * repnz or size prefixes are present, or if in real or v8086 mode.
- */
-#define IEMOP_HLP_DONE_VEX_DECODING_L0() \
-    do \
-    { \
-        if (RT_LIKELY(   !(  pVCpu->iem.s.fPrefixes \
-                           & (IEM_OP_PRF_LOCK | IEM_OP_PRF_REPZ | IEM_OP_PRF_REPNZ | IEM_OP_PRF_SIZE_OP | IEM_OP_PRF_REX)) \
-                      && !IEM_IS_REAL_OR_V86_MODE(pVCpu) \
-                      && pVCpu->iem.s.uVexLength == 0)) \
-        { /* likely */ } \
-        else \
-            return IEMOP_RAISE_INVALID_OPCODE(); \
-    } while (0)
-
-/**
- * Done decoding VEX instruction, raise \#UD exception if any lock, rex, repz,
- * repnz or size prefixes are present, or if in real or v8086 mode.
+ * repnz or size prefixes are present, or if in real or v8086 mode, or if the
+ * a_fFeature is not present in the guest CPU.
  */
 #define IEMOP_HLP_DONE_VEX_DECODING_L0_EX(a_fFeature) \
@@ -516 +486 @@
     } while (0)
 
-
-/**
- * Done decoding VEX instruction, raise \#UD exception if any lock, rex, repz,
- * repnz or size prefixes are present, or if the VEX.VVVV field doesn't indicate
- * register 0, or if in real or v8086 mode.
- */
-#define IEMOP_HLP_DONE_VEX_DECODING_NO_VVVV() \
-    do \
-    { \
-        if (RT_LIKELY(   !(  pVCpu->iem.s.fPrefixes \
-                           & (IEM_OP_PRF_LOCK | IEM_OP_PRF_REPZ | IEM_OP_PRF_REPNZ | IEM_OP_PRF_SIZE_OP | IEM_OP_PRF_REX)) \
-                      && !pVCpu->iem.s.uVex3rdReg \
-                      && !IEM_IS_REAL_OR_V86_MODE(pVCpu) )) \
-        { /* likely */ } \
-        else \
-            return IEMOP_RAISE_INVALID_OPCODE(); \
-    } while (0)
-
 /**
  * Done decoding VEX instruction, raise \#UD exception if any lock, rex, repz,
@@ -548 +500 @@
                       && !IEM_IS_REAL_OR_V86_MODE(pVCpu) \
                       && IEM_GET_GUEST_CPU_FEATURES(pVCpu)->a_fFeature )) \
-        { /* likely */ } \
-        else \
-            return IEMOP_RAISE_INVALID_OPCODE(); \
-    } while (0)
-
-/**
- * Done decoding VEX, no V, L=0.
- * Raises \#UD exception if rex, rep, opsize or lock prefixes are present, if
- * we're in real or v8086 mode, if VEX.V!=0xf, or if VEX.L!=0.
- */
-#define IEMOP_HLP_DONE_VEX_DECODING_L0_AND_NO_VVVV() \
-    do \
-    { \
-        if (RT_LIKELY(   !(  pVCpu->iem.s.fPrefixes \
-                           & (IEM_OP_PRF_LOCK | IEM_OP_PRF_SIZE_OP | IEM_OP_PRF_REPZ | IEM_OP_PRF_REPNZ | IEM_OP_PRF_REX)) \
-                      && pVCpu->iem.s.uVexLength == 0 \
-                      && pVCpu->iem.s.uVex3rdReg == 0 \
-                      && !IEM_IS_REAL_OR_V86_MODE(pVCpu))) \
         { /* likely */ } \
         else \