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

Timestamp:

Oct 21, 2023 10:30:50 PM (17 months ago)

Author:

vboxsync

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

159615

Message:

VMM/IEM: Freed up some space in IEMTB for a pointer to debug info or something. bugref:10371

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllInstPython.py (modified) (1 diff)
• VMMAll/IEMAllN8veRecompiler.cpp (modified) (1 diff)
• VMMAll/IEMAllThrdRecompiler.cpp (modified) (6 diffs)
• VMMAll/IEMAllThrdTables.h (modified) (1 diff)
• include/IEMInternal.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllInstPython.py

@@ -2889 +2889 @@
     'IEM_MC_IF_EFL_BIT_NOT_SET':                                 (McBlock.parseMcGenericCond,       True,  False, ),
     'IEM_MC_IF_EFL_BIT_NOT_SET_AND_BITS_EQ':                     (McBlock.parseMcGenericCond,       True,  False, ),
-    'IEM_MC_IF_EFL_BIT_SET':                                     (McBlock.parseMcGenericCond,       True,  False,), #True,  ),
+    'IEM_MC_IF_EFL_BIT_SET':                                     (McBlock.parseMcGenericCond,       True,  False, ), #True,  ),
     'IEM_MC_IF_EFL_BIT_SET_OR_BITS_NE':                          (McBlock.parseMcGenericCond,       True,  False, ),
     'IEM_MC_IF_EFL_BITS_EQ':                                     (McBlock.parseMcGenericCond,       True,  False, ),

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

@@ -3781 +3781 @@
     /* Truncate the result to 16-bit IP if the operand size is 16-bit. */
     if (enmEffOpSize == IEMMODE_16BIT)
-    {
-        Assert(enmEffOpSize == IEMMODE_16BIT);
         off = iemNativeEmitClear16UpGpr(pReNative, off, idxPcReg);
-    }
 
     /* Perform limit checking, potentially raising #GP(0) and exit the TB. */

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

@@ -888 +888 @@
     pTb->Gen.uData          = 0;
     pTb->cbOpcodes          = 0;
-    pTb->cbOpcodesAllocated = 0;
     pTb->pabOpcodes         = NULL;
 
@@ -1202 +1201 @@
             if (pTb->pabOpcodes)
             {
+                pVCpu->iem.s.cbOpcodesAllocated = cCalls * 16;
                 pTb->Thrd.cAllocated        = cCalls;
-                pTb->cbOpcodesAllocated     = cCalls * 16;
                 pTb->Thrd.cCalls            = 0;
                 pTb->cbOpcodes              = 0;
@@ -1299 +1298 @@
             {
                 pTb->Thrd.cAllocated    = cCalls;
-                pTb->cbOpcodesAllocated = cbOpcodes;
                 pTb->pNext              = NULL;
                 pTb->cUsed              = 0;
@@ -1947 +1945 @@
         pTb->cbOpcodes                    = offOpcode + cbInstr;
         pTb->aRanges[idxRange].cbOpcodes += cbInstr;
-        Assert(pTb->cbOpcodes <= pTb->cbOpcodesAllocated);
+        Assert(pTb->cbOpcodes <= pVCpu->iem.s.cbOpcodesAllocated);
     }
 
@@ -1967 +1965 @@
     iemThreadedCopyOpcodeBytesInline(pVCpu, &pTb->pabOpcodes[offOpcode], cbInstr);
     pTb->cbOpcodes = offOpcode + cbInstr;
-    Assert(pTb->cbOpcodes <= pTb->cbOpcodesAllocated);
+    Assert(pTb->cbOpcodes <= pVCpu->iem.s.cbOpcodesAllocated);
 
     return true;
@@ -2196 +2194 @@
         /* Still space in the TB? */
         if (   pTb->Thrd.cCalls + 5 < pTb->Thrd.cAllocated
-            && pTb->cbOpcodes + 16 <= pTb->cbOpcodesAllocated)
+            && pTb->cbOpcodes + 16 <= pVCpu->iem.s.cbOpcodesAllocated)
             iemThreadedCompileInitDecoder(pVCpu, true /*fReInit*/, 0);
         else

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

@@ -208 +208 @@
             pTb->cbOpcodes                       = offOpcodeMc2 + pVCpu->iem.s.offOpcode; \
             pTb->aRanges[idxRangeMc2].cbOpcodes += cbInstrMc2; \
-            Assert(pTb->cbOpcodes <= pTb->cbOpcodesAllocated); \
+            Assert(pTb->cbOpcodes <= pVCpu->iem.s.cbOpcodesAllocated); \
         } \
         else if (iemThreadedCompileBeginEmitCallsComplications(pVCpu, pTb)) \

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

@@ -887 +887 @@
     /** The IEMCPU::msRecompilerPollNow last time it was used. */
     uint32_t            msLastUsed;
-    /** The allocation chunk this TB belongs to. */
-    uint8_t             idxAllocChunk;
-
-    uint8_t             abUnused[3];
-    uint32_t            uUnused;
-
 
     /** @name What uniquely identifies the block.
@@ -941 +935 @@
     };
 
-    /** Number of bytes of opcodes stored in pabOpcodes. */
+    /** The allocation chunk this TB belongs to. */
+    uint8_t             idxAllocChunk;
+    uint8_t             bUnused;
+
+    /** Number of bytes of opcodes stored in pabOpcodes.
+     * @todo this field isn't really needed, aRanges keeps the actual info. */
     uint16_t            cbOpcodes;
-    /** The max storage available in the pabOpcodes block. */
-    uint16_t            cbOpcodesAllocated;
     /** Pointer to the opcode bytes this block was recompiled from. */
     uint8_t            *pabOpcodes;
+
+    /** Debug info or smth. */
+    void               *pvDbg;
 
     /* --- 64 byte cache line end --- */
@@ -981 +981 @@
      * The GCPhysPc w/o page offset is element zero, so starting here with 1. */
     RTGCPHYS            aGCPhysPages[2];
+
 } IEMTB;
 #pragma pack()
-AssertCompileMemberOffset(IEMTB, x86, 36);
-AssertCompileMemberOffset(IEMTB, cRanges, 38);
-AssertCompileMemberOffset(IEMTB, Thrd, 40);
-AssertCompileMemberOffset(IEMTB, Thrd.cCalls, 48);
-AssertCompileMemberOffset(IEMTB, cbOpcodes, 52);
+AssertCompileMemberAlignment(IEMTB, GCPhysPc, sizeof(RTGCPHYS));
+AssertCompileMemberAlignment(IEMTB, Thrd, sizeof(void *));
+AssertCompileMemberAlignment(IEMTB, pabOpcodes, sizeof(void *));
+AssertCompileMemberAlignment(IEMTB, pvDbg, sizeof(void *));
+AssertCompileMemberAlignment(IEMTB, aGCPhysPages, sizeof(RTGCPHYS));
+AssertCompileMemberOffset(IEMTB, aRanges[0], 64);
 AssertCompileMemberSize(IEMTB, aRanges[0], 6);
 #if 1
@@ -1503 +1505 @@
      * iemCImpl_sti code and subsequently cleared by the recompiler. */
     bool                    fTbCurInstrIsSti;
+    /** The size of the IEMTB::pabOpcodes allocation in pThrdCompileTbR3. */
+    uint16_t                cbOpcodesAllocated;
     /** Spaced reserved for recompiler data / alignment. */
-    bool                    afRecompilerStuff1[2+4];
+    bool                    afRecompilerStuff1[4];
     /** The virtual sync time at the last timer poll call. */
     uint32_t                msRecompilerPollNow;