Changeset 101547 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Oct 23, 2023 12:50:37 AM (15 months ago)

Author:

vboxsync

Message:

VMM/IEM: More TB disassembly and TB debuginfo. bugref:10371

Location:

trunk/src/VBox/VMM/include

Files:

• IEMInternal.h (modified) (3 diffs)
• IEMN8veRecompiler.h (modified) (6 diffs)

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

@@ -879 +879 @@
 {
     kIemTbDbgEntryType_Invalid = 0,
+    /** The entry is for marking a native code position.
+     * Entries following this all apply to this position. */
+    kIemTbDbgEntryType_NativeOffset,
     /** The entry is for a new guest instruction. */
     kIemTbDbgEntryType_GuestInstruction,
-    /** Marks the start of a native call. */
-    kIemTbDbgEntryType_ThreadedCall1,
-    /** 2nd entry for the start of a native call. */
-    kIemTbDbgEntryType_ThreadedCall2,
+    /** Marks the start of a threaded call. */
+    kIemTbDbgEntryType_ThreadedCall,
+    /** Marks the location of a label. */
+    kIemTbDbgEntryType_Label,
     /** Info about a host register shadowing a guest register. */
-    kIemTbDbgEntryType_GuestRegShadow,
+    kIemTbDbgEntryType_GuestRegShadowing,
     kIemTbDbgEntryType_End
 } IEMTBDBGENTRYTYPE;
@@ -908 +911 @@
     struct
     {
-        /** kIemTbDbgEntryType_GuestInstruction. */
-        uint32_t    uType      : 4;
-        /** Index into IEMTB::aRanges. */
-        uint32_t    idxRange   : 4;
-        /** Offset relative to the start of the range. */
-        uint32_t    offOpcodes : 12;
-        /** Number of opcode bytes for the instruction. */
-        uint32_t    cbOpcodes  : 4;
-        /** Basic CPU mode for the disassembler (low 8 bits IEM_F_XXX). */
-        uint32_t    fCpuMode   : 8;
-    } GuestInstruction;
-
-    struct
-    {
         /** kIemTbDbgEntryType_ThreadedCall1. */
         uint32_t    uType      : 4;
         /** Native code offset. */
         uint32_t    offNative  : 28;
-    } ThreadedCall1;
+    } NativeOffset;
 
     struct
     {
-        /* kIemTbDbgEntryType_ThreadedCall2. */
+        /** kIemTbDbgEntryType_GuestInstruction. */
         uint32_t    uType      : 4;
+        uint32_t    uUnused    : 4;
+        /** The IEM_F_XXX flags. */
+        uint32_t    fExec      : 24;
+    } GuestInstruction;
+
+    struct
+    {
+        /* kIemTbDbgEntryType_ThreadedCall. */
+        uint32_t    uType      : 4;
+        uint32_t    uUnused    : 12;
         /** The threaded call number (IEMTHREADEDFUNCS). */
         uint32_t    enmCall    : 16;
-    } ThreadedCall2;
+    } ThreadedCall;
 
     struct
     {
-        /* kIemTbDbgEntryType_GuestRegShadow. */
+        /* kIemTbDbgEntryType_Label. */
         uint32_t    uType      : 4;
-        uint32_t    uPadding   : 4;
-        /** The host register number. */
-        uint32_t    idxHstReg  : 8;
+        uint32_t    uUnused    : 4;
+        /** The label type (IEMNATIVELABELTYPE).   */
+        uint32_t    enmLabel   : 8;
+        /** The label data. */
+        uint32_t    uData      : 16;
+    } Label;
+
+    struct
+    {
+        /* kIemTbDbgEntryType_GuestRegShadowing. */
+        uint32_t    uType         : 4;
+        uint32_t    uUnused       : 4;
         /** The guest register being shadowed (IEMNATIVEGSTREG). */
-        uint32_t    idxGstReg  : 8;
-        uint32_t    uUnused    : 8;
-    } GuestRegShadow;
+        uint32_t    idxGstReg     : 8;
+        /** The host new register number, UINT8_MAX if dropped. */
+        uint32_t    idxHstReg     : 8;
+        /** The previous host register number, UINT8_MAX if new.   */
+        uint32_t    idxHstRegPrev : 8;
+    } GuestRegShadowing;
 } IEMTBDBGENTRY;
 AssertCompileSize(IEMTBDBGENTRY, sizeof(uint32_t));
+/** Pointer to a debug info entry. */
+typedef IEMTBDBGENTRY *PIEMTBDBGENTRY;
+/** Pointer to a const debug info entry. */
+typedef IEMTBDBGENTRY const *PCIEMTBDBGENTRY;
 
 /**
@@ -957 +972 @@
     /** Number of entries in aEntries. */
     uint32_t        cEntries;
-    /** Number of entries we've allocated. */
-    uint32_t        cAllocated;
     /** Debug info entries. */
     RT_FLEXIBLE_ARRAY_EXTENSION

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

@@ -37 +37 @@
  * @{
  */
+
+/** @def IEMNATIVE_WITH_TB_DEBUG_INFO
+ * Enables generating internal debug info for better TB disassembly dumping. */
+#if defined(DEBUG) || defined(DOXYGEN_RUNNING)
+# define IEMNATIVE_WITH_TB_DEBUG_INFO
+#endif
+
 
 /** @name Stack Frame Layout
@@ -518 +525 @@
     PIEMNATIVEFIXUP             paFixups;
 
+#ifdef IEMNATIVE_WITH_TB_DEBUG_INFO
+    /** Number of debug info entries allocated for pDbgInfo. */
+    uint32_t                    cDbgInfoAlloc;
+    uint32_t                    uPadding;
+    /** Debug info. */
+    PIEMTBDBG                   pDbgInfo;
+#else
+    uint32_t                    abPadding1[2];
+    uintptr_t                   uPtrPadding2;
+#endif
+
     /** The translation block being recompiled. */
     PCIEMTB                     pTbOrg;
@@ -586 +604 @@
 
 
-DECLHIDDEN(uint32_t)        iemNativeMakeLabel(PIEMRECOMPILERSTATE pReNative, IEMNATIVELABELTYPE enmType,
-                                               uint32_t offWhere = UINT32_MAX, uint16_t uData = 0) RT_NOEXCEPT;
+DECLHIDDEN(uint32_t)        iemNativeLabelCreate(PIEMRECOMPILERSTATE pReNative, IEMNATIVELABELTYPE enmType,
+                                                 uint32_t offWhere = UINT32_MAX, uint16_t uData = 0) RT_NOEXCEPT;
+DECLHIDDEN(void)            iemNativeLabelDefine(PIEMRECOMPILERSTATE pReNative, uint32_t idxLabel, uint32_t offWhere) RT_NOEXCEPT;
 DECLHIDDEN(bool)            iemNativeAddFixup(PIEMRECOMPILERSTATE pReNative, uint32_t offWhere, uint32_t idxLabel,
                                               IEMNATIVEFIXUPTYPE enmType, int8_t offAddend = 0) RT_NOEXCEPT;
@@ -1762 +1781 @@
             pbCodeBuf[off++] = 0xeb;                /* jmp rel8 */
             pbCodeBuf[off++] = (uint8_t)offRel;
-            off++;
         }
         else
@@ -1810 +1828 @@
                                                 IEMNATIVELABELTYPE enmLabelType, uint16_t uData = 0)
 {
-    uint32_t const idxLabel = iemNativeMakeLabel(pReNative, enmLabelType, UINT32_MAX /*offWhere*/, uData);
+    uint32_t const idxLabel = iemNativeLabelCreate(pReNative, enmLabelType, UINT32_MAX /*offWhere*/, uData);
     AssertReturn(idxLabel != UINT32_MAX, UINT32_MAX);
     return iemNativeEmitJmpToLabel(pReNative, off, idxLabel);
@@ -1883 +1901 @@
                                                 IEMNATIVELABELTYPE enmLabelType, uint16_t uData, IEMNATIVEINSTRCOND enmCond)
 {
-    uint32_t const idxLabel = iemNativeMakeLabel(pReNative, enmLabelType, UINT32_MAX /*offWhere*/, uData);
+    uint32_t const idxLabel = iemNativeLabelCreate(pReNative, enmLabelType, UINT32_MAX /*offWhere*/, uData);
     AssertReturn(idxLabel != UINT32_MAX, UINT32_MAX);
     return iemNativeEmitJccToLabel(pReNative, off, idxLabel, enmCond);