Changeset 51182 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 5, 2014 12:08:40 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93555

Message:

VMM/IEM: Implemented hardware task-switches, code path disabled.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -4845 +4845 @@
         /*
          * AMD-V does not provide us with the original exception but we have it in u64IntInfo since we
-         * injected the event during VM-entry. Software interrupts and exceptions will be regenerated
-         * when the recompiler restarts the instruction.
+         * injected the event during VM-entry.
          */
         SVMEVENT Event;
         Event.u = pVCpu->hm.s.Event.u64IntInfo;
-        if (   Event.n.u3Type == SVM_EVENT_EXCEPTION
-            || Event.n.u3Type == SVM_EVENT_SOFTWARE_INT)
-        {
-            pVCpu->hm.s.Event.fPending = false;
-        }
-        else
-            Log4(("hmR0SvmExitTaskSwitch: TS occurred during event delivery. Kept pending u8Vector=%#x\n", Event.n.u8Vector));
+        Log4(("hmR0SvmExitTaskSwitch: TS occurred during event delivery. u8Vector=%#x\n", Event.n.u8Vector));
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitTaskSwitch);
+        return VINF_EM_RAW_INJECT_TRPM_EVENT;
     }
 

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -10650 +10650 @@
             uint32_t uIntType = VMX_IDT_VECTORING_INFO_TYPE(pVmxTransient->uIdtVectoringInfo);
 
-            /* Software interrupts and exceptions will be regenerated when the recompiler restarts the instruction. */
-            if (   uIntType != VMX_IDT_VECTORING_INFO_TYPE_SW_INT
-                && uIntType != VMX_IDT_VECTORING_INFO_TYPE_SW_XCPT
-                && uIntType != VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT)
+            uint32_t uVector     = VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo);
+            bool fErrorCodeValid = VMX_IDT_VECTORING_INFO_ERROR_CODE_IS_VALID(pVmxTransient->uIdtVectoringInfo);
+
+            /* Save it as a pending event and it'll be converted to a TRPM event on the way out to ring-3. */
+            Assert(!pVCpu->hm.s.Event.fPending);
+            pVCpu->hm.s.Event.fPending = true;
+            pVCpu->hm.s.Event.u64IntInfo = pVmxTransient->uIdtVectoringInfo;
+            rc = hmR0VmxReadIdtVectoringErrorCodeVmcs(pVmxTransient);
+            AssertRCReturn(rc, rc);
+            if (fErrorCodeValid)
+                pVCpu->hm.s.Event.u32ErrCode = pVmxTransient->uIdtVectoringErrorCode;
+            else
+                pVCpu->hm.s.Event.u32ErrCode = 0;
+            if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
+                && uVector == X86_XCPT_PF)
             {
-                uint32_t uVector     = VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo);
-                bool fErrorCodeValid = VMX_IDT_VECTORING_INFO_ERROR_CODE_IS_VALID(pVmxTransient->uIdtVectoringInfo);
-
-                /* Save it as a pending event and it'll be converted to a TRPM event on the way out to ring-3. */
-                Assert(!pVCpu->hm.s.Event.fPending);
-                pVCpu->hm.s.Event.fPending = true;
-                pVCpu->hm.s.Event.u64IntInfo = pVmxTransient->uIdtVectoringInfo;
-                rc = hmR0VmxReadIdtVectoringErrorCodeVmcs(pVmxTransient);
-                AssertRCReturn(rc, rc);
-                if (fErrorCodeValid)
-                    pVCpu->hm.s.Event.u32ErrCode = pVmxTransient->uIdtVectoringErrorCode;
-                else
-                    pVCpu->hm.s.Event.u32ErrCode = 0;
-                if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
-                    && uVector == X86_XCPT_PF)
-                {
-                    pVCpu->hm.s.Event.GCPtrFaultAddress = pMixedCtx->cr2;
-                }
-
-                Log4(("Pending event on TaskSwitch uIntType=%#x uVector=%#x\n", uIntType, uVector));
+                pVCpu->hm.s.Event.GCPtrFaultAddress = pMixedCtx->cr2;
             }
+
+            Log4(("Pending event on TaskSwitch uIntType=%#x uVector=%#x\n", uIntType, uVector));
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitTaskSwitch);
+            return VINF_EM_RAW_INJECT_TRPM_EVENT;
         }
     }