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

Timestamp:

Jul 19, 2013 6:58:17 PM (12 years ago)

Author:

vboxsync

Message:

IEM: TPR access.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (1 diff)
• IEMAllCImpl.cpp.h (modified) (2 diffs)
• PDMAll.cpp (modified) (3 diffs)

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

@@ -83 +83 @@
 #include <VBox/vmm/iem.h>
 #include <VBox/vmm/cpum.h>
+#include <VBox/vmm/pdm.h>
 #include <VBox/vmm/pgm.h>
 #include <internal/pgm.h>

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

@@ -3157 +3157 @@
         case 4: crX = pCtx->cr4; break;
         case 8:
-            if (!IEM_FULL_VERIFICATION_ENABLED(pIemCpu))
-                IEM_RETURN_ASPECT_NOT_IMPLEMENTED_LOG(("Implement CR8/TPR read\n")); /** @todo implement CR8 reading and writing. */
+        {
+            uint8_t uTpr;
+            int rc = PDMApicGetTPR(IEMCPU_TO_VMCPU(pIemCpu), &uTpr, NULL, NULL);
+            if (RT_SUCCESS(rc))
+                crX = uTpr >> 4;
             else
-                crX = 0xff;
+                crX = 0;
             break;
+        }
         IEM_NOT_REACHED_DEFAULT_CASE_RET(); /* call checks */
     }
@@ -3448 +3452 @@
          */
         case 8:
+            if (uNewCrX & ~(uint64_t)0xf)
+            {
+                Log(("Trying to set reserved CR8 bits (%#RX64)\n", uNewCrX));
+                return iemRaiseGeneralProtectionFault0(pIemCpu);
+            }
+
             if (!IEM_FULL_VERIFICATION_ENABLED(pIemCpu))
-                IEM_RETURN_ASPECT_NOT_IMPLEMENTED_LOG(("Implement CR8/TPR read\n")); /** @todo implement CR8 reading and writing. */
-            else
-                rcStrict = VINF_SUCCESS;
+                PDMApicSetTPR(IEMCPU_TO_VMCPU(pIemCpu), (uint8_t)uNewCrX << 4);
+            rcStrict = VINF_SUCCESS;
             break;
 

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

@@ -313 +313 @@
  * Get the TPR (task priority register).
  *
- * @returns The current TPR.
+ * @returns VINF_SUCCESS or VERR_PDM_NO_APIC_INSTANCE.
  * @param   pVCpu           Pointer to the VMCPU.
  * @param   pu8TPR          Where to store the TRP.
- * @param   pfPending       Pending interrupt state (out).
+ * @param   pfPending       Pending interrupt state (out, optional).
  * @param   pu8PendingIrq   Where to store the highest-priority pending IRQ
- *                          (optional, can be NULL) (out).
+ *                          (out, optional).
  *
  * @remarks No-long-jump zone!!!
@@ -324 +324 @@
 VMMDECL(int) PDMApicGetTPR(PVMCPU pVCpu, uint8_t *pu8TPR, bool *pfPending, uint8_t *pu8PendingIrq)
 {
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
+    PVM     pVM      = pVCpu->CTX_SUFF(pVM);
+    PPDMDEVINS pApicIns = pVM->pdm.s.Apic.CTX_SUFF(pDevIns);
+    if (pApicIns)
     {
         /*
@@ -333 +334 @@
          */
         Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnGetTPR));
-        *pu8TPR = pVM->pdm.s.Apic.CTX_SUFF(pfnGetTPR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu->idCpu);
+        *pu8TPR = pVM->pdm.s.Apic.CTX_SUFF(pfnGetTPR)(pApicIns, pVCpu->idCpu);
         if (pfPending)
-        {
-            *pfPending = pVM->pdm.s.Apic.CTX_SUFF(pfnHasPendingIrq)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu->idCpu,
-                                                                    pu8PendingIrq);
-        }
+            *pfPending = pVM->pdm.s.Apic.CTX_SUFF(pfnHasPendingIrq)(pApicIns, pVCpu->idCpu, pu8PendingIrq);
         return VINF_SUCCESS;
     }