Changeset 103614 in vbox

Timestamp:

Feb 29, 2024 2:07:04 PM (11 months ago)

Author:

vboxsync

Message:

VMM/IEM: Fixed liveness state layout after r161946 broke it. Added compile time assert to help detecting this. bugref:10372 bugref:10371

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllN8veLiveness.cpp (modified) (2 diffs)
• include/IEMN8veRecompiler.h (modified) (5 diffs)

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

@@ -176 +176 @@
         } while (0)
 #endif
+
+
+#define IEM_LIVENESS_CR0_INPUT()                    IEM_LIVENESS_BITMAP_MEMBER_INPUT(  fCr0, 0)
+#define IEM_LIVENESS_CR4_INPUT()                    IEM_LIVENESS_BITMAP_MEMBER_INPUT(  fCr4, 0)
+
+
+#define IEM_LIVENESS_FCW_INPUT()                    IEM_LIVENESS_BITMAP_MEMBER_INPUT(  fFcw, 0)
+#define IEM_LIVENESS_FCW_CLOBBER()                  IEM_LIVENESS_BITMAP_MEMBER_CLOBBER(fFcw, 0)
+#define IEM_LIVENESS_FCW_MODIFY()                   IEM_LIVENESS_BITMAP_MEMBER_MODIFY( fFcw, 0)
+
+
+#define IEM_LIVENESS_FSW_INPUT()                    IEM_LIVENESS_BITMAP_MEMBER_INPUT(  fFsw, 0)
+#define IEM_LIVENESS_FSW_CLOBBER()                  IEM_LIVENESS_BITMAP_MEMBER_CLOBBER(fFsw, 0)
+#define IEM_LIVENESS_FSW_MODIFY()                   IEM_LIVENESS_BITMAP_MEMBER_MODIFY( fFsw, 0)
 
 
@@ -430 +444 @@
 #define IEM_MC_NO_NATIVE_RECOMPILE()                                NOP()
 
-#define IEM_MC_RAISE_DIVIDE_ERROR()                                 NOP()
-#define IEM_MC_MAYBE_RAISE_DEVICE_NOT_AVAILABLE()                   IEM_LIVENESS_MARK_XCPT_OR_CALL()
-#define IEM_MC_MAYBE_RAISE_WAIT_DEVICE_NOT_AVAILABLE()              IEM_LIVENESS_MARK_XCPT_OR_CALL()
-#define IEM_MC_MAYBE_RAISE_FPU_XCPT()                               IEM_LIVENESS_MARK_XCPT_OR_CALL()
-#define IEM_MC_MAYBE_RAISE_AVX_RELATED_XCPT()                       IEM_LIVENESS_MARK_XCPT_OR_CALL()
-#define IEM_MC_MAYBE_RAISE_SSE_RELATED_XCPT()                       IEM_LIVENESS_MARK_XCPT_OR_CALL()
-#define IEM_MC_MAYBE_RAISE_MMX_RELATED_XCPT()                       IEM_LIVENESS_MARK_XCPT_OR_CALL()
+#define IEM_MC_RAISE_DIVIDE_ERROR()                                 IEM_LIVENESS_MARK_XCPT_OR_CALL()
+#define IEM_MC_MAYBE_RAISE_DEVICE_NOT_AVAILABLE()                   IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_CR0_INPUT()
+#define IEM_MC_MAYBE_RAISE_WAIT_DEVICE_NOT_AVAILABLE() \            IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_CR0_INPUT()
+#define IEM_MC_MAYBE_RAISE_FPU_XCPT()                               IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_FSW_INPUT()
+#define IEM_MC_MAYBE_RAISE_AVX_RELATED_XCPT() \
+    IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_CR0_INPUT(); IEM_LIVENESS_CR4_INPUT() //; IEM_LIVENESS_XCR0_INPUT()
+#define IEM_MC_MAYBE_RAISE_SSE_RELATED_XCPT() \
+    IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_CR0_INPUT(); IEM_LIVENESS_CR4_INPUT()
+#define IEM_MC_MAYBE_RAISE_MMX_RELATED_XCPT() \
+    IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_CR0_INPUT(); IEM_LIVENESS_FSW_INPUT()
 #define IEM_MC_RAISE_GP0_IF_CPL_NOT_ZERO()                          IEM_LIVENESS_MARK_XCPT_OR_CALL()
 #define IEM_MC_RAISE_GP0_IF_EFF_ADDR_UNALIGNED(a_EffAddr, a_cbAlign) IEM_LIVENESS_MARK_XCPT_OR_CALL()
-#define IEM_MC_MAYBE_RAISE_FSGSBASE_XCPT()                          IEM_LIVENESS_MARK_XCPT_OR_CALL()
+#define IEM_MC_MAYBE_RAISE_FSGSBASE_XCPT()                          IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_CR4_INPUT()
 #define IEM_MC_MAYBE_RAISE_NON_CANONICAL_ADDR_GP0(a_u64Addr)        IEM_LIVENESS_MARK_XCPT_OR_CALL()
-#define IEM_MC_MAYBE_RAISE_SSE_AVX_SIMD_FP_OR_UD_XCPT()             IEM_LIVENESS_MARK_XCPT_OR_CALL()
-#define IEM_MC_RAISE_SSE_AVX_SIMD_FP_OR_UD_XCPT()                   IEM_LIVENESS_MARK_XCPT_OR_CALL()
+#define IEM_MC_MAYBE_RAISE_SSE_AVX_SIMD_FP_OR_UD_XCPT()             IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_CR4_INPUT() /** @todo revisit when implemented. */
+#define IEM_MC_RAISE_SSE_AVX_SIMD_FP_OR_UD_XCPT()                   IEM_LIVENESS_MARK_XCPT_OR_CALL(); IEM_LIVENESS_CR4_INPUT()
 
 #define IEM_MC_LOCAL(a_Type, a_Name)                                NOP()

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

@@ -399 +399 @@
         uint64_t    bmGprs      : 16;   /**< 0x00 /  0: The 16 general purpose registers. */
         uint64_t    fUnusedPc   :  1;   /**< 0x10 / 16: (PC in ) */
-        uint64_t    uPadding1   :  3;   /**< 0x11 / 17: */
+        uint64_t    fCr0        :  1;   /**< 0x11 / 17: */
+        uint64_t    fFcw        :  1;   /**< 0x12 / 18: */
+        uint64_t    fFsw        :  1;   /**< 0x13 / 19: */
         uint64_t    bmSegBase   :  6;   /**< 0x14 / 20: */
         uint64_t    bmSegAttrib :  6;   /**< 0x1a / 26: */
         uint64_t    bmSegLimit  :  6;   /**< 0x20 / 32: */
         uint64_t    bmSegSel    :  6;   /**< 0x26 / 38: */
-        uint64_t    fEflOther   :  1;   /**< 0x2c / 44: Other EFLAGS bits   (~X86_EFL_STATUS_BITS & X86_EFL_LIVE_MASK). First! */
-        uint64_t    fEflCf      :  1;   /**< 0x2d / 45: Carry flag          (X86_EFL_CF / 0). */
-        uint64_t    fEflPf      :  1;   /**< 0x2e / 46: Parity flag         (X86_EFL_PF / 2). */
-        uint64_t    fEflAf      :  1;   /**< 0x2f / 47: Auxilary carry flag (X86_EFL_AF / 4). */
-        uint64_t    fEflZf      :  1;   /**< 0x30 / 48: Zero flag           (X86_EFL_ZF / 6). */
-        uint64_t    fEflSf      :  1;   /**< 0x31 / 49: Signed flag         (X86_EFL_SF / 7). */
-        uint64_t    fEflOf      :  1;   /**< 0x32 / 50: Overflow flag       (X86_EFL_OF / 12). */
-        uint64_t    uUnused     : 13;     /* 0x33 / 51 -> 0x40/64 */
+        uint64_t    fCr4        :  1;   /**< 0x2c / 44: */
+        uint64_t    fEflOther   :  1;   /**< 0x2d / 45: Other EFLAGS bits   (~X86_EFL_STATUS_BITS & X86_EFL_LIVE_MASK). First! */
+        uint64_t    fEflCf      :  1;   /**< 0x2e / 46: Carry flag          (X86_EFL_CF / 0). */
+        uint64_t    fEflPf      :  1;   /**< 0x2f / 47: Parity flag         (X86_EFL_PF / 2). */
+        uint64_t    fEflAf      :  1;   /**< 0x20 / 48: Auxilary carry flag (X86_EFL_AF / 4). */
+        uint64_t    fEflZf      :  1;   /**< 0x31 / 49: Zero flag           (X86_EFL_ZF / 6). */
+        uint64_t    fEflSf      :  1;   /**< 0x32 / 50: Signed flag         (X86_EFL_SF / 7). */
+        uint64_t    fEflOf      :  1;   /**< 0x33 / 51: Overflow flag       (X86_EFL_OF / 12). */
+        uint64_t    uUnused     : 12;     /* 0x34 / 52 -> 0x40/64 */
     };
 } IEMLIVENESSBIT;
@@ -473 +476 @@
 /** @name 64-bit value masks for IEMLIVENESSENTRY.
  * @{ */                                      /*         0xzzzzyyyyxxxxwwww */
-#define IEMLIVENESSBIT_MASK                     UINT64_C(0x0007fffffff0ffff)
+#define IEMLIVENESSBIT_MASK                     UINT64_C(0x000ffffffffeffff)
 
 #ifndef IEMLIVENESS_EXTENDED_LAYOUT
@@ -483 +486 @@
 #endif
 
-#define IEMLIVENESSBIT_ALL_EFL_MASK             UINT64_C(0x0007f00000000000)
+#define IEMLIVENESSBIT_ALL_EFL_MASK             UINT64_C(0x000fe00000000000)
 
 #ifndef IEMLIVENESS_EXTENDED_LAYOUT
@@ -678 +681 @@
  * Guest registers that can be shadowed in GPRs.
  *
- * This runs parallel to the first 128-bits of liveness state.  To avoid having
- * the SegLimitXxxx range cross from the 1st 64-bit word to the 2nd,
- * we've inserted some padding.  The EFlags must be placed last, as the liveness
- * state tracks it as 7 subcomponents and we don't want to waste space here.
+ * This runs parallel to the liveness state (IEMLIVENESSBIT, ++). The EFlags
+ * must be placed last, as the liveness state tracks it as 7 subcomponents and
+ * we don't want to waste space here.
+ *
+ * @note Make sure to update IEMLIVENESSBIT, IEMLIVENESSBIT_ALL_EFL_MASK and
+ *       friends as well as IEMAllN8veLiveness.cpp.
  */
 typedef enum IEMNATIVEGSTREG : uint8_t
@@ -704 +709 @@
 } IEMNATIVEGSTREG;
 AssertCompile((int)kIemNativeGstReg_SegLimitFirst == 32);
+AssertCompile((UINT64_C(0x7f) << kIemNativeGstReg_EFlags) == IEMLIVENESSBIT_ALL_EFL_MASK);
 
 /** @name Helpers for converting register numbers to IEMNATIVEGSTREG values.