Index: /trunk/include/VBox/vmm/hm_svm.h =================================================================== --- /trunk/include/VBox/vmm/hm_svm.h (revision 71855) +++ /trunk/include/VBox/vmm/hm_svm.h (revision 71856) @@ -138,36 +138,58 @@ # define SVM_EXIT_WRITE_DR15 0x3F /* Exception 0-31. */ -# define SVM_EXIT_EXCEPTION_0 0x40 -# define SVM_EXIT_EXCEPTION_1 0x41 -# define SVM_EXIT_EXCEPTION_2 0x42 -# define SVM_EXIT_EXCEPTION_3 0x43 -# define SVM_EXIT_EXCEPTION_4 0x44 -# define SVM_EXIT_EXCEPTION_5 0x45 -# define SVM_EXIT_EXCEPTION_6 0x46 -# define SVM_EXIT_EXCEPTION_7 0x47 -# define SVM_EXIT_EXCEPTION_8 0x48 -# define SVM_EXIT_EXCEPTION_9 0x49 -# define SVM_EXIT_EXCEPTION_10 0x4A -# define SVM_EXIT_EXCEPTION_11 0x4B -# define SVM_EXIT_EXCEPTION_12 0x4C -# define SVM_EXIT_EXCEPTION_13 0x4D -# define SVM_EXIT_EXCEPTION_14 0x4E -# define SVM_EXIT_EXCEPTION_15 0x4F -# define SVM_EXIT_EXCEPTION_16 0x50 -# define SVM_EXIT_EXCEPTION_17 0x51 -# define SVM_EXIT_EXCEPTION_18 0x52 -# define SVM_EXIT_EXCEPTION_19 0x53 -# define SVM_EXIT_EXCEPTION_20 0x54 -# define SVM_EXIT_EXCEPTION_21 0x55 -# define SVM_EXIT_EXCEPTION_22 0x56 -# define SVM_EXIT_EXCEPTION_23 0x57 -# define SVM_EXIT_EXCEPTION_24 0x58 -# define SVM_EXIT_EXCEPTION_25 0x59 -# define SVM_EXIT_EXCEPTION_26 0x5A -# define SVM_EXIT_EXCEPTION_27 0x5B -# define SVM_EXIT_EXCEPTION_28 0x5C -# define SVM_EXIT_EXCEPTION_29 0x5D -# define SVM_EXIT_EXCEPTION_30 0x5E -# define SVM_EXIT_EXCEPTION_31 0x5F +# define SVM_EXIT_XCPT_0 0x40 +# define SVM_EXIT_XCPT_1 0x41 +# define SVM_EXIT_XCPT_2 0x42 +# define SVM_EXIT_XCPT_3 0x43 +# define SVM_EXIT_XCPT_4 0x44 +# define SVM_EXIT_XCPT_5 0x45 +# define SVM_EXIT_XCPT_6 0x46 +# define SVM_EXIT_XCPT_7 0x47 +# define SVM_EXIT_XCPT_8 0x48 +# define SVM_EXIT_XCPT_9 0x49 +# define SVM_EXIT_XCPT_10 0x4A +# define SVM_EXIT_XCPT_11 0x4B +# define SVM_EXIT_XCPT_12 0x4C +# define SVM_EXIT_XCPT_13 0x4D +# define SVM_EXIT_XCPT_14 0x4E +# define SVM_EXIT_XCPT_15 0x4F +# define SVM_EXIT_XCPT_16 0x50 +# define SVM_EXIT_XCPT_17 0x51 +# define SVM_EXIT_XCPT_18 0x52 +# define SVM_EXIT_XCPT_19 0x53 +# define SVM_EXIT_XCPT_20 0x54 +# define SVM_EXIT_XCPT_21 0x55 +# define SVM_EXIT_XCPT_22 0x56 +# define SVM_EXIT_XCPT_23 0x57 +# define SVM_EXIT_XCPT_24 0x58 +# define SVM_EXIT_XCPT_25 0x59 +# define SVM_EXIT_XCPT_26 0x5A +# define SVM_EXIT_XCPT_27 0x5B +# define SVM_EXIT_XCPT_28 0x5C +# define SVM_EXIT_XCPT_29 0x5D +# define SVM_EXIT_XCPT_30 0x5E +# define SVM_EXIT_XCPT_31 0x5F +/* Exception (more readable) */ +# define SVM_EXIT_XCPT_DE SVM_EXIT_XCPT_0 +# define SVM_EXIT_XCPT_DB SVM_EXIT_XCPT_1 +# define SVM_EXIT_XCPT_NMI SVM_EXIT_XCPT_2 +# define SVM_EXIT_XCPT_BP SVM_EXIT_XCPT_3 +# define SVM_EXIT_XCPT_OF SVM_EXIT_XCPT_4 +# define SVM_EXIT_XCPT_BR SVM_EXIT_XCPT_5 +# define SVM_EXIT_XCPT_UD SVM_EXIT_XCPT_6 +# define SVM_EXIT_XCPT_NM SVM_EXIT_XCPT_7 +# define SVM_EXIT_XCPT_DF SVM_EXIT_XCPT_8 +# define SVM_EXIT_XCPT_CO_SEG_OVERRUN SVM_EXIT_XCPT_9 +# define SVM_EXIT_XCPT_TS SVM_EXIT_XCPT_10 +# define SVM_EXIT_XCPT_NP SVM_EXIT_XCPT_11 +# define SVM_EXIT_XCPT_SS SVM_EXIT_XCPT_12 +# define SVM_EXIT_XCPT_GP SVM_EXIT_XCPT_13 +# define SVM_EXIT_XCPT_PF SVM_EXIT_XCPT_14 +# define SVM_EXIT_XCPT_MF SVM_EXIT_XCPT_16 +# define SVM_EXIT_XCPT_AC SVM_EXIT_XCPT_17 +# define SVM_EXIT_XCPT_MC SVM_EXIT_XCPT_18 +# define SVM_EXIT_XCPT_XF SVM_EXIT_XCPT_19 +# define SVM_EXIT_XCPT_VE SVM_EXIT_XCPT_20 +# define SVM_EXIT_XCPT_SX SVM_EXIT_XCPT_30 /** Physical maskable interrupt. */ # define SVM_EXIT_INTR 0x60 Index: /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (revision 71855) +++ /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (revision 71856) @@ -5044,5 +5044,4 @@ } - case SVM_EXIT_MONITOR: { @@ -5117,5 +5116,5 @@ } - case SVM_EXIT_EXCEPTION_14: /* X86_XCPT_PF */ + case SVM_EXIT_XCPT_PF: { PVM pVM = pVCpu->CTX_SUFF(pVM); @@ -5136,5 +5135,5 @@ } - case SVM_EXIT_EXCEPTION_6: /* X86_XCPT_UD */ + case SVM_EXIT_XCPT_UD: { if (HMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_UD)) @@ -5144,5 +5143,5 @@ } - case SVM_EXIT_EXCEPTION_16: /* X86_XCPT_MF */ + case SVM_EXIT_XCPT_MF: { if (HMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_MF)) @@ -5151,5 +5150,5 @@ } - case SVM_EXIT_EXCEPTION_1: /* X86_XCPT_DB */ + case SVM_EXIT_XCPT_DB: { if (HMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_DB)) @@ -5158,5 +5157,5 @@ } - case SVM_EXIT_EXCEPTION_17: /* X86_XCPT_AC */ + case SVM_EXIT_XCPT_AC: { if (HMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_AC)) @@ -5165,5 +5164,5 @@ } - case SVM_EXIT_EXCEPTION_3: /* X86_XCPT_BP */ + case SVM_EXIT_XCPT_BP: { if (HMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_BP)) @@ -5218,4 +5217,5 @@ case SVM_EXIT_INTR: case SVM_EXIT_NMI: + case SVM_EXIT_XCPT_NMI: /* Shouldn't ever happen, SVM_EXIT_NMI is used instead. */ case SVM_EXIT_SMI: { @@ -5291,18 +5291,29 @@ } - /* The exceptions not handled here are already handled individually above (as they occur more frequently). */ - case SVM_EXIT_EXCEPTION_0: /*case SVM_EXIT_EXCEPTION_1:*/ case SVM_EXIT_EXCEPTION_2: - /*case SVM_EXIT_EXCEPTION_3:*/ case SVM_EXIT_EXCEPTION_4: case SVM_EXIT_EXCEPTION_5: - /*case SVM_EXIT_EXCEPTION_6:*/ case SVM_EXIT_EXCEPTION_7: case SVM_EXIT_EXCEPTION_8: - case SVM_EXIT_EXCEPTION_9: case SVM_EXIT_EXCEPTION_10: case SVM_EXIT_EXCEPTION_11: - case SVM_EXIT_EXCEPTION_12: case SVM_EXIT_EXCEPTION_13: /*case SVM_EXIT_EXCEPTION_14:*/ - case SVM_EXIT_EXCEPTION_15: /*case SVM_EXIT_EXCEPTION_16:*/ /*case SVM_EXIT_EXCEPTION_17:*/ - case SVM_EXIT_EXCEPTION_18: case SVM_EXIT_EXCEPTION_19: case SVM_EXIT_EXCEPTION_20: - case SVM_EXIT_EXCEPTION_21: case SVM_EXIT_EXCEPTION_22: case SVM_EXIT_EXCEPTION_23: - case SVM_EXIT_EXCEPTION_24: case SVM_EXIT_EXCEPTION_25: case SVM_EXIT_EXCEPTION_26: - case SVM_EXIT_EXCEPTION_27: case SVM_EXIT_EXCEPTION_28: case SVM_EXIT_EXCEPTION_29: - case SVM_EXIT_EXCEPTION_30: case SVM_EXIT_EXCEPTION_31: + case SVM_EXIT_XCPT_0: /* #DE */ + /* SVM_EXIT_XCPT_1: */ /* #DB - Handled above. */ + /* SVM_EXIT_XCPT_2: */ /* #NMI - Handled above. */ + /* SVM_EXIT_XCPT_3: */ /* #BP - Handled above. */ + case SVM_EXIT_XCPT_4: /* #OF */ + case SVM_EXIT_XCPT_5: /* #BR */ + /* SVM_EXIT_XCPT_6: */ /* #UD - Handled above. */ + case SVM_EXIT_XCPT_7: /* #NM */ + case SVM_EXIT_XCPT_8: /* #DF */ + case SVM_EXIT_XCPT_9: /* #CO_SEG_OVERRUN */ + case SVM_EXIT_XCPT_10: /* #TS */ + case SVM_EXIT_XCPT_11: /* #NP */ + case SVM_EXIT_XCPT_12: /* #SS */ + case SVM_EXIT_XCPT_13: /* #GP */ + /* SVM_EXIT_XCPT_14: */ /* #PF - Handled above. */ + case SVM_EXIT_XCPT_15: /* Reserved. */ + /* SVM_EXIT_XCPT_16: */ /* #MF - Handled above. */ + /* SVM_EXIT_XCPT_17: */ /* #AC - Handled above. */ + case SVM_EXIT_XCPT_18: /* #MC */ + case SVM_EXIT_XCPT_19: /* #XF */ + case SVM_EXIT_XCPT_20: case SVM_EXIT_XCPT_21: case SVM_EXIT_XCPT_22: case SVM_EXIT_XCPT_23: + case SVM_EXIT_XCPT_24: case SVM_EXIT_XCPT_25: case SVM_EXIT_XCPT_26: case SVM_EXIT_XCPT_27: + case SVM_EXIT_XCPT_28: case SVM_EXIT_XCPT_29: case SVM_EXIT_XCPT_30: case SVM_EXIT_XCPT_31: { - uint8_t const uVector = uExitCode - SVM_EXIT_EXCEPTION_0; + uint8_t const uVector = uExitCode - SVM_EXIT_XCPT_0; if (HMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, uVector)) return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2); @@ -5410,5 +5421,5 @@ Assert(pVCpu->CTX_SUFF(pVM)->hm.s.fNestedPaging); if (HMIsGuestSvmXcptInterceptSet(pVCpu, pCtx, X86_XCPT_PF)) - return HM_SVM_VMEXIT_NESTED(pVCpu, SVM_EXIT_EXCEPTION_14, RT_LO_U32(uExitInfo1), uExitInfo2); + return HM_SVM_VMEXIT_NESTED(pVCpu, SVM_EXIT_XCPT_14, RT_LO_U32(uExitInfo1), uExitInfo2); hmR0SvmSetPendingXcptPF(pVCpu, pCtx, RT_LO_U32(uExitInfo1), uExitInfo2); return VINF_SUCCESS; @@ -5473,20 +5484,20 @@ return hmR0SvmExitCpuid(pVCpu, pCtx, pSvmTransient); - case SVM_EXIT_EXCEPTION_14: /* X86_XCPT_PF */ + case SVM_EXIT_XCPT_14: /* X86_XCPT_PF */ return hmR0SvmExitXcptPF(pVCpu, pCtx, pSvmTransient); - case SVM_EXIT_EXCEPTION_6: /* X86_XCPT_UD */ + case SVM_EXIT_XCPT_6: /* X86_XCPT_UD */ return hmR0SvmExitXcptUD(pVCpu, pCtx, pSvmTransient); - case SVM_EXIT_EXCEPTION_16: /* X86_XCPT_MF */ + case SVM_EXIT_XCPT_16: /* X86_XCPT_MF */ return hmR0SvmExitXcptMF(pVCpu, pCtx, pSvmTransient); - case SVM_EXIT_EXCEPTION_1: /* X86_XCPT_DB */ + case SVM_EXIT_XCPT_1: /* X86_XCPT_DB */ return hmR0SvmExitXcptDB(pVCpu, pCtx, pSvmTransient); - case SVM_EXIT_EXCEPTION_17: /* X86_XCPT_AC */ + case SVM_EXIT_XCPT_17: /* X86_XCPT_AC */ return hmR0SvmExitXcptAC(pVCpu, pCtx, pSvmTransient); - case SVM_EXIT_EXCEPTION_3: /* X86_XCPT_BP */ + case SVM_EXIT_XCPT_3: /* X86_XCPT_BP */ return hmR0SvmExitXcptBP(pVCpu, pCtx, pSvmTransient); @@ -5530,4 +5541,5 @@ case SVM_EXIT_INTR: case SVM_EXIT_NMI: + case SVM_EXIT_XCPT_NMI: /* Shouldn't ever happen, SVM_EXIT_NMI is used instead. */ return hmR0SvmExitIntr(pVCpu, pCtx, pSvmTransient); @@ -5608,28 +5620,27 @@ #ifdef HMSVM_ALWAYS_TRAP_ALL_XCPTS - case SVM_EXIT_EXCEPTION_0: /* X86_XCPT_DE */ - /* SVM_EXIT_EXCEPTION_1: */ /* X86_XCPT_DB - Handled above. */ - case SVM_EXIT_EXCEPTION_2: /* X86_XCPT_NMI */ - /* SVM_EXIT_EXCEPTION_3: */ /* X86_XCPT_BP - Handled above. */ - case SVM_EXIT_EXCEPTION_4: /* X86_XCPT_OF */ - case SVM_EXIT_EXCEPTION_5: /* X86_XCPT_BR */ - /* SVM_EXIT_EXCEPTION_6: */ /* X86_XCPT_UD - Handled above. */ - case SVM_EXIT_EXCEPTION_7: /* X86_XCPT_NM */ - case SVM_EXIT_EXCEPTION_8: /* X86_XCPT_DF */ - case SVM_EXIT_EXCEPTION_9: /* X86_XCPT_CO_SEG_OVERRUN */ - case SVM_EXIT_EXCEPTION_10: /* X86_XCPT_TS */ - case SVM_EXIT_EXCEPTION_11: /* X86_XCPT_NP */ - case SVM_EXIT_EXCEPTION_12: /* X86_XCPT_SS */ - case SVM_EXIT_EXCEPTION_13: /* X86_XCPT_GP */ - /* SVM_EXIT_EXCEPTION_14: */ /* X86_XCPT_PF - Handled above. */ - case SVM_EXIT_EXCEPTION_15: /* Reserved. */ - /* SVM_EXIT_EXCEPTION_16: */ /* X86_XCPT_MF - Handled above. */ - /* SVM_EXIT_EXCEPTION_17: */ /* X86_XCPT_AC - Handled above. */ - case SVM_EXIT_EXCEPTION_18: /* X86_XCPT_MC */ - case SVM_EXIT_EXCEPTION_19: /* X86_XCPT_XF */ - case SVM_EXIT_EXCEPTION_20: case SVM_EXIT_EXCEPTION_21: case SVM_EXIT_EXCEPTION_22: - case SVM_EXIT_EXCEPTION_23: case SVM_EXIT_EXCEPTION_24: case SVM_EXIT_EXCEPTION_25: - case SVM_EXIT_EXCEPTION_26: case SVM_EXIT_EXCEPTION_27: case SVM_EXIT_EXCEPTION_28: - case SVM_EXIT_EXCEPTION_29: case SVM_EXIT_EXCEPTION_30: case SVM_EXIT_EXCEPTION_31: + case SVM_EXIT_XCPT_0: /* #DE */ + /* SVM_EXIT_XCPT_1: */ /* #DB - Handled above. */ + /* SVM_EXIT_XCPT_2: */ /* #NMI - Handled above. */ + /* SVM_EXIT_XCPT_3: */ /* #BP - Handled above. */ + case SVM_EXIT_XCPT_4: /* #OF */ + case SVM_EXIT_XCPT_5: /* #BR */ + /* SVM_EXIT_XCPT_6: */ /* #UD - Handled above. */ + case SVM_EXIT_XCPT_7: /* #NM */ + case SVM_EXIT_XCPT_8: /* #DF */ + case SVM_EXIT_XCPT_9: /* #CO_SEG_OVERRUN */ + case SVM_EXIT_XCPT_10: /* #TS */ + case SVM_EXIT_XCPT_11: /* #NP */ + case SVM_EXIT_XCPT_12: /* #SS */ + case SVM_EXIT_XCPT_13: /* #GP */ + /* SVM_EXIT_XCPT_14: */ /* #PF - Handled above. */ + case SVM_EXIT_XCPT_15: /* Reserved. */ + /* SVM_EXIT_XCPT_16: */ /* #MF - Handled above. */ + /* SVM_EXIT_XCPT_17: */ /* #AC - Handled above. */ + case SVM_EXIT_XCPT_18: /* #MC */ + case SVM_EXIT_XCPT_19: /* #XF */ + case SVM_EXIT_XCPT_20: case SVM_EXIT_XCPT_21: case SVM_EXIT_XCPT_22: case SVM_EXIT_XCPT_23: + case SVM_EXIT_XCPT_24: case SVM_EXIT_XCPT_25: case SVM_EXIT_XCPT_26: case SVM_EXIT_XCPT_27: + case SVM_EXIT_XCPT_28: case SVM_EXIT_XCPT_29: case SVM_EXIT_XCPT_30: case SVM_EXIT_XCPT_31: return hmR0SvmExitXcptGeneric(pVCpu, pCtx, pSvmTransient); #endif /* HMSVM_ALWAYS_TRAP_ALL_XCPTS */ @@ -5867,9 +5878,9 @@ IEMXCPTRAISE enmRaise; IEMXCPTRAISEINFO fRaiseInfo; - bool const fExitIsHwXcpt = pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0 <= SVM_EXIT_EXCEPTION_31; + bool const fExitIsHwXcpt = pSvmTransient->u64ExitCode - SVM_EXIT_XCPT_0 <= SVM_EXIT_XCPT_31; uint8_t const uIdtVector = pVmcb->ctrl.ExitIntInfo.n.u8Vector; if (fExitIsHwXcpt) { - uint8_t const uExitVector = pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0; + uint8_t const uExitVector = pSvmTransient->u64ExitCode - SVM_EXIT_XCPT_0; uint32_t const fIdtVectorFlags = hmR0SvmGetIemXcptFlags(&pVmcb->ctrl.ExitIntInfo); uint32_t const fExitVectorFlags = IEM_XCPT_FLAGS_T_CPU_XCPT; @@ -5998,7 +6009,7 @@ if (pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_EXCEPTION) { - if (pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0 <= SVM_EXIT_EXCEPTION_31) + if (pSvmTransient->u64ExitCode - SVM_EXIT_XCPT_0 <= SVM_EXIT_XCPT_31) { - uint8_t uExitVector = (uint8_t)(pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0); + uint8_t uExitVector = (uint8_t)(pSvmTransient->u64ExitCode - SVM_EXIT_XCPT_0); #ifdef VBOX_STRICT @@ -6060,7 +6071,7 @@ fReflectingNmi = RT_BOOL(pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_NMI); - if (pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0 <= SVM_EXIT_EXCEPTION_31) + if (pSvmTransient->u64ExitCode - SVM_EXIT_XCPT_0 <= SVM_EXIT_XCPT_31) { - uint8_t uExitVector = (uint8_t)(pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0); + uint8_t uExitVector = (uint8_t)(pSvmTransient->u64ExitCode - SVM_EXIT_XCPT_0); if (uExitVector == X86_XCPT_PF) { @@ -7272,5 +7283,5 @@ /** - * \#VMEXIT handler for page-fault exceptions (SVM_EXIT_EXCEPTION_14). + * \#VMEXIT handler for page-fault exceptions (SVM_EXIT_XCPT_14). * Conditional \#VMEXIT. */ @@ -7393,5 +7404,5 @@ /** - * \#VMEXIT handler for undefined opcode (SVM_EXIT_EXCEPTION_6). + * \#VMEXIT handler for undefined opcode (SVM_EXIT_XCPT_6). * Conditional \#VMEXIT. */ @@ -7438,5 +7449,5 @@ /** - * \#VMEXIT handler for math-fault exceptions (SVM_EXIT_EXCEPTION_16). + * \#VMEXIT handler for math-fault exceptions (SVM_EXIT_XCPT_16). * Conditional \#VMEXIT. */ @@ -7475,5 +7486,5 @@ /** - * \#VMEXIT handler for debug exceptions (SVM_EXIT_EXCEPTION_1). Conditional + * \#VMEXIT handler for debug exceptions (SVM_EXIT_XCPT_1). Conditional * \#VMEXIT. */ @@ -7528,5 +7539,5 @@ /** - * \#VMEXIT handler for alignment check exceptions (SVM_EXIT_EXCEPTION_17). + * \#VMEXIT handler for alignment check exceptions (SVM_EXIT_XCPT_17). * Conditional \#VMEXIT. */ @@ -7551,5 +7562,5 @@ /** - * \#VMEXIT handler for breakpoint exceptions (SVM_EXIT_EXCEPTION_3). + * \#VMEXIT handler for breakpoint exceptions (SVM_EXIT_XCPT_3). * Conditional \#VMEXIT. */ @@ -7587,5 +7598,5 @@ PCSVMVMCB pVmcb = hmR0SvmGetCurrentVmcb(pVCpu, pCtx); - uint8_t const uVector = pVmcb->ctrl.u64ExitCode - SVM_EXIT_EXCEPTION_0; + uint8_t const uVector = pVmcb->ctrl.u64ExitCode - SVM_EXIT_XCPT_0; uint32_t const uErrCode = pVmcb->ctrl.u64ExitInfo1; Assert(pSvmTransient->u64ExitCode == pVmcb->ctrl.u64ExitCode); @@ -7623,5 +7634,5 @@ /** * \#VMEXIT handler for #PF occuring while in nested-guest execution - * (SVM_EXIT_EXCEPTION_14). Conditional \#VMEXIT. + * (SVM_EXIT_XCPT_14). Conditional \#VMEXIT. */ HMSVM_EXIT_DECL hmR0SvmExitXcptPFNested(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMTRANSIENT pSvmTransient) @@ -7826,5 +7837,5 @@ /** - * Nested-guest \#VMEXIT handler for debug exceptions (SVM_EXIT_EXCEPTION_1). + * Nested-guest \#VMEXIT handler for debug exceptions (SVM_EXIT_XCPT_1). * Unconditional \#VMEXIT. */ @@ -7849,5 +7860,5 @@ /** - * Nested-guest \#VMEXIT handler for breakpoint exceptions (SVM_EXIT_EXCEPTION_3). + * Nested-guest \#VMEXIT handler for breakpoint exceptions (SVM_EXIT_XCPT_3). * Conditional \#VMEXIT. */ Index: /trunk/src/VBox/VMM/VMMR3/HM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/HM.cpp (revision 71855) +++ /trunk/src/VBox/VMM/VMMR3/HM.cpp (revision 71856) @@ -220,36 +220,36 @@ EXIT_REASON(SVM_EXIT_WRITE_DR14 , 62, "Write DR14."), EXIT_REASON(SVM_EXIT_WRITE_DR15 , 63, "Write DR15."), - EXIT_REASON(SVM_EXIT_EXCEPTION_0 , 64, "Exception Vector 0 (#DE)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_1 , 65, "Exception Vector 1 (#DB)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_2 , 66, "Exception Vector 2 (#NMI)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_3 , 67, "Exception Vector 3 (#BP)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_4 , 68, "Exception Vector 4 (#OF)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_5 , 69, "Exception Vector 5 (#BR)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_6 , 70, "Exception Vector 6 (#UD)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_7 , 71, "Exception Vector 7 (#NM)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_8 , 72, "Exception Vector 8 (#DF)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_9 , 73, "Exception Vector 9 (#CO_SEG_OVERRUN)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_A , 74, "Exception Vector 10 (#TS)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_B , 75, "Exception Vector 11 (#NP)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_C , 76, "Exception Vector 12 (#SS)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_D , 77, "Exception Vector 13 (#GP)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_E , 78, "Exception Vector 14 (#PF)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_F , 79, "Exception Vector 15 (0x0f)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_10 , 80, "Exception Vector 16 (#MF)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_11 , 81, "Exception Vector 17 (#AC)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_12 , 82, "Exception Vector 18 (#MC)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_13 , 83, "Exception Vector 19 (#XF)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_14 , 84, "Exception Vector 20 (0x14)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_15 , 85, "Exception Vector 22 (0x15)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_16 , 86, "Exception Vector 22 (0x16)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_17 , 87, "Exception Vector 23 (0x17)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_18 , 88, "Exception Vector 24 (0x18)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_19 , 89, "Exception Vector 25 (0x19)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_1A , 90, "Exception Vector 26 (0x1A)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_1B , 91, "Exception Vector 27 (0x1B)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_1C , 92, "Exception Vector 28 (0x1C)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_1D , 93, "Exception Vector 29 (0x1D)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_1E , 94, "Exception Vector 30 (0x1E)."), - EXIT_REASON(SVM_EXIT_EXCEPTION_1F , 95, "Exception Vector 31 (0x1F)."), + EXIT_REASON(SVM_EXIT_XCPT_0 , 64, "Exception 0 (#DE)."), + EXIT_REASON(SVM_EXIT_XCPT_1 , 65, "Exception 1 (#DB)."), + EXIT_REASON(SVM_EXIT_XCPT_2 , 66, "Exception 2 (#NMI)."), + EXIT_REASON(SVM_EXIT_XCPT_3 , 67, "Exception 3 (#BP)."), + EXIT_REASON(SVM_EXIT_XCPT_4 , 68, "Exception 4 (#OF)."), + EXIT_REASON(SVM_EXIT_XCPT_5 , 69, "Exception 5 (#BR)."), + EXIT_REASON(SVM_EXIT_XCPT_6 , 70, "Exception 6 (#UD)."), + EXIT_REASON(SVM_EXIT_XCPT_7 , 71, "Exception 7 (#NM)."), + EXIT_REASON(SVM_EXIT_XCPT_8 , 72, "Exception 8 (#DF)."), + EXIT_REASON(SVM_EXIT_XCPT_9 , 73, "Exception 9 (#CO_SEG_OVERRUN)."), + EXIT_REASON(SVM_EXIT_XCPT_10 , 74, "Exception 10 (#TS)."), + EXIT_REASON(SVM_EXIT_XCPT_11 , 75, "Exception 11 (#NP)."), + EXIT_REASON(SVM_EXIT_XCPT_12 , 76, "Exception 12 (#SS)."), + EXIT_REASON(SVM_EXIT_XCPT_13 , 77, "Exception 13 (#GP)."), + EXIT_REASON(SVM_EXIT_XCPT_14 , 78, "Exception 14 (#PF)."), + EXIT_REASON(SVM_EXIT_XCPT_15 , 79, "Exception 15 (0x0f)."), + EXIT_REASON(SVM_EXIT_XCPT_16 , 80, "Exception 16 (#MF)."), + EXIT_REASON(SVM_EXIT_XCPT_17 , 81, "Exception 17 (#AC)."), + EXIT_REASON(SVM_EXIT_XCPT_18 , 82, "Exception 18 (#MC)."), + EXIT_REASON(SVM_EXIT_XCPT_19 , 83, "Exception 19 (#XF)."), + EXIT_REASON(SVM_EXIT_XCPT_20 , 84, "Exception 20 (#VE)."), + EXIT_REASON(SVM_EXIT_XCPT_21 , 85, "Exception 22 (0x15)."), + EXIT_REASON(SVM_EXIT_XCPT_22 , 86, "Exception 22 (0x16)."), + EXIT_REASON(SVM_EXIT_XCPT_23 , 87, "Exception 23 (0x17)."), + EXIT_REASON(SVM_EXIT_XCPT_24 , 88, "Exception 24 (0x18)."), + EXIT_REASON(SVM_EXIT_XCPT_25 , 89, "Exception 25 (0x19)."), + EXIT_REASON(SVM_EXIT_XCPT_26 , 90, "Exception 26 (0x1A)."), + EXIT_REASON(SVM_EXIT_XCPT_27 , 91, "Exception 27 (0x1B)."), + EXIT_REASON(SVM_EXIT_XCPT_28 , 92, "Exception 28 (0x1C)."), + EXIT_REASON(SVM_EXIT_XCPT_29 , 93, "Exception 29 (0x1D)."), + EXIT_REASON(SVM_EXIT_XCPT_30 , 94, "Exception 30 (#SX)."), + EXIT_REASON(SVM_EXIT_XCPT_31 , 95, "Exception 31 (0x1F)."), EXIT_REASON(SVM_EXIT_INTR , 96, "Physical maskable interrupt (host)."), EXIT_REASON(SVM_EXIT_NMI , 97, "Physical non-maskable interrupt (host)."),