Changeset 77902 in vbox

Timestamp:

Mar 27, 2019 8:49:11 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Fix HMSvmEventToTrpmEventType to convert #BP and #OF to TRPM_SOFTWARE_INT.

Location:

trunk

Files:

• include/VBox/vmm/hm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/hm.h

@@ -166 +166 @@
  * in CPUM.
  * @{ */
-VMM_INT_DECL(TRPMEVENT)         HMSvmEventToTrpmEventType(PCSVMEVENT pSvmEvent);
+VMM_INT_DECL(TRPMEVENT)         HMSvmEventToTrpmEventType(PCSVMEVENT pSvmEvent, uint8_t uVector);
 /** @} */
 

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

@@ -437 +437 @@
  *
  * @param   pEvent       Pointer to the SVM event.
- */
-VMM_INT_DECL(TRPMEVENT) HMSvmEventToTrpmEventType(PCSVMEVENT pEvent)
+ * @param   uVector      The vector associated with the event.
+ */
+VMM_INT_DECL(TRPMEVENT) HMSvmEventToTrpmEventType(PCSVMEVENT pEvent, uint8_t uVector)
 {
     uint8_t const uType = pEvent->n.u3Type;
@@ -445 +446 @@
         case SVM_EVENT_EXTERNAL_IRQ:    return TRPM_HARDWARE_INT;
         case SVM_EVENT_SOFTWARE_INT:    return TRPM_SOFTWARE_INT;
+        case SVM_EVENT_NMI:             return TRPM_TRAP;
         case SVM_EVENT_EXCEPTION:
-        case SVM_EVENT_NMI:             return TRPM_TRAP;
+        {
+            if (   uVector == X86_XCPT_BP
+                || uVector == X86_XCPT_OF)
+                return TRPM_SOFTWARE_INT;
+            return TRPM_TRAP;
+        }
         default:
             break;

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

@@ -769 +769 @@
         {
             uint8_t   const uVector    = pEventInject->n.u8Vector;
-            TRPMEVENT const enmType    = HMSvmEventToTrpmEventType(pEventInject);
+            TRPMEVENT const enmType    = HMSvmEventToTrpmEventType(pEventInject, uVector);
             uint16_t  const uErrorCode = pEventInject->n.u1ErrorCodeValid ? pEventInject->n.u32ErrorCode : 0;
 

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

@@ -3587 +3587 @@
     uint8_t   uVector     = Event.n.u8Vector;
     uint8_t   uVectorType = Event.n.u3Type;
-    TRPMEVENT enmTrapType = HMSvmEventToTrpmEventType(&Event);
+    TRPMEVENT enmTrapType = HMSvmEventToTrpmEventType(&Event, uVector);
 
     Log4(("HM event->TRPM: uVector=%#x enmTrapType=%d\n", uVector, uVectorType));
@@ -3597 +3597 @@
         TRPMSetErrorCode(pVCpu, Event.n.u32ErrorCode);
 
-    if (   uVectorType == SVM_EVENT_EXCEPTION
+    if (   enmTrapType == TRPM_TRAP
         && uVector     == X86_XCPT_PF)
     {
@@ -3603 +3603 @@
         Assert(pVCpu->hm.s.Event.GCPtrFaultAddress == CPUMGetGuestCR2(pVCpu));
     }
-    else if (uVectorType == SVM_EVENT_SOFTWARE_INT)
-    {
-        AssertMsg(   uVectorType == SVM_EVENT_SOFTWARE_INT
-                  || (uVector == X86_XCPT_BP || uVector == X86_XCPT_OF),
-                  ("Invalid vector: uVector=%#x uVectorType=%#x\n", uVector, uVectorType));
+    else if (enmTrapType == TRPM_SOFTWARE_INT)
         TRPMSetInstrLength(pVCpu, pVCpu->hm.s.Event.cbInstr);
-    }
     pVCpu->hm.s.Event.fPending = false;
 }