Changeset 58791 in vbox

Timestamp:

Nov 20, 2015 3:39:54 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104241

Message:

iprt/asm.h: 16-bit fixes to ASMBitSetRange and ASMBitClearRange.

File:

• trunk/include/iprt/asm.h (modified) (6 diffs)

trunk/include/iprt/asm.h

@@ -4411 +4411 @@
     {
         volatile uint32_t *pu32 = (volatile uint32_t *)pvBitmap + (iBitStart >> 5);
-        int iStart = iBitStart & ~31;
-        int iEnd   = iBitEnd & ~31;
+        int32_t iStart = iBitStart & ~31;
+        int32_t iEnd   = iBitEnd & ~31;
         if (iStart == iEnd)
-            *pu32 &= ((1U << (iBitStart & 31)) - 1) | ~((1U << (iBitEnd & 31)) - 1);
+            *pu32 &= ((UINT32_C(1) << (iBitStart & 31)) - 1) | ~((UINT32_C(1) << (iBitEnd & 31)) - 1);
         else
         {
@@ -4420 +4420 @@
             if (iBitStart & 31)
             {
-                *pu32 &= (1U << (iBitStart & 31)) - 1;
+                *pu32 &= (UINT32_C(1) << (iBitStart & 31)) - 1;
                 pu32++;
                 iBitStart = iStart + 32;
@@ -4433 +4433 @@
             {
                 pu32 = (volatile uint32_t *)pvBitmap + (iBitEnd >> 5);
-                *pu32 &= ~((1U << (iBitEnd & 31)) - 1);
+                *pu32 &= ~((UINT32_C(1) << (iBitEnd & 31)) - 1);
             }
         }
@@ -4452 +4452 @@
     {
         volatile uint32_t *pu32 = (volatile uint32_t *)pvBitmap + (iBitStart >> 5);
-        int iStart = iBitStart & ~31;
-        int iEnd   = iBitEnd & ~31;
+        int32_t iStart = iBitStart & ~31;
+        int32_t iEnd   = iBitEnd & ~31;
         if (iStart == iEnd)
-            *pu32 |= ((1U << (iBitEnd - iBitStart)) - 1) << (iBitStart & 31);
+            *pu32 |= ((UINT32_C(1) << (iBitEnd - iBitStart)) - 1) << (iBitStart & 31);
         else
         {
@@ -4461 +4461 @@
             if (iBitStart & 31)
             {
-                *pu32 |= ~((1U << (iBitStart & 31)) - 1);
+                *pu32 |= ~((UINT32_C(1) << (iBitStart & 31)) - 1);
                 pu32++;
                 iBitStart = iStart + 32;
@@ -4474 +4474 @@
             {
                 pu32 = (volatile uint32_t *)pvBitmap + (iBitEnd >> 5);
-                *pu32 |= (1U << (iBitEnd & 31)) - 1;
+                *pu32 |= (UINT32_C(1) << (iBitEnd & 31)) - 1;
             }
         }