Changeset 105854 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 23, 2024 9:03:01 PM (5 months ago)

Author:

vboxsync

Message:

VMM/IEM: Don't force PC updating during IEM_MC_ADVANCE_RIP_AND_FINISH inside IF/ELSE/ENDIF blocks. This is more work on todo 4 in bugref:10720. bugref:10373

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllN8veRecompFuncs.h (modified) (6 diffs)
• VMMAll/IEMAllN8veRecompiler.cpp (modified) (2 diffs)
• include/IEMN8veRecompiler.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompFuncs.h

@@ -578 +578 @@
 
 #ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING
-    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativePcUpdateTotal);
-
     pReNative->Core.offPc += cbInstr;
     Log4(("offPc=%x cbInstr=%#x off=%#x\n", pReNative->Core.offPc, cbInstr, off));
@@ -588 +586 @@
     off = iemNativePcAdjustCheck(pReNative, off);
 # endif
-
-    if (pReNative->cCondDepth)
-        off = iemNativeEmitPcWriteback(pReNative, off);
-    else
-        pReNative->Core.cInstrPcUpdateSkipped++;
-
+# if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
+    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativePcUpdateTotal);
+    pReNative->Core.cInstrPcUpdateSkipped++;
+# endif
 #endif
 
@@ -631 +627 @@
 
 #ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING
-    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativePcUpdateTotal);
-
     pReNative->Core.offPc += cbInstr;
     Log4(("offPc=%x cbInstr=%#x off=%#x\n", pReNative->Core.offPc, cbInstr, off));
@@ -641 +635 @@
     off = iemNativePcAdjustCheck(pReNative, off);
 # endif
-
-    if (pReNative->cCondDepth)
-        off = iemNativeEmitPcWriteback(pReNative, off);
-    else
-        pReNative->Core.cInstrPcUpdateSkipped++;
+# if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
+    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativePcUpdateTotal);
+    pReNative->Core.cInstrPcUpdateSkipped++;
+# endif
 #endif
 
@@ -684 +677 @@
 
 #ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING
-    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativePcUpdateTotal);
-
     pReNative->Core.offPc += cbInstr;
     Log4(("offPc=%x cbInstr=%#x off=%#x\n", pReNative->Core.offPc, cbInstr, off));
@@ -694 +685 @@
     off = iemNativePcAdjustCheck(pReNative, off);
 # endif
-
-    if (pReNative->cCondDepth)
-        off = iemNativeEmitPcWriteback(pReNative, off);
-    else
-        pReNative->Core.cInstrPcUpdateSkipped++;
+# if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
+    STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativePcUpdateTotal);
+    pReNative->Core.cInstrPcUpdateSkipped++;
+# endif
 #endif
 

trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp

@@ -2071 +2071 @@
 #ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING
     pReNative->Core.offPc                  = 0;
+# if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
     pReNative->Core.cInstrPcUpdateSkipped  = 0;
+# endif
 # ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING_DEBUG
     pReNative->Core.fDebugPcInitialized    = false;
@@ -5788 +5790 @@
 # endif
 
+    pReNative->Core.offPc                 = 0;
+# if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
     STAM_COUNTER_ADD(&pReNative->pVCpu->iem.s.StatNativePcUpdateDelayed, pReNative->Core.cInstrPcUpdateSkipped);
-    pReNative->Core.offPc                 = 0;
     pReNative->Core.cInstrPcUpdateSkipped = 0;
+# endif
 
     return off;

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

@@ -1245 +1245 @@
      * as long as possible. */
     uint32_t                    offPc;
+# if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
     /** Number of instructions where we could skip the updating. */
     uint8_t                     cInstrPcUpdateSkipped;
+# endif
 # ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING_DEBUG
     /** Set after we've loaded PC into uPcUpdatingDebug at the first update. */