Changeset 106125 in vbox for trunk/src/VBox/VMM/include/IEMN8veRecompilerEmit.h

Timestamp:

Sep 23, 2024 10:42:27 PM (4 months ago)

Author:

vboxsync

Message:

VMM/IEM: Eliminated the #ifndef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE bits to try reduce the #ifdef-spaghetti a little. bugref:10677

File:

• trunk/src/VBox/VMM/include/IEMN8veRecompilerEmit.h (modified) (11 diffs)

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

@@ -8310 +8310 @@
     Assert(IEMNATIVELABELTYPE_IS_EXIT_REASON(enmExitReason));
 
-#if defined(IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE) && defined(RT_ARCH_AMD64)
+#if defined(RT_ARCH_AMD64)
     /* jcc rel32 */
     pCodeBuf[off++] = 0x0f;
@@ -8340 +8340 @@
     Assert(IEMNATIVELABELTYPE_IS_EXIT_REASON(enmExitReason));
 
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
-# ifdef RT_ARCH_AMD64
+#ifdef RT_ARCH_AMD64
     off = iemNativeEmitJccTbExitEx(pReNative, iemNativeInstrBufEnsure(pReNative, off, 6), off, enmExitReason, enmCond);
-# elif defined(RT_ARCH_ARM64)
+#elif defined(RT_ARCH_ARM64)
     off = iemNativeEmitJccTbExitEx(pReNative, iemNativeInstrBufEnsure(pReNative, off, 2), off, enmExitReason, enmCond);
-# else
-#  error "Port me!"
-# endif
-    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
-    return off;
-#else
-    return iemNativeEmitJccToNewLabel(pReNative, off, enmExitReason, 0 /*uData*/, enmCond);
-#endif
+#else
+# error "Port me!"
+#endif
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
+    return off;
 }
 
@@ -8425 +8421 @@
     iemNativeMarkCurCondBranchAsExiting(pReNative);
 
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
-# ifdef RT_ARCH_AMD64
+#ifdef RT_ARCH_AMD64
     /* jmp rel32 */
     pCodeBuf[off++] = 0xe9;
@@ -8435 +8430 @@
     pCodeBuf[off++] = 0xff;
 
-# elif defined(RT_ARCH_ARM64)
+#elif defined(RT_ARCH_ARM64)
     iemNativeAddTbExitFixup(pReNative, off, enmExitReason);
     pCodeBuf[off++] = Armv8A64MkInstrB(-1);
 
-# else
-#  error "Port me!"
-# endif
-    return off;
-
-#else
-    uint32_t const idxLabel = iemNativeLabelCreate(pReNative, enmExitReason, UINT32_MAX /*offWhere*/, 0 /*uData*/);
-    return iemNativeEmitJmpToLabelEx(pReNative, pCodeBuf, off, idxLabel);
-#endif
+#else
+# error "Port me!"
+#endif
+    return off;
 }
 
@@ -8462 +8452 @@
         iemNativeMarkCurCondBranchAsExiting(pReNative);
 
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
-# ifdef RT_ARCH_AMD64
+#ifdef RT_ARCH_AMD64
     PIEMNATIVEINSTR pCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 6);
 
@@ -8474 +8463 @@
     pCodeBuf[off++] = 0xff;
 
-# elif defined(RT_ARCH_ARM64)
+#elif defined(RT_ARCH_ARM64)
     PIEMNATIVEINSTR pCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
     iemNativeAddTbExitFixup(pReNative, off, enmExitReason);
     pCodeBuf[off++] = Armv8A64MkInstrB(-1);
 
-# else
-#  error "Port me!"
-# endif
-    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
-    return off;
-
-#else
-    return iemNativeEmitJmpToNewLabel(pReNative, off, enmExitReason);
-#endif
+#else
+# error "Port me!"
+#endif
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
+    return off;
 }
 
@@ -8587 +8572 @@
     Assert(IEMNATIVELABELTYPE_IS_EXIT_REASON(enmExitReason));
 
-#if defined(IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE) && defined(RT_ARCH_AMD64)
+#if defined(RT_ARCH_AMD64)
     Assert(iBitNo < 64);
     uint8_t * const pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 5);
@@ -8638 +8623 @@
     Assert(IEMNATIVELABELTYPE_IS_EXIT_REASON(enmExitReason));
 
-#if defined(IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE) && defined(RT_ARCH_AMD64)
+#if defined(RT_ARCH_AMD64)
     /* test reg32,reg32  / test reg64,reg64 */
     if (f64Bit)
@@ -8671 +8656 @@
                                          uint8_t iGprSrc, bool f64Bit, IEMNATIVELABELTYPE enmExitReason)
 {
-#if defined(IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE) && defined(RT_ARCH_AMD64)
+#if defined(RT_ARCH_AMD64)
     off = iemNativeEmitTestIfGprIsNotZeroAndTbExitEx(pReNative, iemNativeInstrBufEnsure(pReNative, off, 3 + 6),
                                                      off, iGprSrc, f64Bit, enmExitReason);
@@ -8695 +8680 @@
 {
     Assert(IEMNATIVELABELTYPE_IS_EXIT_REASON(enmExitReason));
-#if defined(IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE) && defined(RT_ARCH_AMD64)
+#if defined(RT_ARCH_AMD64)
     /* test reg32,reg32  / test reg64,reg64 */
     if (f64Bit)
@@ -8728 +8713 @@
                                       uint8_t iGprSrc, bool f64Bit, IEMNATIVELABELTYPE enmExitReason)
 {
-#if defined(IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE) && defined(RT_ARCH_AMD64)
+#if defined(RT_ARCH_AMD64)
     off = iemNativeEmitTestIfGprIsZeroAndTbExitEx(pReNative, iemNativeInstrBufEnsure(pReNative, off, 3 + 6),
                                                   off, iGprSrc, f64Bit, enmExitReason);