Changeset 99352 in vbox for trunk/src/VBox

Timestamp:

Apr 8, 2023 12:19:35 AM (2 years ago)

Author:

vboxsync

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

156755

Message:

VMM/IEM: Mojo improvments of the IEM_MC_MAYBE_RAISE_XXXX macros. bugref:10369

File:

• trunk/src/VBox/VMM/include/IEMMc.h (modified) (5 diffs)

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

@@ -76 +76 @@
 #define IEM_MC_MAYBE_RAISE_DEVICE_NOT_AVAILABLE()       \
     do { \
-        if (!(pVCpu->cpum.GstCtx.cr0 & (X86_CR0_EM | X86_CR0_TS))) { /* probable */ } \
+        if (RT_LIKELY(!(pVCpu->cpum.GstCtx.cr0 & (X86_CR0_EM | X86_CR0_TS)))) \
+        { /* probable */ } \
         else return iemRaiseDeviceNotAvailable(pVCpu); \
     } while (0)
 #define IEM_MC_MAYBE_RAISE_WAIT_DEVICE_NOT_AVAILABLE()  \
     do { \
-        if (!((pVCpu->cpum.GstCtx.cr0 & (X86_CR0_MP | X86_CR0_TS)) == (X86_CR0_MP | X86_CR0_TS))) { /* probable */ } \
+        if (RT_LIKELY(!((pVCpu->cpum.GstCtx.cr0 & (X86_CR0_MP | X86_CR0_TS)) == (X86_CR0_MP | X86_CR0_TS)))) \
+        { /* probable */ } \
         else return iemRaiseDeviceNotAvailable(pVCpu); \
     } while (0)
 #define IEM_MC_MAYBE_RAISE_FPU_XCPT() \
     do { \
-        if (!(pVCpu->cpum.GstCtx.XState.x87.FSW & X86_FSW_ES)) { /* probable */ } \
+        if (RT_LIKELY(!(pVCpu->cpum.GstCtx.XState.x87.FSW & X86_FSW_ES))) \
+        { /* probable */ } \
         else return iemRaiseMathFault(pVCpu); \
     } while (0)
@@ -100 +103 @@
 #define IEM_MC_MAYBE_RAISE_SSE_RELATED_XCPT() \
     do { \
-        if (   !(pVCpu->cpum.GstCtx.cr0 & X86_CR0_EM) \
-            && (pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSFXSR)) { /* probable */ } \
-        else return iemRaiseUndefinedOpcode(pVCpu); \
-        \
-        if (!(pVCpu->cpum.GstCtx.cr0 & X86_CR0_TS)) { /* probable */ } \
-        else return iemRaiseDeviceNotAvailable(pVCpu); \
+        /* Since the CR4 and CR0 bits doesn't overlap, it can be reduced to a
+           single compare branch in the more probable code path. */ \
+        AssertCompile(!((X86_CR0_EM | X86_CR0_TS) & X86_CR4_OSFXSR)); \
+        if (RT_LIKELY(  (  (pVCpu->cpum.GstCtx.cr0 & (X86_CR0_EM | X86_CR0_TS)) \
+                         | (pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSFXSR)) \
+                      ==                             X86_CR4_OSFXSR)) \
+        { /* likely */ } \
+        else if (   (pVCpu->cpum.GstCtx.cr0 & X86_CR0_EM) \
+                 || !(pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSFXSR)) \
+            return iemRaiseUndefinedOpcode(pVCpu); \
+        else \
+            return iemRaiseDeviceNotAvailable(pVCpu); \
     } while (0)
 #define IEM_MC_MAYBE_RAISE_MMX_RELATED_XCPT() \
     do { \
-        if (!(pVCpu->cpum.GstCtx.cr0 & (X86_CR0_EM | X86_CR0_TS))) \
+        if (RT_LIKELY(!(pVCpu->cpum.GstCtx.cr0 & (X86_CR0_EM | X86_CR0_TS)))) \
         { /* probable */ } \
         else if (pVCpu->cpum.GstCtx.cr0 & X86_CR0_EM) \
@@ -121 +130 @@
 #define IEM_MC_RAISE_GP0_IF_CPL_NOT_ZERO() \
     do { \
-        if (pVCpu->iem.s.uCpl == 0) { /* probable */ } \
+        if (RT_LIKELY(pVCpu->iem.s.uCpl == 0)) { /* probable */ } \
         else return iemRaiseGeneralProtectionFault0(pVCpu); \
     } while (0)
@@ -131 +140 @@
 #define IEM_MC_MAYBE_RAISE_FSGSBASE_XCPT() \
     do { \
-        if (   pVCpu->iem.s.enmCpuMode == IEMMODE_64BIT \
-            && (pVCpu->cpum.GstCtx.cr4 & X86_CR4_FSGSBASE)) { /* probable */ } \
+        if (RT_LIKELY(   pVCpu->iem.s.enmCpuMode == IEMMODE_64BIT \
+                      && (pVCpu->cpum.GstCtx.cr4 & X86_CR4_FSGSBASE))) \
+        { /* probable */ } \
         else return iemRaiseUndefinedOpcode(pVCpu); \
     } while (0)
@@ -142 +152 @@
 #define IEM_MC_MAYBE_RAISE_SSE_AVX_SIMD_FP_OR_UD_XCPT() \
     do { \
-        if ((  ~((pVCpu->cpum.GstCtx.XState.x87.MXCSR & X86_MXCSR_XCPT_MASK) >> X86_MXCSR_XCPT_MASK_SHIFT) \
-             & (pVCpu->cpum.GstCtx.XState.x87.MXCSR & X86_MXCSR_XCPT_FLAGS)) == 0) \
+        if (RT_LIKELY((  ~((pVCpu->cpum.GstCtx.XState.x87.MXCSR & X86_MXCSR_XCPT_MASK) >> X86_MXCSR_XCPT_MASK_SHIFT) \
+                       & (pVCpu->cpum.GstCtx.XState.x87.MXCSR & X86_MXCSR_XCPT_FLAGS)) == 0)) \
         { /* probable */ } \
         else \