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

Timestamp:

May 1, 2024 12:43:28 AM (7 months ago)

Author:

vboxsync

Message:

VMM/IEM: Deal with the simples direct 'linking' of TBs scenario for relative jumps, when staying with the same code page. bugref:10656

Location:

trunk/src/VBox/VMM/include

Files:

• IEMInternal.h (modified) (4 diffs)
• IEMN8veRecompiler.h (modified) (2 diffs)
• IEMN8veRecompilerEmit.h (modified) (1 diff)

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

@@ -1329 +1329 @@
 #define IEMTB_GET_TB_LOOKUP_TAB_ENTRY(a_pTb, a_idx) \
     ((PIEMTB *)&(a_pTb)->pabOpcodes[-(int)((a_pTb)->cTbLookupEntries - (a_idx)) * sizeof(PIEMTB)])
+
+/**
+ * Gets the physical address for a TB opcode range.
+ */
+DECL_FORCE_INLINE(RTGCPHYS) iemTbGetRangePhysPageAddr(PCIEMTB pTb, uint8_t idxRange)
+{
+    Assert(idxRange < RT_MIN(pTb->cRanges, RT_ELEMENTS(pTb->aRanges)));
+    uint8_t const idxPage = pTb->aRanges[idxRange].idxPhysPage;
+    Assert(idxPage <= RT_ELEMENTS(pTb->aGCPhysPages));
+    if (idxPage == 0)
+        return pTb->GCPhysPc & ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK;
+    Assert(!(pTb->aGCPhysPages[idxPage - 1] & GUEST_PAGE_OFFSET_MASK));
+    return pTb->aGCPhysPages[idxPage - 1];
+}
 
 
@@ -2050 +2064 @@
 //#endif
 
-    /** Native recompiler: The TB finished executing completely without jumping to a an exit label. */
+    /** Native recompiler: The TB finished executing completely without jumping to a an exit label.
+     * Not availabe in release builds. */
     STAMCOUNTER             StatNativeTbFinished;
     /** Native recompiler: The TB finished executing jumping to the ReturnBreak label. */
@@ -2062 +2077 @@
     /** Native recompiler: The TB finished executing via throw / long jump. */
     STAMCOUNTER             StatNativeTbExitLongJump;
+    /** Native recompiler: The TB finished executing jumping to the ReturnBreak
+     *  label, but directly jumped to the next TB, scenario \#1 w/o IRQ checks. */
+    STAMCOUNTER             StatNativeTbExitDirectLinking1NoIrq;
+    /** Native recompiler: The TB finished executing jumping to the ReturnBreak
+     *  label, but directly jumped to the next TB, scenario \#1 with IRQ checks. */
+    STAMCOUNTER             StatNativeTbExitDirectLinking1Irq;
+    /** Native recompiler: The TB finished executing jumping to the ReturnBreak
+     *  label, but directly jumped to the next TB, scenario \#1 w/o IRQ checks. */
+    STAMCOUNTER             StatNativeTbExitDirectLinking2NoIrq;
+    /** Native recompiler: The TB finished executing jumping to the ReturnBreak
+     *  label, but directly jumped to the next TB, scenario \#2 with IRQ checks. */
+    STAMCOUNTER             StatNativeTbExitDirectLinking2Irq;
 
     /** Native recompiler: The TB finished executing jumping to the RaiseDe label. */
@@ -2084 +2111 @@
     STAMCOUNTER             StatNativeTbExitObsoleteTb;
 
-    uint64_t                au64Padding[1];
+    /** Native recompiler: Failure situations with direct linking scenario \#1.
+     * Counter with StatNativeTbExitReturnBreak. Not in release builds.
+     * @{  */
+    STAMCOUNTER             StatNativeTbExitDirectLinking1NoTb;
+    STAMCOUNTER             StatNativeTbExitDirectLinking1MismatchGCPhysPc;
+    STAMCOUNTER             StatNativeTbExitDirectLinking1MismatchFlags;
+    STAMCOUNTER             StatNativeTbExitDirectLinking1PendingIrq;
+    /** @} */
+
+    /** Native recompiler: Failure situations with direct linking scenario \#2.
+     * Counter with StatNativeTbExitReturnBreak. Not in release builds.
+     * @{  */
+    STAMCOUNTER             StatNativeTbExitDirectLinking2NoTb;
+    STAMCOUNTER             StatNativeTbExitDirectLinking2MismatchGCPhysPc;
+    STAMCOUNTER             StatNativeTbExitDirectLinking2MismatchFlags;
+    STAMCOUNTER             StatNativeTbExitDirectLinking2PendingIrq;
+    /** @} */
+
+    uint64_t                au64Padding[5];
     /** @} */
 

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

@@ -473 +473 @@
     kIemNativeLabelType_ReturnBreak,
     kIemNativeLabelType_ReturnBreakFF,
+    kIemNativeLabelType_ReturnBreakViaLookup,
+    kIemNativeLabelType_ReturnBreakViaLookupWithIrq,
+    kIemNativeLabelType_ReturnBreakViaLookupWithTlb,
+    kIemNativeLabelType_ReturnBreakViaLookupWithTlbAndIrq,
     kIemNativeLabelType_ReturnWithFlags,
     kIemNativeLabelType_NonZeroRetOrPassUp,
@@ -1414 +1418 @@
     uint32_t                    fSimdRaiseXcptChecksEmitted;
 #endif
+    /** The call number of the last CheckIrq, UINT32_MAX if not seen. */
+    uint32_t                    idxLastCheckIrqCallNo;
 
     /** Core state requiring care with branches. */

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

@@ -7634 +7634 @@
 
 
+
+/*********************************************************************************************************************************
+*   Indirect Jumps.                                                                                                              *
+*********************************************************************************************************************************/
+
+/**
+ * Emits an indirect jump a 64-bit address in a GPR.
+ */
+DECL_INLINE_THROW(uint32_t) iemNativeEmitJmpViaGpr(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint8_t iGprSrc)
+{
+#ifdef RT_ARCH_AMD64
+    uint8_t * const pCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 3);
+    if (iGprSrc >= 8)
+        pCodeBuf[off++] = X86_OP_REX_B;
+    pCodeBuf[off++] = 0xff;
+    pCodeBuf[off++] = X86_MODRM_MAKE(X86_MOD_REG, 4, iGprSrc & 7);
+
+#elif defined(RT_ARCH_ARM64)
+    uint32_t * const pCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
+    pCodeBuf[off++] = Armv8A64MkInstrBr(iGprSrc);
+
+#else
+# error "port me"
+#endif
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
+    return off;
+}
+
+
 /*********************************************************************************************************************************
 *   Calls.                                                                                                                       *