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

Timestamp:

Aug 23, 2024 8:36:08 PM (5 months ago)

Author:

vboxsync

Message:

VMM/IEM: Don't force PC updating before branches, nor flushing of dirty guest shadowed registers either. Both needs more work before todo 4 in bugref:10720 can be marked as resolved. bugref:10373 bugref:10629

File:

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

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

@@ -4360 +4360 @@
  */
 DECL_FORCE_INLINE_THROW(uint32_t)
-iemNativeEmitAddGpr32ImmEx(PIEMNATIVEINSTR pCodeBuf, uint32_t off, uint8_t iGprDst, int32_t iAddend)
+iemNativeEmitAddGpr32ImmEx(PIEMNATIVEINSTR pCodeBuf, uint32_t off, uint8_t iGprDst, int32_t iAddend, uint8_t iGprTmp = UINT8_MAX)
 {
 #if defined(RT_ARCH_AMD64)
@@ -4375 +4375 @@
     pCodeBuf[off++] = RT_BYTE3((uint32_t)iAddend);
     pCodeBuf[off++] = RT_BYTE4((uint32_t)iAddend);
+    RT_NOREF(iGprTmp);
 
 #elif defined(RT_ARCH_ARM64)
@@ -4386 +4387 @@
         if (uAbsAddend & 0xfffU)
             pCodeBuf[off++] = Armv8A64MkInstrAddSubUImm12(fSub, iGprDst, iGprDst, uAbsAddend & 0xfff, false /*f64Bit*/);
+    }
+    else if (iGprTmp != UINT8_MAX)
+    {
+        off = iemNativeEmitLoadGpr32ImmEx(pCodeBuf, off, iGprTmp, iAddend);
+        pCodeBuf[off++] = Armv8A64MkInstrAddReg(iGprDst, iGprDst, iGprTmp, false /*f64Bit*/);
     }
     else
@@ -8266 +8272 @@
 
 /**
+ * Helper for marking the current conditional branch as exiting the TB.
+ *
+ * This simplifies the state consolidation later when we reach the IEM_MC_ENDIF.
+ */
+DECL_FORCE_INLINE(void) iemNativeMarkCurCondBranchAsExiting(PIEMRECOMPILERSTATE pReNative)
+{
+    uint8_t idxCondDepth = pReNative->cCondDepth;
+    if (idxCondDepth)
+    {
+        idxCondDepth--;
+        pReNative->aCondStack[idxCondDepth].afExitTb[pReNative->aCondStack[idxCondDepth].fInElse] = true;
+    }
+}
+
+
+/**
  * Emits a Jcc rel32 / B.cc imm19 to the given label (ASSUMED requiring fixup).
  */
@@ -8273 +8295 @@
 {
     Assert(IEMNATIVELABELTYPE_IS_EXIT_REASON(enmExitReason));
+
 #if defined(IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE) && defined(RT_ARCH_AMD64)
     /* jcc rel32 */
@@ -8380 +8403 @@
 {
     Assert(IEMNATIVELABELTYPE_IS_EXIT_REASON(enmExitReason));
+
+    iemNativeMarkCurCondBranchAsExiting(pReNative);
+
 #ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
 # ifdef RT_ARCH_AMD64
@@ -8409 +8435 @@
 {
     Assert(IEMNATIVELABELTYPE_IS_EXIT_REASON(enmExitReason));
+
+    iemNativeMarkCurCondBranchAsExiting(pReNative);
+
 #ifdef IEMNATIVE_WITH_RECOMPILER_PER_CHUNK_TAIL_CODE
 # ifdef RT_ARCH_AMD64