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

Timestamp:

Oct 23, 2023 2:39:59 PM (15 months ago)

Author:

vboxsync

Message:

VMM/IEM: Got conditional jumps working, currently only those testing for a single EFLAGS bit. The fun with branching code is how to handle the register allocation and variable state. bugref:10371

File:

• trunk/src/VBox/VMM/include/IEMN8veRecompiler.h (modified) (9 diffs)

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

@@ -264 +264 @@
     kIemNativeLabelType_Invalid = 0,
     kIemNativeLabelType_Return,
+#ifdef IEMNATIVE_WITH_TB_DEBUG_INFO
+    kIemNativeLabelType_If,
+#endif
     kIemNativeLabelType_Else,
     kIemNativeLabelType_Endif,
@@ -477 +480 @@
 
 /**
+ * Core state for the native recompiler, that is, things that needs careful
+ * handling when dealing with branches.
+ */
+typedef struct IEMNATIVECORESTATE
+{
+    /** Allocation bitmap for aHstRegs. */
+    uint32_t                    bmHstRegs;
+
+    /** Bitmap marking which host register contains guest register shadow copies.
+     * This is used during register allocation to try preserve copies.  */
+    uint32_t                    bmHstRegsWithGstShadow;
+    /** Bitmap marking valid entries in aidxGstRegShadows. */
+    uint64_t                    bmGstRegShadows;
+
+    union
+    {
+        /** Index of variable arguments, UINT8_MAX if not valid. */
+        uint8_t                 aidxArgVars[8];
+        /** For more efficient resetting. */
+        uint64_t                u64ArgVars;
+    };
+
+    /** Allocation bitmap for aVars. */
+    uint32_t                    bmVars;
+
+    /** Maps a guest register to a host GPR (index by IEMNATIVEGSTREG).
+     * Entries are only valid if the corresponding bit in bmGstRegShadows is set.
+     * (A shadow copy of a guest register can only be held in a one host register,
+     * there are no duplicate copies or ambiguities like that). */
+    uint8_t                     aidxGstRegShadows[kIemNativeGstReg_End];
+
+    /** Host register allocation tracking. */
+    IEMNATIVEHSTREG             aHstRegs[IEMNATIVE_HST_GREG_COUNT];
+
+    /** Variables and arguments. */
+    IEMNATIVEVAR                aVars[9];
+} IEMNATIVECORESTATE;
+/** Pointer to core state. */
+typedef IEMNATIVECORESTATE *PIEMNATIVECORESTATE;
+/** Pointer to const core state. */
+typedef IEMNATIVECORESTATE const *PCIEMNATIVECORESTATE;
+
+
+/**
  * Conditional stack entry.
  */
@@ -482 +529 @@
 {
     /** Set if we're in the "else" part, clear if we're in the "if" before it. */
-    bool     fInElse;
+    bool                        fInElse;
     /** The label for the IEM_MC_ELSE. */
-    uint32_t idxLabelElse;
+    uint32_t                    idxLabelElse;
     /** The label for the IEM_MC_ENDIF. */
-    uint32_t idxLabelEndIf;
+    uint32_t                    idxLabelEndIf;
+    /** The initial state snapshot as the if-block starts executing. */
+    IEMNATIVECORESTATE          InitialState;
+    /** The state snapshot at the end of the if-block. */
+    IEMNATIVECORESTATE          IfFinalState;
 } IEMNATIVECOND;
 /** Pointer to a condition stack entry. */
@@ -504 +555 @@
     uint32_t                    offInstrBufChecked;
 #else
-    uint32_t                    uPadding; /* We don't keep track of the size here... */
+    uint32_t                    uPadding1; /* We don't keep track of the size here... */
 #endif
     /** Fixed temporary code buffer for native recompilation. */
@@ -531 +582 @@
     /** Debug info. */
     PIEMTBDBG                   pDbgInfo;
-#else
-    uint32_t                    abPadding1[2];
-    uintptr_t                   uPtrPadding2;
 #endif
 
@@ -539 +587 @@
     PCIEMTB                     pTbOrg;
 
-    /** Allocation bitmap fro aHstRegs. */
-    uint32_t                    bmHstRegs;
-
-    /** Bitmap marking which host register contains guest register shadow copies.
-     * This is used during register allocation to try preserve copies.  */
-    uint32_t                    bmHstRegsWithGstShadow;
-    /** Bitmap marking valid entries in aidxGstRegShadows. */
-    uint64_t                    bmGstRegShadows;
-
     /** The current condition stack depth (aCondStack). */
     uint8_t                     cCondDepth;
-    uint8_t                     bPadding;
+    uint8_t                     bPadding2;
     /** Condition sequence number (for generating unique labels). */
     uint16_t                    uCondSeqNo;
-
-    /** Allocation bitmap for aVars. */
-    uint32_t                    bmVars;
-    union
-    {
-        /** Index of variable arguments, UINT8_MAX if not valid. */
-        uint8_t                 aidxArgVars[8];
-        /** For more efficient resetting. */
-        uint64_t                u64ArgVars;
-    };
-
-    /** Host register allocation tracking. */
-    IEMNATIVEHSTREG             aHstRegs[IEMNATIVE_HST_GREG_COUNT];
-    /** Maps a guest register to a host GPR (index by IEMNATIVEGSTREG).
-     * Entries are only valid if the corresponding bit in bmGstRegShadows is set.
-     * (A shadow copy of a guest register can only be held in a one host register,
-     * there are no duplicate copies or ambiguities like that). */
-    uint8_t                     aidxGstRegShadows[kIemNativeGstReg_End];
+    uint32_t                    uPadding3;
+
+    /** Core state requiring care with branches. */
+    IEMNATIVECORESTATE          Core;
 
     /** The condition nesting stack. */
-    IEMNATIVECOND               aCondStack[4];
-
-    /** Variables and arguments. */
-    IEMNATIVEVAR                aVars[16];
+    IEMNATIVECOND               aCondStack[2];
 } IEMRECOMPILERSTATE;
 /** Pointer to a native recompiler state. */
@@ -1521 +1543 @@
         /* Best to use a temporary register to deal with this in the simplest way: */
         uint8_t iTmpReg = iemNativeRegAllocTmpImm(pReNative, &off, (uint64_t)iAddend);
-        AssertReturn(iTmpReg < RT_ELEMENTS(pReNative->aHstRegs), UINT32_MAX);
+        AssertReturn(iTmpReg < RT_ELEMENTS(pReNative->Core.aHstRegs), UINT32_MAX);
 
         /* add dst, tmpreg  */
@@ -1548 +1570 @@
         /* Use temporary register for the immediate. */
         uint8_t iTmpReg = iemNativeRegAllocTmpImm(pReNative, &off, (uint64_t)iAddend);
-        AssertReturn(iTmpReg < RT_ELEMENTS(pReNative->aHstRegs), UINT32_MAX);
+        AssertReturn(iTmpReg < RT_ELEMENTS(pReNative->Core.aHstRegs), UINT32_MAX);
 
         /* add gprdst, gprdst, tmpreg */
@@ -1602 +1624 @@
         /* Use temporary register for the immediate. */
         uint8_t iTmpReg = iemNativeRegAllocTmpImm(pReNative, &off, (uint32_t)iAddend);
-        AssertReturn(iTmpReg < RT_ELEMENTS(pReNative->aHstRegs), UINT32_MAX);
+        AssertReturn(iTmpReg < RT_ELEMENTS(pReNative->Core.aHstRegs), UINT32_MAX);
 
         /* add gprdst, gprdst, tmpreg */