Changeset 105739 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 19, 2024 11:42:23 PM (5 months ago)

Author:

vboxsync

Message:

VMM/IEM: Don't try save IEMNATIVE_REG_FIXED_TMP0 together with other in-use volatile registers when making calls (todo 10). bugref:10720

Location:

trunk/src/VBox/VMM

Files:

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

trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompFuncs.h

@@ -8560 +8560 @@
                                      ? iemNativeLabelCreate(pReNative, kIemNativeLabelType_TlbLookup, UINT32_MAX, uTlbSeqNo)
                                      : UINT32_MAX;
-//off=iemNativeEmitBrk(pReNative, off, 0);
+
     /*
      * Jump to the TLB lookup code.
@@ -10162 +10162 @@
 {
     /* Grab the MXCSR register, it must not be call volatile or we end up freeing it when setting up the call below. */
-    uint8_t const  idxRegMxCsr = iemNativeRegAllocTmpForGuestReg(pReNative, &off, kIemNativeGstReg_MxCsr,
-                                                                 kIemNativeGstRegUse_ForUpdate, true /*fNoVolatileRegs*/);
+    uint8_t const idxRegMxCsr = iemNativeRegAllocTmpForGuestReg(pReNative, &off, kIemNativeGstReg_MxCsr,
+                                                                kIemNativeGstRegUse_ForUpdate, true /*fNoVolatileRegs*/);
     AssertRelease(!(RT_BIT_32(idxRegMxCsr) & IEMNATIVE_CALL_VOLATILE_GREG_MASK));
 

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

@@ -4391 +4391 @@
 
     /* fKeepVars will reduce this mask. */
-    uint32_t fRegsToFree = IEMNATIVE_CALL_VOLATILE_GREG_MASK;
+    uint32_t fRegsToFree = IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK;
+
+#ifdef RT_ARCH_ARM64
+AssertCompile(IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK == UINT32_C(0x37fff));
+#endif
 
     /*
@@ -4398 +4402 @@
     if (cArgs > RT_ELEMENTS(g_aidxIemNativeCallRegs))
         cArgs = RT_ELEMENTS(g_aidxIemNativeCallRegs);
-    uint32_t fRegsToMove = IEMNATIVE_CALL_VOLATILE_GREG_MASK
-#ifdef IEMNATIVE_REG_FIXED_TMP0
-                         & ~RT_BIT_32(IEMNATIVE_REG_FIXED_TMP0)
-#endif
-#ifdef IEMNATIVE_REG_FIXED_TMP1
-                         & ~RT_BIT_32(IEMNATIVE_REG_FIXED_TMP1)
-#endif
+    uint32_t fRegsToMove = IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK
 #ifdef IEMNATIVE_REG_FIXED_PC_DBG
                          & ~RT_BIT_32(IEMNATIVE_REG_FIXED_PC_DBG)
@@ -4482 +4480 @@
     {
         Log12(("iemNativeRegMoveAndFreeAndFlushAtCall: bmHstRegsWithGstShadow %#RX32 -> %#RX32; removed %#RX32\n",
-               pReNative->Core.bmHstRegsWithGstShadow, pReNative->Core.bmHstRegsWithGstShadow & ~IEMNATIVE_CALL_VOLATILE_GREG_MASK, fHstRegsWithGstShadow));
+               pReNative->Core.bmHstRegsWithGstShadow, pReNative->Core.bmHstRegsWithGstShadow & ~IEMNATIVE_CALL_VOLATILE_GREG_MASK,
+               fHstRegsWithGstShadow));
         pReNative->Core.bmHstRegsWithGstShadow &= ~fHstRegsWithGstShadow;
         do
@@ -7777 +7776 @@
 iemNativeVarSaveVolatileRegsPreHlpCall(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint32_t fHstRegsNotToSave)
 {
-    uint32_t fHstRegs = pReNative->Core.bmHstRegs & IEMNATIVE_CALL_VOLATILE_GREG_MASK & ~fHstRegsNotToSave;
+    uint32_t fHstRegs = pReNative->Core.bmHstRegs & IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK & ~fHstRegsNotToSave;
     if (fHstRegs)
     {
@@ -7918 +7917 @@
 iemNativeVarRestoreVolatileRegsPostHlpCall(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint32_t fHstRegsNotToSave)
 {
-    uint32_t fHstRegs = pReNative->Core.bmHstRegs & IEMNATIVE_CALL_VOLATILE_GREG_MASK & ~fHstRegsNotToSave;
+    uint32_t fHstRegs = pReNative->Core.bmHstRegs & IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK & ~fHstRegsNotToSave;
     if (fHstRegs)
     {

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

@@ -184 +184 @@
 /** @def IEMNATIVE_REG_FIXED_TMP0
  * Dedicated temporary register.
+ * @note This has extremely short lifetime, must be used with great care to make
+ *       sure any calling code or code being called is making use of it.
+ *       It will definitely not survive a call or anything of that nature.
  * @todo replace this by a register allocator and content tracker.  */
 /** @def IEMNATIVE_REG_FIXED_MASK
@@ -409 +412 @@
 # endif
 #endif
+
+/** @def IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK
+ * Variant of IEMNATIVE_CALL_VOLATILE_GREG_MASK that excludes
+ * IEMNATIVE_REG_FIXED_TMP0 on hosts that uses it. */
+#ifdef IEMNATIVE_REG_FIXED_TMP0
+# ifdef IEMNATIVE_REG_FIXED_TMP1
+#  define IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK   (  IEMNATIVE_CALL_VOLATILE_GREG_MASK \
+                                                     & ~(  RT_BIT_32(IEMNATIVE_REG_FIXED_TMP0) \
+                                                         | RT_BIT_32(IEMNATIVE_REG_FIXED_TMP1)))
+# else
+#  define IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK   (IEMNATIVE_CALL_VOLATILE_GREG_MASK & ~RT_BIT_32(IEMNATIVE_REG_FIXED_TMP0))
+# endif
+#else
+# define IEMNATIVE_CALL_VOLATILE_NOTMP_GREG_MASK    IEMNATIVE_CALL_VOLATILE_GREG_MASK
+#endif
 /** @} */