Changeset 104151 in vbox

Timestamp:

Apr 4, 2024 9:29:59 AM (11 months ago)

Author:

vboxsync

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

162573

Message:

VMM/IEM: Deal with iemNativeDbgInfoAddGuestRegWriteback assertion. bugref:10614

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllN8veRecompiler.cpp (modified) (2 diffs)
• include/IEMInternal.h (modified) (1 diff)

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

@@ -2391 +2391 @@
 DECL_HIDDEN_THROW(void) iemNativeDbgInfoAddGuestRegWriteback(PIEMRECOMPILERSTATE pReNative, bool fSimdReg, uint64_t fGstReg)
 {
+    unsigned const cBitsGstRegMask = 25;
+    uint32_t const fGstRegMask     = RT_BIT_32(cBitsGstRegMask) - 1U;
+
+    /* The first block of 25 bits: */
+    if (fGstReg & fGstRegMask)
+    {
+        PIEMTBDBGENTRY const pEntry = iemNativeDbgInfoAddNewEntry(pReNative, pReNative->pDbgInfo);
+        pEntry->GuestRegWriteback.uType     = kIemTbDbgEntryType_GuestRegWriteback;
+        pEntry->GuestRegWriteback.fSimdReg  = fSimdReg ? 1 : 0;
+        pEntry->GuestRegWriteback.cShift    = 0;
+        pEntry->GuestRegWriteback.fGstReg   = (uint32_t)(fGstReg & fGstRegMask);
+        fGstReg &= ~(uint64_t)fGstRegMask;
+        if (!fGstReg)
+            return;
+    }
+
+    /* The second block of 25 bits: */
+    fGstReg >>= cBitsGstRegMask;
+    if (fGstReg & fGstRegMask)
+    {
+        PIEMTBDBGENTRY const pEntry = iemNativeDbgInfoAddNewEntry(pReNative, pReNative->pDbgInfo);
+        pEntry->GuestRegWriteback.uType     = kIemTbDbgEntryType_GuestRegWriteback;
+        pEntry->GuestRegWriteback.fSimdReg  = fSimdReg ? 1 : 0;
+        pEntry->GuestRegWriteback.cShift    = 0;
+        pEntry->GuestRegWriteback.fGstReg   = (uint32_t)(fGstReg & fGstRegMask);
+        fGstReg &= ~(uint64_t)fGstRegMask;
+        if (!fGstReg)
+            return;
+    }
+
+    /* The last block with 14 bits: */
+    fGstReg >>= cBitsGstRegMask;
+    Assert(fGstReg & fGstRegMask);
+    Assert((fGstReg & ~(uint64_t)fGstRegMask) == 0);
     PIEMTBDBGENTRY const pEntry = iemNativeDbgInfoAddNewEntry(pReNative, pReNative->pDbgInfo);
-    pEntry->GuestRegWriteback.uType         = kIemTbDbgEntryType_GuestRegWriteback;
-    pEntry->GuestRegWriteback.fSimdReg      = fSimdReg ? 1 : 0;
-    pEntry->GuestRegWriteback.fGstReg       = (uint32_t)fGstReg;
-    /** @todo r=aeichner Can't fit the whole register mask in the debug info entry, deal with it when it becomes necessary. */
-    Assert((uint64_t)pEntry->GuestRegWriteback.fGstReg == fGstReg);
+    pEntry->GuestRegWriteback.uType     = kIemTbDbgEntryType_GuestRegWriteback;
+    pEntry->GuestRegWriteback.fSimdReg  = fSimdReg ? 1 : 0;
+    pEntry->GuestRegWriteback.cShift    = 2;
+    pEntry->GuestRegWriteback.fGstReg   = (uint32_t)(fGstReg & fGstRegMask);
 }
 
@@ -8639 +8672 @@
                             pHlp->pfnPrintf(pHlp, "  Writing dirty %s registers (gst %#RX32)\n",
                                             pDbgInfo->aEntries[iDbgEntry].GuestRegWriteback.fSimdReg ? "SIMD" : "general",
-                                            pDbgInfo->aEntries[iDbgEntry].GuestRegWriteback.fGstReg);
+                                               (uint64_t)pDbgInfo->aEntries[iDbgEntry].GuestRegWriteback.fGstReg
+                                            << (pDbgInfo->aEntries[iDbgEntry].GuestRegWriteback.cShift * 25));
                             continue;
 #endif

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

@@ -1119 +1119 @@
         /** Flag whether this is about a SIMD (true) or general (false) register flush. */
         uint32_t    fSimdReg      : 1;
+        /** The mask shift. */
+        uint32_t    cShift        : 2;
         /** The guest register mask being written back. */
-        uint32_t    fGstReg       : 27;
+        uint32_t    fGstReg       : 25;
     } GuestRegWriteback;
 #endif