Prune CRLF.

[oota-llvm.git] / include / llvm / ADT / SmallBitVector.h

diff --git a/include/llvm/ADT/SmallBitVector.h b/include/llvm/ADT/SmallBitVector.h
index 7a645e0c72413f9a6e236da72679a11c01931cab..ababf0f3cbe3e58626ab061835cc54c63894d077 100644 (file)
--- a/include/llvm/ADT/SmallBitVector.h
+++ b/include/llvm/ADT/SmallBitVector.h
@@ -54,6 +54,7 @@ class SmallBitVector {
   };
 
 public:
   };
 
 public:

+  typedef unsigned size_type;

   // Encapsulation of a single bit.
   class reference {
     SmallBitVector &TheVector;
   // Encapsulation of a single bit.
   class reference {
     SmallBitVector &TheVector;


@@ -153,11 +154,9 @@ public:
       switchToLarge(new BitVector(*RHS.getPointer()));
   }
 
       switchToLarge(new BitVector(*RHS.getPointer()));
   }
 

-#if LLVM_USE_RVALUE_REFERENCES

   SmallBitVector(SmallBitVector &&RHS) : X(RHS.X) {
     RHS.X = 1;
   }
   SmallBitVector(SmallBitVector &&RHS) : X(RHS.X) {
     RHS.X = 1;
   }

-#endif

 
   ~SmallBitVector() {
     if (!isSmall())
 
   ~SmallBitVector() {
     if (!isSmall())


@@ -175,12 +174,12 @@ public:
   }
 
   /// count - Returns the number of bits which are set.
   }
 
   /// count - Returns the number of bits which are set.

-  unsigned count() const {
+  size_type count() const {

     if (isSmall()) {
       uintptr_t Bits = getSmallBits();
     if (isSmall()) {
       uintptr_t Bits = getSmallBits();

-      if (sizeof(uintptr_t) * CHAR_BIT == 32)
+      if (NumBaseBits == 32)

         return CountPopulation_32(Bits);
         return CountPopulation_32(Bits);

-      if (sizeof(uintptr_t) * CHAR_BIT == 64)
+      if (NumBaseBits == 64)

         return CountPopulation_64(Bits);
       llvm_unreachable("Unsupported!");
     }
         return CountPopulation_64(Bits);
       llvm_unreachable("Unsupported!");
     }


@@ -215,10 +214,10 @@ public:
       uintptr_t Bits = getSmallBits();
       if (Bits == 0)
         return -1;
       uintptr_t Bits = getSmallBits();
       if (Bits == 0)
         return -1;

-      if (sizeof(uintptr_t) * CHAR_BIT == 32)
-        return CountTrailingZeros_32(Bits);
-      if (sizeof(uintptr_t) * CHAR_BIT == 64)
-        return CountTrailingZeros_64(Bits);
+      if (NumBaseBits == 32)
+        return countTrailingZeros(Bits);
+      if (NumBaseBits == 64)
+        return countTrailingZeros(Bits);

       llvm_unreachable("Unsupported!");
     }
     return getPointer()->find_first();
       llvm_unreachable("Unsupported!");
     }
     return getPointer()->find_first();


@@ -233,10 +232,10 @@ public:
       Bits &= ~uintptr_t(0) << (Prev + 1);
       if (Bits == 0 || Prev + 1 >= getSmallSize())
         return -1;
       Bits &= ~uintptr_t(0) << (Prev + 1);
       if (Bits == 0 || Prev + 1 >= getSmallSize())
         return -1;

-      if (sizeof(uintptr_t) * CHAR_BIT == 32)
-        return CountTrailingZeros_32(Bits);
-      if (sizeof(uintptr_t) * CHAR_BIT == 64)
-        return CountTrailingZeros_64(Bits);
+      if (NumBaseBits == 32)
+        return countTrailingZeros(Bits);
+      if (NumBaseBits == 64)
+        return countTrailingZeros(Bits);

       llvm_unreachable("Unsupported!");
     }
     return getPointer()->find_next(Prev);
       llvm_unreachable("Unsupported!");
     }
     return getPointer()->find_next(Prev);


@@ -300,6 +299,21 @@ public:
     return *this;
   }
 
     return *this;
   }
 

+  /// set - Efficiently set a range of bits in [I, E)
+  SmallBitVector &set(unsigned I, unsigned E) {
+    assert(I <= E && "Attempted to set backwards range!");
+    assert(E <= size() && "Attempted to set out-of-bounds range!");
+    if (I == E) return *this;
+    if (isSmall()) {
+      uintptr_t EMask = ((uintptr_t)1) << E;
+      uintptr_t IMask = ((uintptr_t)1) << I;
+      uintptr_t Mask = EMask - IMask;
+      setSmallBits(getSmallBits() | Mask);
+    } else
+      getPointer()->set(I, E);
+    return *this;
+  }
+

   SmallBitVector &reset() {
     if (isSmall())
       setSmallBits(0);
   SmallBitVector &reset() {
     if (isSmall())
       setSmallBits(0);


@@ -316,6 +330,21 @@ public:
     return *this;
   }
 
     return *this;
   }
 

+  /// reset - Efficiently reset a range of bits in [I, E)
+  SmallBitVector &reset(unsigned I, unsigned E) {
+    assert(I <= E && "Attempted to reset backwards range!");
+    assert(E <= size() && "Attempted to reset out-of-bounds range!");
+    if (I == E) return *this;
+    if (isSmall()) {
+      uintptr_t EMask = ((uintptr_t)1) << E;
+      uintptr_t IMask = ((uintptr_t)1) << I;
+      uintptr_t Mask = EMask - IMask;
+      setSmallBits(getSmallBits() & ~Mask);
+    } else
+      getPointer()->reset(I, E);
+    return *this;
+  }
+

   SmallBitVector &flip() {
     if (isSmall())
       setSmallBits(~getSmallBits());
   SmallBitVector &flip() {
     if (isSmall())
       setSmallBits(~getSmallBits());


@@ -396,6 +425,40 @@ public:
     return *this;
   }
 
     return *this;
   }
 

+  /// reset - Reset bits that are set in RHS. Same as *this &= ~RHS.
+  SmallBitVector &reset(const SmallBitVector &RHS) {
+    if (isSmall() && RHS.isSmall())
+      setSmallBits(getSmallBits() & ~RHS.getSmallBits());
+    else if (!isSmall() && !RHS.isSmall())
+      getPointer()->reset(*RHS.getPointer());
+    else
+      for (unsigned i = 0, e = std::min(size(), RHS.size()); i != e; ++i)
+        if (RHS.test(i))
+          reset(i);
+
+    return *this;
+  }
+
+  /// test - Check if (This - RHS) is zero.
+  /// This is the same as reset(RHS) and any().
+  bool test(const SmallBitVector &RHS) const {
+    if (isSmall() && RHS.isSmall())
+      return (getSmallBits() & ~RHS.getSmallBits()) != 0;
+    if (!isSmall() && !RHS.isSmall())
+      return getPointer()->test(*RHS.getPointer());
+
+    unsigned i, e;
+    for (i = 0, e = std::min(size(), RHS.size()); i != e; ++i)
+      if (test(i) && !RHS.test(i))
+        return true;
+
+    for (e = size(); i != e; ++i)
+      if (test(i))
+        return true;
+
+    return false;
+  }
+

   SmallBitVector &operator|=(const SmallBitVector &RHS) {
     resize(std::max(size(), RHS.size()));
     if (isSmall())
   SmallBitVector &operator|=(const SmallBitVector &RHS) {
     resize(std::max(size(), RHS.size()));
     if (isSmall())


@@ -442,7 +505,6 @@ public:
     return *this;
   }
 
     return *this;
   }
 

-#if LLVM_USE_RVALUE_REFERENCES

   const SmallBitVector &operator=(SmallBitVector &&RHS) {
     if (this != &RHS) {
       clear();
   const SmallBitVector &operator=(SmallBitVector &&RHS) {
     if (this != &RHS) {
       clear();


@@ -450,7 +512,6 @@ public:
     }
     return *this;
   }
     }
     return *this;
   }

-#endif

 
   void swap(SmallBitVector &RHS) {
     std::swap(X, RHS.X);
 
   void swap(SmallBitVector &RHS) {
     std::swap(X, RHS.X);