Changeset 46779 in vbox for trunk/src

Timestamp:

Jun 25, 2013 1:13:23 PM (12 years ago)

Author:

vboxsync

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

86710

Message:

VMM/HMSVMR0: AMD-V bits.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (8 diffs)

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

@@ -3311 +3311 @@
     {
         uint8_t uIdtVector  = pVmcb->ctrl.ExitIntInfo.n.u8Vector;
-        uint8_t uExitVector = UINT8_MAX;       /* Start off with an invalid vector, updated when it's valid. See below. */
 
         typedef enum
@@ -3326 +3325 @@
             if (pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0 <= SVM_EXIT_EXCEPTION_1F)
             {
-                uExitVector = (uint8_t)(pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0);
+                uint8_t uExitVector = (uint8_t)(pSvmTransient->u64ExitCode - SVM_EXIT_EXCEPTION_0);
                 if (   uExitVector == X86_XCPT_PF
                     && uIdtVector  == X86_XCPT_PF)
@@ -3337 +3336 @@
                          && (   hmR0SvmIsContributoryXcpt(uIdtVector)
                              || uIdtVector == X86_XCPT_PF))
-               {
-                   enmReflect = SVMREFLECTXCPT_DF;
-                   Log4(("IDT: Pending vectoring #DF %#RX64 uExitVector=%#x\n", pVCpu->hm.s.Event.u64IntrInfo, uExitVector));
+                {
+                    enmReflect = SVMREFLECTXCPT_DF;
+                    Log4(("IDT: Pending vectoring #DF %#RX64 uIdtVector=%#x uExitVector=%#x\n", pVCpu->hm.s.Event.u64IntrInfo,
+                          uIdtVector, uExitVector));
                 }
-               else if (uIdtVector == X86_XCPT_DF)
-                   enmReflect = SVMREFLECTXCPT_TF;
-               else
-                   enmReflect = SVMREFLECTXCPT_XCPT;
+                else if (uIdtVector == X86_XCPT_DF)
+                {
+                    enmReflect = SVMREFLECTXCPT_TF;
+                    Log4(("IDT: Pending vectoring triple-fault %#RX64 uIdtVector=%#x uExitVector=%#x\n", pVCpu->hm.s.Event.u64IntrInfo,
+                          uIdtVector, uExitVector));
+                }
+                else
+                    enmReflect = SVMREFLECTXCPT_XCPT;
             }
             else
@@ -3380 +3384 @@
                 hmR0SvmSetPendingXcptDF(pVCpu);
                 rc = VINF_HM_DOUBLE_FAULT;
-                Log4(("IDT: Pending vectoring #DF %#RX64 uIdtVector=%#x uExitVector=%#x\n", pVCpu->hm.s.Event.u64IntrInfo,
-                      uIdtVector, uExitVector));
                 break;
             }
@@ -3388 +3390 @@
             {
                 rc = VINF_EM_RESET;
-                Log4(("IDT: Pending vectoring triple-fault uIdt=%#x uExit=%#x\n", uIdtVector, uExitVector));
                 break;
             }
@@ -3844 +3845 @@
         if (rc == VINF_SUCCESS)
         {
-            if (IoExitInfo.n.u1Type == 0)   /* OUT */
+            if (IoExitInfo.n.u1Type == SVM_IOIO_WRITE)
             {
                 VBOXSTRICTRC rc2 = IOMInterpretOUTSEx(pVM, pVCpu, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->fPrefix,
@@ -3867 +3868 @@
         Assert(!IoExitInfo.n.u1REP);
 
-        if (IoExitInfo.n.u1Type == 0)   /* OUT */
+        if (IoExitInfo.n.u1Type == SVM_IOIO_WRITE)
         {
             VBOXSTRICTRC rc2 = IOMIOPortWrite(pVM, pVCpu, IoExitInfo.n.u16Port, pCtx->eax & uAndVal, uIOSize);
@@ -3950 +3951 @@
     }
 
-#ifdef DEBUG
+#ifdef VBOX_STRICT
     if (rc == VINF_IOM_R3_IOPORT_READ)
-        Assert(IoExitInfo.n.u1Type != 0);
+        Assert(IoExitInfo.n.u1Type == SVM_IOIO_READ);
     else if (rc == VINF_IOM_R3_IOPORT_WRITE)
-        Assert(IoExitInfo.n.u1Type == 0);
+        Assert(IoExitInfo.n.u1Type == SVM_IOIO_WRITE);
     else
     {