儲存庫 vbox 的更動 60523

時間撮記:

2016-4-15 下午02:58:58 (9 年 以前)

作者:

vboxsync

訊息:

VMM/APIC: profiling fix, logging.

檔案:

• trunk/src/VBox/VMM/VMMAll/APICAll.cpp (修改) (4 筆差異)

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

@@ -2342 +2342 @@
     STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF(StatMmioWrite));
 
-    LogRel(("APIC%u: APICWriteMmio: offReg=%#RX16 uValue=%#RX32\n", pVCpu->idCpu, offReg, uValue));
+    Log4(("APIC%u: APICWriteMmio: offReg=%#RX16 uValue=%#RX32\n", pVCpu->idCpu, offReg, uValue));
 
     int rc = VBOXSTRICTRC_VAL(apicWriteRegister(pApicDev, pVCpu, offReg, uValue));
@@ -2407 +2407 @@
         if (enmTriggerMode == XAPICTRIGGERMODE_EDGE)
         {
-            Assert(CTX_SUFF(pApicCpu->pvApicPib));
-            apicSetVectorInPib(CTX_SUFF(pApicCpu->pvApicPib), uVector);
-            bool const fAlreadySet = apicSetNotificationBitInPib(CTX_SUFF(pApicCpu->pvApicPib));
-            if (!fAlreadySet)
-            {
-                if (pApic->fPostedIntrsEnabled)
-                { /** @todo posted-interrupt call to hardware */ }
-                else
+            if (pApic->fPostedIntrsEnabled)
+            { /** @todo posted-interrupt call to hardware */ }
+            else
+            {
+                Assert(CTX_SUFF(pApicCpu->pvApicPib));
+                apicSetVectorInPib(CTX_SUFF(pApicCpu->pvApicPib), uVector);
+                bool const fAlreadySet = apicSetNotificationBitInPib(CTX_SUFF(pApicCpu->pvApicPib));
+                if (!fAlreadySet)
                     APICSetInterruptFF(pVCpu, PDMAPICIRQ_HARDWARE);
             }
@@ -2612 +2612 @@
             if (uFragment)
             {
-                apicOrVectorsToReg(&pXApicPage->irr,  i,  uFragment);
-                apicAndVectorsToReg(&pXApicPage->tmr, i, ~uFragment);
+                pXApicPage->irr.u[i].u32Reg |=  uFragment;
+                pXApicPage->tmr.u[i].u32Reg &= ~uFragment;
             }
         }
@@ -2631 +2631 @@
             if (uFragment)
             {
-                apicOrVectorsToReg(&pXApicPage->irr, i, uFragment);
-                apicOrVectorsToReg(&pXApicPage->tmr, i, uFragment);
+                pXApicPage->irr.u[i].u32Reg |= uFragment;
+                pXApicPage->tmr.u[i].u32Reg |= uFragment;
             }
         }