Changeset 26525 in vbox for trunk/src/VBox/Runtime/common/alloc

Timestamp:

Feb 15, 2010 3:33:33 AM (15 years ago)

Author:

vboxsync

Message:

Runtime: win.amd64 warnings.

Location:

trunk/src/VBox/Runtime/common/alloc

Files:

• heapoffset.cpp (modified) (2 diffs)
• memcache.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/alloc/heapoffset.cpp

@@ -375 +375 @@
      */
     AssertReturn(cbMemory >= PAGE_SIZE, VERR_INVALID_PARAMETER);
+    AssertReturn(cbMemory < UINT32_MAX, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pvMemory, VERR_INVALID_POINTER);
     AssertReturn((uintptr_t)pvMemory + (cbMemory - 1) > (uintptr_t)cbMemory, VERR_INVALID_PARAMETER);
@@ -394 +395 @@
     /* Init the heap anchor block. */
     pHeapInt->u32Magic = RTHEAPOFFSET_MAGIC;
-    pHeapInt->cbHeap = cbMemory;
-    pHeapInt->cbFree = cbMemory
+    pHeapInt->cbHeap = (uint32_t)cbMemory;
+    pHeapInt->cbFree = (uint32_t)cbMemory
                      - sizeof(RTHEAPOFFSETBLOCK)
                      - sizeof(RTHEAPOFFSETINTERNAL);

trunk/src/VBox/Runtime/common/alloc/memcache.cpp

@@ -167 +167 @@
     if (cbAlignment == 0)
     {
-        cbAlignment = UINT32_C(1) << ASMBitLastSetU32((uint32_t)cbObject);
+        cbAlignment = (size_t)1 << ASMBitLastSetU32((uint32_t)cbObject);
         if (cbAlignment > 64)
             cbAlignment = 64;
@@ -191 +191 @@
 
     pThis->u32Magic         = RTMEMCACHE_MAGIC;
-    pThis->cbObject         = RT_ALIGN_Z(cbObject, cbAlignment);
-    pThis->cbAlignment      = cbAlignment;
-    pThis->cPerPage         = (PAGE_SIZE - RT_ALIGN_Z(sizeof(RTMEMCACHEPAGE), cbAlignment)) / pThis->cbObject;
+    pThis->cbObject         = (uint32_t)RT_ALIGN_Z(cbObject, cbAlignment);
+    pThis->cbAlignment      = (uint32_t)cbAlignment;
+    pThis->cPerPage         = (uint32_t)((PAGE_SIZE - RT_ALIGN_Z(sizeof(RTMEMCACHEPAGE), cbAlignment)) / pThis->cbObject);
     while (    RT_ALIGN_Z(sizeof(RTMEMCACHEPAGE), RT_MIN(cbAlignment, 8))
              + pThis->cPerPage * pThis->cbObject