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

Timestamp:

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

Author:

vboxsync

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

164903

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/IEMN8veRecompiler.h (modified) (8 diffs)

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

@@ -99 +99 @@
 #if 1 || defined(DOXYGEN_RUNNING)
 # define IEMNATIVE_WITH_RECOMPILER_PROLOGUE_SINGLETON
-#endif
-
-/** @def IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
- * Enable this to use common epilogue and tail code for all TBs in a chunk. */
-#if 1 || defined(DOXYGEN_RUNNING)
-# define IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
 #endif
 
@@ -521 +515 @@
     kIemNativeLabelType_ReturnWithFlags,
     kIemNativeLabelType_NonZeroRetOrPassUp,
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
     kIemNativeLabelType_ReturnSuccess,          /**< Sets eax/w0 to zero and returns. */
-#else
-    kIemNativeLabelType_Return,
-#endif
     /** The last fixup for branches that can span almost the whole TB length.
      * @note Whether kIemNativeLabelType_Return needs to be one of these is
      *       a bit questionable, since nobody jumps to it except other tail code. */
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
     kIemNativeLabelType_LastWholeTbBranch = kIemNativeLabelType_ReturnSuccess,
-#else
-    kIemNativeLabelType_LastWholeTbBranch = kIemNativeLabelType_Return,
-#endif
     /** The last fixup for branches that exits the TB. */
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
     kIemNativeLabelType_LastTbExit        = kIemNativeLabelType_ReturnSuccess,
-#else
-    kIemNativeLabelType_LastTbExit        = kIemNativeLabelType_Return,
-#endif
 
     /** Loop-jump target. */
@@ -579 +561 @@
 
 
+
 /** Native code generator fixup types.  */
 typedef enum
@@ -612 +595 @@
 typedef IEMNATIVEFIXUP *PIEMNATIVEFIXUP;
 
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
+
 
 /** Native code generator fixup to per chunk TB tail code. */
@@ -638 +621 @@
 typedef const IEMNATIVEPERCHUNKCTX *PCIEMNATIVEPERCHUNKCTX;
 
-#endif /* IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE */
 
 
@@ -1625 +1607 @@
     PIEMNATIVEFIXUP             paFixups;
 
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
     /** Actual number of fixups in paTbExitFixups. */
     uint32_t                    cTbExitFixups;
@@ -1632 +1613 @@
     /** Buffer used by the recompiler for recording fixups when generating code. */
     PIEMNATIVEEXITFIXUP         paTbExitFixups;
-#endif
 
 #if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
@@ -1858 +1838 @@
 DECL_HIDDEN_THROW(void)     iemNativeAddFixup(PIEMRECOMPILERSTATE pReNative, uint32_t offWhere, uint32_t idxLabel,
                                               IEMNATIVEFIXUPTYPE enmType, int8_t offAddend = 0);
-#ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
-DECL_HIDDEN_THROW(void)     iemNativeAddTbExitFixup(PIEMRECOMPILERSTATE pReNative, uint32_t offWhere, IEMNATIVELABELTYPE enmExitReason);
-#endif
+DECL_HIDDEN_THROW(void)     iemNativeAddTbExitFixup(PIEMRECOMPILERSTATE pReNative, uint32_t offWhere,
+                                                    IEMNATIVELABELTYPE enmExitReason);
 DECL_HIDDEN_THROW(PIEMNATIVEINSTR) iemNativeInstrBufEnsureSlow(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint32_t cInstrReq);