Changeset 67163 in vbox for trunk

Timestamp:

May 31, 2017 10:21:53 AM (8 years ago)

Author:

vboxsync

Message:

VMM/IEM: Temporary hack for toggling forcing of execution to continue in IEM.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMAll/IEMAllCImpl.cpp.h (modified) (2 diffs)
• include/IEMInternal.h (modified) (1 diff)

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

@@ -14911 +14911 @@
         rcStrict = pVCpu->iem.s.rcPassUp;
     }
+#ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+    else if (pVCpu->iem.s.fForceIemExec)
+        rcStrict = VINF_EM_RESCHEDULE_REM;
+#endif
 
     return rcStrict;

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -6368 +6368 @@
     pCtx->hwvirt.svm.fGif = 0;
     iemRegAddToRipAndClearRF(pVCpu, cbInstr);
+#ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+    pVCpu->iem.s.fForceIemExec = true;
+#endif
     return VINF_SUCCESS;
 }
@@ -6387 +6390 @@
     pCtx->hwvirt.svm.fGif = 1;
     iemRegAddToRipAndClearRF(pVCpu, cbInstr);
+#ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+    pVCpu->iem.s.fForceIemExec = false;
+#endif
     return VINF_SUCCESS;
 }

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

@@ -673 +673 @@
     /** Number of long jumps. */
     uint32_t                cLongJumps;
+    /** Whether to force execution to continue in IEM. */
+#ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+    uint8_t                 fForceIemExec;
+    uint8_t                 uAlignment6[3]; /**< Alignment padding. */
+#else
     uint32_t                uAlignment6; /**< Alignment padding. */
+#endif
 #ifdef IEM_VERIFICATION_MODE_FULL
     /** The Number of I/O port reads that has been performed. */