Changeset 99996 in vbox

Timestamp:

May 27, 2023 12:24:43 AM (18 months ago)

Author:

vboxsync

Message:

VMM/IEM: Stripped down iemReInitExec to what it's supposed to be doing.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMAll/IEMAllCImplSvmInstr.cpp (modified) (4 diffs)
• VMMAll/IEMAllCImplVmxInstr.cpp (modified) (4 diffs)
• include/IEMInline.h (modified) (1 diff)

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

@@ -785 +785 @@
 {
 #ifndef IEM_WITH_CODE_TLB
-    pVCpu->iem.s.cbOpcode = cbInstr;
+    pVCpu->iem.s.cbOpcode = cbInstr; /* Note! SVM and VT-x may set this to zero on exit, rather than the instruction length. */
 #elif 1
     pVCpu->iem.s.pbInstrBuf = NULL;

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

@@ -124 +124 @@
  * @returns Strict VBox status code from PGMChangeMode.
  * @param   pVCpu   The cross context virtual CPU structure.
- */
-DECLINLINE(VBOXSTRICTRC) iemSvmWorldSwitch(PVMCPUCC pVCpu)
+ * @param   cbInstr The length of the current instruction.
+ */
+DECLINLINE(VBOXSTRICTRC) iemSvmWorldSwitch(PVMCPUCC pVCpu, uint8_t cbInstr)
 {
     /*
@@ -143 +144 @@
 
     /* Re-initialize IEM cache/state after the drastic mode switch. */
-    iemReInitExec(pVCpu);
+    iemReInitExec(pVCpu, cbInstr);
     return rc;
 }
@@ -351 +352 @@
                  * Update PGM, IEM and others of a world-switch.
                  */
-                rcStrict = iemSvmWorldSwitch(pVCpu);
+                rcStrict = iemSvmWorldSwitch(pVCpu, 0 /*cbInstr - whatever*/);
                 if (rcStrict == VINF_SUCCESS)
                     rcStrict = VINF_SVM_VMEXIT;
@@ -822 +823 @@
          * Update PGM, IEM and others of a world-switch.
          */
-        VBOXSTRICTRC rcStrict = iemSvmWorldSwitch(pVCpu);
+        VBOXSTRICTRC rcStrict = iemSvmWorldSwitch(pVCpu, cbInstr);
         if (rcStrict == VINF_SUCCESS)
         { /* likely */ }

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

@@ -1278 +1278 @@
  *
  * @param   pVCpu       The cross context virtual CPU structure.
-*/
-static int iemVmxTransition(PVMCPUCC pVCpu) RT_NOEXCEPT
+ * @param   cbInstr     The length of the current instruction.
+ */
+static int iemVmxTransition(PVMCPUCC pVCpu, uint8_t cbInstr) RT_NOEXCEPT
 {
     /*
@@ -1300 +1301 @@
 
     /* Re-initialize IEM cache/state after the drastic mode switch. */
-    iemReInitExec(pVCpu);
+    iemReInitExec(pVCpu, cbInstr);
     return rc;
 }
@@ -2089 +2090 @@
 
     /* Perform the VMX transition (PGM updates). */
-    VBOXSTRICTRC rcStrict = iemVmxTransition(pVCpu);
+    VBOXSTRICTRC rcStrict = iemVmxTransition(pVCpu, 0 /*cbInstr - whatever*/);
     if (rcStrict == VINF_SUCCESS)
     { /* likely */ }
@@ -7923 +7924 @@
 
                         /* Perform the VMX transition (PGM updates). */
-                        VBOXSTRICTRC rcStrict = iemVmxTransition(pVCpu);
+                        VBOXSTRICTRC rcStrict = iemVmxTransition(pVCpu, cbInstr);
                         if (rcStrict == VINF_SUCCESS)
                         { /* likely */ }

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

@@ -265 +265 @@
  *
  * @param   pVCpu               The cross context virtual CPU structure of the calling EMT.
- */
-DECLINLINE(void) iemReInitExec(PVMCPUCC pVCpu) RT_NOEXCEPT
-{
-    IEMMODE const enmMode = iemCalcCpuMode(pVCpu);
-    uint8_t const uCpl    = CPUMGetGuestCPL(pVCpu);
-
-    pVCpu->iem.s.uCpl             = uCpl;
-    pVCpu->iem.s.enmCpuMode       = enmMode;
-/** @todo r=bird: The rest of this function should not be necessary!
- * All these fields below will be re-initialized before we decode more code - as
- * they are _not_ relevant to 'Exec' (xcpt rcPassUp), only to 'Decoding'.
- *
- * Only exception might be rcPassUp, though, I don't know why anyone other than
- * the execution loops should need to mess around with it!
- *
- * I don't think we really need or want this function, better to just set uCpl
- * and enmCpuMode explicitly in the relevant code.  We do this in a number of
- * other scenarios.  Or, rename it to iemReCalcCpuModeAndCpl.
- */
-    pVCpu->iem.s.enmDefAddrMode   = enmMode;  /** @todo check if this is correct... */
-    pVCpu->iem.s.enmEffAddrMode   = enmMode;
-    if (enmMode != IEMMODE_64BIT)
-    {
-        pVCpu->iem.s.enmDefOpSize = enmMode;  /** @todo check if this is correct... */
-        pVCpu->iem.s.enmEffOpSize = enmMode;
-    }
-    else
-    {
-        pVCpu->iem.s.enmDefOpSize = IEMMODE_32BIT;
-        pVCpu->iem.s.enmEffOpSize = enmMode;
-    }
-    pVCpu->iem.s.iEffSeg          = X86_SREG_DS;
-#  ifndef IEM_WITH_CODE_TLB
-    /** @todo Shouldn't we be doing this in IEMTlbInvalidateAll()? */
-    pVCpu->iem.s.offOpcode        = 0;
-    pVCpu->iem.s.cbOpcode         = 0;
-#  endif
-    pVCpu->iem.s.rcPassUp         = VINF_SUCCESS;
+ * @param   cbInstr             The instruction length (for flushing).
+ */
+DECLINLINE(void) iemReInitExec(PVMCPUCC pVCpu, uint8_t cbInstr) RT_NOEXCEPT
+{
+    pVCpu->iem.s.uCpl             = CPUMGetGuestCPL(pVCpu);
+    pVCpu->iem.s.enmCpuMode       = iemCalcCpuMode(pVCpu);
+    iemOpcodeFlushHeavy(pVCpu, cbInstr);
 }
 # endif