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

Timestamp:

Oct 22, 2023 2:43:09 AM (16 months ago)

Author:

vboxsync

Message:

DIS,VMM,DBGC,IPRT,++: Some disassembler tweaks and TB disassembly work. bugref:10371 bugref:9898

File:

• trunk/src/VBox/VMM/include/IEMInternal.h (modified) (5 diffs)

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

@@ -814 +814 @@
 /** Pointer to a native instruction unit. */
 typedef IEMNATIVEINSTR *PIEMNATIVEINSTR;
+/** Pointer to a const native instruction unit. */
+typedef IEMNATIVEINSTR const *PCIEMNATIVEINSTR;
 
 /**
@@ -869 +871 @@
  * This will throw/longjmp on occation.  */
 typedef FNIEMTBNATIVE *PFNIEMTBNATIVE;
+
+
+/**
+ * Translation block debug info entry type.
+ */
+typedef enum IEMTBDBGENTRYTYPE
+{
+    kIemTbDbgEntryType_Invalid = 0,
+    /** 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,
+    /** Info about a host register shadowing a guest register. */
+    kIemTbDbgEntryType_GuestRegShadow,
+    kIemTbDbgEntryType_End
+} IEMTBDBGENTRYTYPE;
+
+/**
+ * Translation block debug info entry.
+ */
+typedef union IEMTBDBGENTRY
+{
+    /** Plain 32-bit view. */
+    uint32_t u;
+
+    /** Generic view for getting at the type field. */
+    struct
+    {
+        /** IEMTBDBGENTRYTYPE */
+        uint32_t    uType : 4;
+        uint32_t    uTypeSpecific : 28;
+    } Gen;
+
+    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;
+
+    struct
+    {
+        /* kIemTbDbgEntryType_ThreadedCall2. */
+        uint32_t    uType      : 4;
+        /** The threaded call number (IEMTHREADEDFUNCS). */
+        uint32_t    enmCall    : 16;
+    } ThreadedCall2;
+
+    struct
+    {
+        /* kIemTbDbgEntryType_GuestRegShadow. */
+        uint32_t    uType      : 4;
+        uint32_t    uPadding   : 4;
+        /** The host register number. */
+        uint32_t    idxHstReg  : 8;
+        /** The guest register being shadowed (IEMNATIVEGSTREG). */
+        uint32_t    idxGstReg  : 8;
+        uint32_t    uUnused    : 8;
+    } GuestRegShadow;
+} IEMTBDBGENTRY;
+AssertCompileSize(IEMTBDBGENTRY, sizeof(uint32_t));
+
+/**
+ * Translation block debug info.
+ */
+typedef struct IEMTBDBG
+{
+    /** Number of entries in aEntries. */
+    uint32_t        cEntries;
+    /** Number of entries we've allocated. */
+    uint32_t        cAllocated;
+    /** Debug info entries. */
+    RT_FLEXIBLE_ARRAY_EXTENSION
+    IEMTBDBGENTRY   aEntries[RT_FLEXIBLE_ARRAY];
+} IEMTBDBG;
+/** Pointer to TB debug info. */
+typedef IEMTBDBG *PIEMTBDBG;
+/** Pointer to const TB debug info. */
+typedef IEMTBDBG const *PCIEMTBDBG;
 
 
@@ -945 +1043 @@
     uint8_t            *pabOpcodes;
 
-    /** Debug info or smth. */
-    void               *pvDbg;
+    /** Debug info if enabled.
+     * This is only generated by the native recompiler. */
+    PIEMTBDBG           pDbgInfo;
 
     /* --- 64 byte cache line end --- */
@@ -981 +1080 @@
      * The GCPhysPc w/o page offset is element zero, so starting here with 1. */
     RTGCPHYS            aGCPhysPages[2];
-
 } IEMTB;
 #pragma pack()
@@ -987 +1085 @@
 AssertCompileMemberAlignment(IEMTB, Thrd, sizeof(void *));
 AssertCompileMemberAlignment(IEMTB, pabOpcodes, sizeof(void *));
-AssertCompileMemberAlignment(IEMTB, pvDbg, sizeof(void *));
+AssertCompileMemberAlignment(IEMTB, pDbgInfo, sizeof(void *));
 AssertCompileMemberAlignment(IEMTB, aGCPhysPages, sizeof(RTGCPHYS));
 AssertCompileMemberOffset(IEMTB, aRanges[0], 64);