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

Timestamp:

Mar 17, 2015 5:50:15 PM (10 years ago)

Author:

vboxsync

Message:

build fix

File:

• trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -4372 +4372 @@
                         "         %s\n"
                         "     Leaf/sub-leaf  eax      ebx      ecx      edx\n", pszTitle);
-        while (   pCurLeaf - paLeaves < cLeaves
+        while (   (uintptr_t)(pCurLeaf - paLeaves) < cLeaves
                && pCurLeaf->uLeaf <= uUpToLeaf)
         {
@@ -4439 +4439 @@
         {
             ASMCpuIdExSlow(uLeaf, 0, uSubLeaf, 0, &Host.uEax, &Host.uEbx, &Host.uEcx, &Host.uEdx);
-            if (   pCurLeaf - paLeaves < cLeaves
+            if (   (uintptr_t)(pCurLeaf - paLeaves) < cLeaves
                 && pCurLeaf->uLeaf    == uLeaf
                 && pCurLeaf->uSubLeaf == uSubLeaf)
@@ -4458 +4458 @@
 
             /* Done? */
-            if (   (   pCurLeaf - paLeaves >= cLeaves
+            if (   (   (uintptr_t)(pCurLeaf - paLeaves) >= cLeaves
                     || pCurLeaf->uLeaf != uLeaf)
                 && (   (uLeaf == 0x4 && ((Host.uEax & 0x000f) == 0 || (Host.uEax & 0x000f) >= 8))
@@ -4687 +4687 @@
     ASMCpuIdExSlow(UINT32_C(0x40000000), 0, 0, 0, &Host.uEax, &Host.uEbx, &Host.uEcx, &Host.uEdx);
     cHstMax  = Host.uEax >= UINT32_C(0x40000001) && Host.uEax <= UINT32_C(0x40000fff) ? Host.uEax : 0;
-    cGstMax  = pCurLeaf - paLeaves < cLeaves && pCurLeaf->uLeaf == UINT32_C(0x40000000)
+    cGstMax  = (uintptr_t)(pCurLeaf - paLeaves) < cLeaves && pCurLeaf->uLeaf == UINT32_C(0x40000000)
              ? RT_MIN(pCurLeaf->uEax, UINT32_C(0x40000fff)) : 0;
     cMax     = RT_MAX(cHstMax, cGstMax);
@@ -4708 +4708 @@
     ASMCpuIdExSlow(UINT32_C(0x80000000), 0, 0, 0, &Host.uEax, &Host.uEbx, &Host.uEcx, &Host.uEdx);
     cHstMax  = ASMIsValidExtRange(Host.uEax) ? RT_MIN(Host.uEax, UINT32_C(0x80000fff)) : 0;
-    cGstMax  = pCurLeaf - paLeaves < cLeaves && pCurLeaf->uLeaf == UINT32_C(0x80000000)
+    cGstMax  = (uintptr_t)(pCurLeaf - paLeaves) < cLeaves && pCurLeaf->uLeaf == UINT32_C(0x80000000)
              ? RT_MIN(pCurLeaf->uEax, UINT32_C(0x80000fff)) : 0;
     cMax     = RT_MAX(cHstMax, cGstMax);
@@ -4727 +4727 @@
             {
                 ASMCpuIdExSlow(uLeaf, 0, uSubLeaf, 0, &Host.uEax, &Host.uEbx, &Host.uEcx, &Host.uEdx);
-                if (   pCurLeaf - paLeaves < cLeaves
+                if (   (uintptr_t)(pCurLeaf - paLeaves) < cLeaves
                     && pCurLeaf->uLeaf    == uLeaf
                     && pCurLeaf->uSubLeaf == uSubLeaf)
@@ -4746 +4746 @@
 
                 /* Done? */
-                if (   (   pCurLeaf - paLeaves >= cLeaves
+                if (   (   (uintptr_t)(pCurLeaf - paLeaves) >= cLeaves
                         || pCurLeaf->uLeaf != uLeaf)
                     && (uLeaf == UINT32_C(0x8000001d) && ((Host.uEax & 0x000f) == 0 || (Host.uEax & 0x000f) >= 8)) )
@@ -5047 +5047 @@
     cHstMax  = Host.uEax >= UINT32_C(0xc0000001) && Host.uEax <= UINT32_C(0xc0000fff)
              ? RT_MIN(Host.uEax,      UINT32_C(0xc0000fff)) : 0;
-    cGstMax  = pCurLeaf - paLeaves < cLeaves && pCurLeaf->uLeaf == UINT32_C(0xc0000000)
+    cGstMax  = (uintptr_t)(pCurLeaf - paLeaves) < cLeaves && pCurLeaf->uLeaf == UINT32_C(0xc0000000)
              ? RT_MIN(pCurLeaf->uEax, UINT32_C(0xc0000fff)) : 0;
     cMax     = RT_MAX(cHstMax, cGstMax);