Changeset 105462 in vbox for trunk

Timestamp:

Jul 24, 2024 8:42:00 AM (6 months ago)

Author:

vboxsync

Message:

VMM/IEM: Simplify the MXCSR exception calculation a tiny bit, bugref:10652

File:

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

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

@@ -15598 +15598 @@
      * are set and are unmasked in MXCSR.
      */
+    uint32_t const fMxcsrExcpMask = ~((fMxcsr & X86_MXCSR_XCPT_MASK) >> X86_MXCSR_XCPT_MASK_SHIFT);
     if (  ((fMxcsr | fXcpt) & (X86_MXCSR_IE | X86_MXCSR_DE | X86_MXCSR_ZE))
-        & ~((fMxcsr & X86_MXCSR_XCPT_MASK) >> X86_MXCSR_XCPT_MASK_SHIFT))
+        & fMxcsrExcpMask)
         return fMxcsr | (fXcpt & (X86_MXCSR_IE | X86_MXCSR_DE | X86_MXCSR_ZE));
 
@@ -15612 +15613 @@
 
     /* If OE/UE get raised PE won't be set because of the lower priority. */
-    if (   (   ((fXcpt & (X86_MXCSR_PE | X86_MXCSR_OE)) == (X86_MXCSR_PE | X86_MXCSR_OE))
-            && !(fMxcsr & X86_MXCSR_OM))
-        || (   ((fXcpt & (X86_MXCSR_PE | X86_MXCSR_UE)) == (X86_MXCSR_PE | X86_MXCSR_UE))
-            && !(fMxcsr & X86_MXCSR_UM)))
+    if (  (fXcpt & (X86_MXCSR_UE | X86_MXCSR_OE))
+        & fMxcsrExcpMask)
         fXcpt &= ~X86_MXCSR_PE;
 
@@ -15673 +15672 @@
      * are set and are unmasked in MXCSR.
      */
+    uint32_t const fMxcsrExcpMask = ~((fMxcsr & X86_MXCSR_XCPT_MASK) >> X86_MXCSR_XCPT_MASK_SHIFT);
     if (  ((fMxcsr | fXcpt) & (X86_MXCSR_IE | X86_MXCSR_DE | X86_MXCSR_ZE))
-        & ~((fMxcsr & X86_MXCSR_XCPT_MASK) >> X86_MXCSR_XCPT_MASK_SHIFT))
+        & fMxcsrExcpMask)
         return fMxcsr | (fXcpt & (X86_MXCSR_IE | X86_MXCSR_DE | X86_MXCSR_ZE));
 
@@ -15688 +15688 @@
 
     /* If OE/UE get raised PE won't be set because of the lower priority. */
-    if (   (   ((fXcpt & (X86_MXCSR_PE | X86_MXCSR_OE)) == (X86_MXCSR_PE | X86_MXCSR_OE))
-            && !(fMxcsr & X86_MXCSR_OM))
-        || (   ((fXcpt & (X86_MXCSR_PE | X86_MXCSR_UE)) == (X86_MXCSR_PE | X86_MXCSR_UE))
-            && !(fMxcsr & X86_MXCSR_UM)))
+    if (  (fXcpt & (X86_MXCSR_UE | X86_MXCSR_OE))
+        & fMxcsrExcpMask)
         fXcpt &= ~X86_MXCSR_PE;