Changeset 54760 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 13, 2015 8:53:02 PM (10 years ago)

Author:

vboxsync

Message:

CPUMGetGuestCpuId: Fixed APIC ID assertions to read the pLeaf values instead of the return values, as the caller may be passing the same pointer for several of them (i.e. ignoring some values).

File:

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

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

@@ -1270 +1270 @@
                                 uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx)
 {
-    bool           fExactSubLeafHit;
-    PVM            pVM   = pVCpu->CTX_SUFF(pVM);
-    PCPUMCPUIDLEAF pLeaf = cpumCpuIdGetLeafEx(pVM, uLeaf, uSubLeaf, &fExactSubLeafHit);
+    bool            fExactSubLeafHit;
+    PVM             pVM   = pVCpu->CTX_SUFF(pVM);
+    PCCPUMCPUIDLEAF pLeaf = cpumCpuIdGetLeafEx(pVM, uLeaf, uSubLeaf, &fExactSubLeafHit);
     if (pLeaf)
     {
+        AssertMsg(pLeaf->uLeaf == uLeaf, ("%#x\n", pLeaf->uLeaf, uLeaf));
         if (fExactSubLeafHit)
         {
@@ -1291 +1292 @@
                     /* Bits 31-24: Initial APIC ID */
                     Assert(pVCpu->idCpu <= 255);
-                    Assert((*pEbx >> 24) == 0); /* raw-mode assumption */
-                    *pEbx = (*pEbx & UINT32_C(0x00ffffff)) | (pVCpu->idCpu << 24);
+                    AssertMsg((pLeaf->uEbx >> 24) == 0, ("%#x\n", pLeaf->uEbx)); /* raw-mode assumption */
+                    *pEbx = (pLeaf->uEbx & UINT32_C(0x00ffffff)) | (pVCpu->idCpu << 24);
                 }
                 else if (uLeaf == 0xb)
                 {
                     /* EDX: Initial extended APIC ID. */
-                    Assert(*pEdx == 0); /* raw-mode assumption */
+                    AssertMsg(pLeaf->uEdx == 0, ("%#x\n", pLeaf->uEdx)); /* raw-mode assumption */
                     *pEdx = pVCpu->idCpu;
                 }
@@ -1303 +1304 @@
                 {
                     /* EAX: Initial extended APIC ID. */
-                    Assert(*pEax == 0); /* raw-mode assumption */
+                    AssertMsg(pLeaf->uEax == 0, ("%#x\n", pLeaf->uEax)); /* raw-mode assumption */
                     *pEax = pVCpu->idCpu;
                 }