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

Timestamp:

Dec 19, 2013 10:59:28 AM (11 years ago)

Author:

vboxsync

Message:

CPUMAllMsrs.cpp: Fixed cpumLookupMsrRange to resolved aliases. Also reimplemented it as a binary search.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp (modified) (2 diffs)

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

@@ -4730 +4730 @@
 PCPUMMSRRANGE cpumLookupMsrRange(PVM pVM, uint32_t idMsr)
 {
-# if 0
     /*
      * Binary lookup.
      */
-
-# else
+    uint32_t        cRanges   = pVM->cpum.s.GuestInfo.cMsrRanges;
+    if (!cRanges)
+        return NULL;
+    PCPUMMSRRANGE   paRanges  = pVM->cpum.s.GuestInfo.CTX_SUFF(paMsrRanges);
+    for (;;)
+    {
+        uint32_t i = cRanges / 2;
+        if (idMsr < paRanges[i].uFirst)
+        {
+            if (i == 0)
+                break;
+            cRanges = i;
+        }
+        else if (idMsr > paRanges[i].uLast)
+        {
+            i++;
+            if (i >= cRanges)
+                break;
+            cRanges -= i;
+            paRanges = &paRanges[i];
+        }
+        else
+        {
+            if (paRanges[i].enmRdFn == kCpumMsrRdFn_MsrAlias)
+                return cpumLookupMsrRange(pVM, paRanges[i].uValue);
+            return &paRanges[i];
+        }
+    }
+
+# ifdef VBOX_STRICT
     /*
-     * Linear lookup.
+     * Linear lookup to verify the above binary search.
      */
     uint32_t        cLeft = pVM->cpum.s.GuestInfo.cMsrRanges;
@@ -4744 +4771 @@
     {
         if (idMsr >= pCur->uFirst && idMsr <= pCur->uLast)
+        {
+            AssertFailed();
+            if (pCur->enmRdFn == kCpumMsrRdFn_MsrAlias)
+                return cpumLookupMsrRange(pVM, pCur->uValue);
             return pCur;
+        }
         pCur++;
     }