Changeset 102683 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Dec 21, 2023 7:18:59 PM (15 months ago)

Author:

vboxsync

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

160850

Message:

VMM/IEM: Fixed bug in native opcode comparison, caused lots of incorrect obsoletion when a check didn't start at the first byte in an opcode range. bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompBltIn.cpp (modified) (5 diffs)

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

@@ -449 +449 @@
     off = iemNativeEmitBltInCheckOpcodes(pReNative, off, (a_pTb), (a_idxRange), (a_offRange))
 
+#if 0 /* debugging aid */
+bool g_fBpOnObsoletion = false;
+# define BP_ON_OBSOLETION g_fBpOnObsoletion
+#else
+# define BP_ON_OBSOLETION 0
+#endif
+
 DECL_FORCE_INLINE(uint32_t)
 iemNativeEmitBltInCheckOpcodes(PIEMRECOMPILERSTATE pReNative, uint32_t off, PCIEMTB pTb, uint8_t idxRange, uint16_t offRange)
@@ -473 +480 @@
     uint16_t            cbLeft      = pTb->aRanges[idxRange].cbOpcodes   - offRange;
     Assert(cbLeft > 0);
-    uint8_t const      *pbOpcodes   = &pTb->pabOpcodes[pTb->aRanges[idxRange].offOpcodes];
+    uint8_t const      *pbOpcodes   = &pTb->pabOpcodes[pTb->aRanges[idxRange].offOpcodes + offRange];
     uint32_t            offConsolidatedJump = UINT32_MAX;
 
@@ -497 +504 @@
             { \
                 pbCodeBuf[off++] = 0x74; /* jz near +5 */ \
-                pbCodeBuf[off++] = 0x05 /*+ 1*/; \
+                pbCodeBuf[off++] = 0x05 + BP_ON_OBSOLETION; \
                 offConsolidatedJump = off; \
-                /*pbCodeBuf[off++] = 0xcc; */ \
+                if (BP_ON_OBSOLETION) pbCodeBuf[off++] = 0xcc; \
                 pbCodeBuf[off++] = 0xe9; /* jmp rel32 */ \
                 iemNativeAddFixup(pReNative, off, idxLabelObsoleteTb, kIemNativeFixupType_Rel32, -4); \
@@ -571 +578 @@
         }
 
-        uint8_t * const pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 5 + 14 + 54 + 8 + 6 /* = 87 */);
+        uint8_t * const pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 5 + 14 + 54 + 8 + 6 + BP_ON_OBSOLETION /* = 87 */);
 
         if (cbLeft > 8)
@@ -615 +622 @@
         uint8_t const idxRegCx = iemNativeRegAllocTmpEx(pReNative, &off, RT_BIT_32(X86_GREG_xCX));
 
-        uint8_t * const pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 5 + 10 + 5 + 5 + 3 + 4 + 3 /*= 35*/);
+        uint8_t * const pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 5 + 10 + 5 + 5 + 3 + 4 + 3 + BP_ON_OBSOLETION /*= 35*/);
 
         /** @todo profile and optimize this further.  Maybe an idea to align by