Changeset 31489 in vbox for trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

Timestamp:

Aug 9, 2010 4:12:00 PM (14 years ago)

Author:

vboxsync

Message:

CPUMGetGuestCRx,CPUMGetGuestCR8: Do the PDM TPR querying in CPUM instead of EM so we don't need to duplicate code.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (3 diffs)

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

@@ -1155 +1155 @@
 
 
+VMMDECL(uint64_t) CPUMGetGuestCR8(PVMCPU pVCpu)
+{
+    uint64_t u64;
+    int rc = CPUMGetGuestCRx(pVCpu, USE_REG_CR8, &u64);
+    if (RT_FAILURE(rc))
+        u64 = 0;
+    return u64;
+}
+
+
 VMMDECL(void) CPUMGetGuestGDTR(PVMCPU pVCpu, PVBOXGDTR pGDTR)
 {
@@ -1227 +1237 @@
 
 
-///@todo: crx should be an array
 VMMDECL(int) CPUMGetGuestCRx(PVMCPU pVCpu, unsigned iReg, uint64_t *pValue)
 {
@@ -1235 +1244 @@
             *pValue = pVCpu->cpum.s.Guest.cr0;
             break;
+
         case USE_REG_CR2:
             *pValue = pVCpu->cpum.s.Guest.cr2;
             break;
+
         case USE_REG_CR3:
             *pValue = pVCpu->cpum.s.Guest.cr3;
             break;
+
         case USE_REG_CR4:
             *pValue = pVCpu->cpum.s.Guest.cr4;
             break;
+
+        case USE_REG_CR8:
+        {
+            uint8_t u8Tpr;
+            int rc = PDMApicGetTPR(pVCpu, &u8Tpr, NULL /*pfPending*/);
+            if (RT_FAILURE(rc))
+            {
+                AssertMsg(rc == VERR_PDM_NO_APIC_INSTANCE, ("%Rrc\n", rc));
+                *pValue = 0;
+                return rc;
+            }
+            *pValue = u8Tpr >> 4; /* bits 7-4 contain the task priority that go in cr8, bits 3-0*/
+            break;
+        }
+
         default:
             return VERR_INVALID_PARAMETER;