Changeset 57647 in vbox for trunk

Timestamp:

Sep 7, 2015 4:39:39 PM (9 years ago)

Author:

vboxsync

Message:

fixed bug in ASMBitSetRange()

Location:

trunk

Files:

• include/iprt/asm.h (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTBitOperations.cpp (modified) (3 diffs)

trunk/include/iprt/asm.h

@@ -4363 +4363 @@
         int iEnd   = iBitEnd & ~31;
         if (iStart == iEnd)
-            *pu32 |= ((1 << (iBitEnd - iBitStart)) - 1) << iBitStart;
+            *pu32 |= ((1 << (iBitEnd - iBitStart)) - 1) << (iBitStart & 31);
         else
         {

trunk/src/VBox/Runtime/testcase/tstRTBitOperations.cpp

@@ -164 +164 @@
     CHECK_GUARD(p);
 
-    /* set */
+    /* bit set */
     MAP_CLEAR(p);
     ASMBitSet(&p->au32[0], 0);
@@ -187 +187 @@
     CHECK(!ASMAtomicBitTestAndSet(&p->au32[0], 80) && p->au32[2] == 0x00010001U);
 
-    /* clear */
+    /* bit clear */
     MAP_SET(p);
     ASMBitClear(&p->au32[0], 0);
@@ -209 +209 @@
     CHECK(!ASMAtomicBitTestAndClear(&p->au32[0], 16)  && p->au32[0] == ~0x40010001U);
     CHECK(ASMAtomicBitTestAndClear(&p->au32[0], 80)   && p->au32[2] == ~0x00010001U);
+
+    /* range set */
+    MAP_CLEAR(p);
+    ASMBitSetRange(&p->au32[0], 0, 5);
+    ASMBitSetRange(&p->au32[0], 6, 44);
+    ASMBitSetRange(&p->au32[0], 64, 65);
+    CHECK(p->au32[0] == 0xFFFFFFDFU);
+    CHECK(p->au32[1] == 0x00000FFFU);
+    CHECK(p->au32[2] == 0x00000001U);
 
     /* toggle */