Changeset 77902 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

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

Author:

vboxsync

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

129611

Message:

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

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMSVMAll.cpp (modified) (2 diffs)
• IEMAllCImplSvmInstr.cpp.h (modified) (1 diff)

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;