Changeset 99333 in vbox for trunk/src

Timestamp:

Apr 7, 2023 12:30:43 AM (22 months ago)

Author:

vboxsync

Message:

VMM/IEM: Use IEMOP_HLP_DONE_DECODING_*EX() rather than IEM_MC_MAYBE_RAISE_PCLMUL_RELATED_XCPT and firends to do the CPUID check. bugref:10369

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllInstructionsThree0f3a.cpp.h (modified) (2 diffs)
• include/IEMMc.h (modified) (2 diffs)

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

@@ -1055 +1055 @@
          */
         uint8_t bImm; IEM_OPCODE_GET_NEXT_U8(&bImm);
-        IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+        IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX_EX(fPclMul);
         IEM_MC_BEGIN(3, 0);
         IEM_MC_ARG(PRTUINT128U,                 puDst,               0);
@@ -1085 +1085 @@
         uint8_t bImm; IEM_OPCODE_GET_NEXT_U8(&bImm);
         IEM_MC_ARG_CONST(uint8_t,               bImmArg, /*=*/ bImm, 2);
-        IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+        IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX_EX(fPclMul);
         IEM_MC_MAYBE_RAISE_PCLMUL_RELATED_XCPT();
         IEM_MC_FETCH_MEM_U128_ALIGN_SSE(uSrc, pVCpu->iem.s.iEffSeg, GCPtrEffSrc);

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

@@ -206 +206 @@
             if (pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSXMMEEXCPT)\
                 return iemRaiseSimdFpException(pVCpu); \
-            else \
-                return iemRaiseUndefinedOpcode(pVCpu); \
+            return iemRaiseUndefinedOpcode(pVCpu); \
         } \
     } while (0)
@@ -214 +213 @@
         if (pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSXMMEEXCPT)\
             return iemRaiseSimdFpException(pVCpu); \
-        else \
-            return iemRaiseUndefinedOpcode(pVCpu); \
+        return iemRaiseUndefinedOpcode(pVCpu); \
     } while (0)
 #define IEM_MC_MAYBE_RAISE_PCLMUL_RELATED_XCPT() \
     do { \
         if (   (pVCpu->cpum.GstCtx.cr0 & X86_CR0_EM) \
-            || !(pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSFXSR) \
-            || !IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fPclMul) \
+            || !(pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSFXSR)) \
             return iemRaiseUndefinedOpcode(pVCpu); \
         if (pVCpu->cpum.GstCtx.cr0 & X86_CR0_TS) \