X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fsbitmap.c;h=d8b8d6c1ff50c642b302af35c3ce83362e16639d;hb=821d9214750b80d69f755583f9dc9b31603851b3;hp=89d6600927d181b44d5ef509cab0655a3e1d7dfb;hpb=cb7e28c369135e0ed896d8a5fd5efb40387e79c8;p=pf3gnuchains%2Fgcc-fork.git
diff --git a/gcc/sbitmap.c b/gcc/sbitmap.c
index 89d6600927d..d8b8d6c1ff5 100644
--- a/gcc/sbitmap.c
+++ b/gcc/sbitmap.c
@@ -1,58 +1,202 @@
/* Simple bitmaps.
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2003, 2004, 2006, 2007
+ Free Software Foundation, Inc.
-This file is part of GNU CC.
+This file is part of GCC.
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with GCC; see the file COPYING3. If not see
+. */
#include "config.h"
#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
#include "rtl.h"
#include "flags.h"
+#include "hard-reg-set.h"
+#include "obstack.h"
#include "basic-block.h"
+#if GCC_VERSION >= 3400
+#if HOST_BITS_PER_WIDEST_FAST_INT == HOST_BITS_PER_LONG
+#define do_popcount(x) __builtin_popcountl(x)
+#elif HOST_BITS_PER_WIDEST_FAST_INT == HOST_BITS_PER_LONGLONG
+#define do_popcount(x) __builtin_popcountll(x)
+#else
+#error "internal error: sbitmap.h and hwint.h are inconsistent"
+#endif
+#else
+static unsigned long sbitmap_elt_popcount (SBITMAP_ELT_TYPE);
+#define do_popcount(x) sbitmap_elt_popcount((x))
+#endif
+
+/* This macro controls debugging that is as expensive as the
+ operations it verifies. */
+
+/* #define BITMAP_DEBUGGING */
+#ifdef BITMAP_DEBUGGING
+
+/* Verify the population count of sbitmap A matches the cached value,
+ if there is a cached value. */
+
+void
+sbitmap_verify_popcount (const_sbitmap a)
+{
+ unsigned ix;
+ unsigned int lastword;
+
+ if (!a->popcount)
+ return;
+
+ lastword = a->size;
+ for (ix = 0; ix < lastword; ix++)
+ gcc_assert (a->popcount[ix] == do_popcount (a->elms[ix]));
+}
+#endif
+
/* Bitmap manipulation routines. */
/* Allocate a simple bitmap of N_ELMS bits. */
sbitmap
-sbitmap_alloc (n_elms)
- int n_elms;
+sbitmap_alloc (unsigned int n_elms)
+{
+ unsigned int bytes, size, amt;
+ sbitmap bmap;
+
+ size = SBITMAP_SET_SIZE (n_elms);
+ bytes = size * sizeof (SBITMAP_ELT_TYPE);
+ amt = (sizeof (struct simple_bitmap_def)
+ + bytes - sizeof (SBITMAP_ELT_TYPE));
+ bmap = xmalloc (amt);
+ bmap->n_bits = n_elms;
+ bmap->size = size;
+ bmap->popcount = NULL;
+ return bmap;
+}
+
+/* Allocate a simple bitmap of N_ELMS bits, and a popcount array. */
+
+sbitmap
+sbitmap_alloc_with_popcount (unsigned int n_elms)
+{
+ sbitmap const bmap = sbitmap_alloc (n_elms);
+ bmap->popcount = xmalloc (bmap->size * sizeof (unsigned char));
+ return bmap;
+}
+
+/* Resize a simple bitmap BMAP to N_ELMS bits. If increasing the
+ size of BMAP, clear the new bits to zero if the DEF argument
+ is zero, and set them to one otherwise. */
+
+sbitmap
+sbitmap_resize (sbitmap bmap, unsigned int n_elms, int def)
{
- int bytes, size, amt;
+ unsigned int bytes, size, amt;
+ unsigned int last_bit;
+
+ size = SBITMAP_SET_SIZE (n_elms);
+ bytes = size * sizeof (SBITMAP_ELT_TYPE);
+ if (bytes > SBITMAP_SIZE_BYTES (bmap))
+ {
+ amt = (sizeof (struct simple_bitmap_def)
+ + bytes - sizeof (SBITMAP_ELT_TYPE));
+ bmap = xrealloc (bmap, amt);
+ if (bmap->popcount)
+ bmap->popcount = xrealloc (bmap->popcount,
+ size * sizeof (unsigned char));
+ }
+
+ if (n_elms > bmap->n_bits)
+ {
+ if (def)
+ {
+ memset (bmap->elms + bmap->size, -1,
+ bytes - SBITMAP_SIZE_BYTES (bmap));
+
+ /* Set the new bits if the original last element. */
+ last_bit = bmap->n_bits % SBITMAP_ELT_BITS;
+ if (last_bit)
+ bmap->elms[bmap->size - 1]
+ |= ~((SBITMAP_ELT_TYPE)-1 >> (SBITMAP_ELT_BITS - last_bit));
+
+ /* Clear the unused bit in the new last element. */
+ last_bit = n_elms % SBITMAP_ELT_BITS;
+ if (last_bit)
+ bmap->elms[size - 1]
+ &= (SBITMAP_ELT_TYPE)-1 >> (SBITMAP_ELT_BITS - last_bit);
+ }
+ else
+ {
+ memset (bmap->elms + bmap->size, 0,
+ bytes - SBITMAP_SIZE_BYTES (bmap));
+ if (bmap->popcount)
+ memset (bmap->popcount + bmap->size, 0,
+ (size * sizeof (unsigned char))
+ - (bmap->size * sizeof (unsigned char)));
+
+ }
+ }
+ else if (n_elms < bmap->n_bits)
+ {
+ /* Clear the surplus bits in the last word. */
+ last_bit = n_elms % SBITMAP_ELT_BITS;
+ if (last_bit)
+ {
+ bmap->elms[size - 1]
+ &= (SBITMAP_ELT_TYPE)-1 >> (SBITMAP_ELT_BITS - last_bit);
+ if (bmap->popcount)
+ bmap->popcount[size - 1] = do_popcount (bmap->elms[size - 1]);
+ }
+ }
+
+ bmap->n_bits = n_elms;
+ bmap->size = size;
+ return bmap;
+}
+
+/* Re-allocate a simple bitmap of N_ELMS bits. New storage is uninitialized. */
+
+sbitmap
+sbitmap_realloc (sbitmap src, unsigned int n_elms)
+{
+ unsigned int bytes, size, amt;
sbitmap bmap;
size = SBITMAP_SET_SIZE (n_elms);
bytes = size * sizeof (SBITMAP_ELT_TYPE);
amt = (sizeof (struct simple_bitmap_def)
+ bytes - sizeof (SBITMAP_ELT_TYPE));
- bmap = (sbitmap) xmalloc (amt);
+
+ if (SBITMAP_SIZE_BYTES (src) >= bytes)
+ {
+ src->n_bits = n_elms;
+ return src;
+ }
+
+ bmap = (sbitmap) xrealloc (src, amt);
bmap->n_bits = n_elms;
bmap->size = size;
- bmap->bytes = bytes;
return bmap;
}
/* Allocate a vector of N_VECS bitmaps of N_ELMS bits. */
sbitmap *
-sbitmap_vector_alloc (n_vecs, n_elms)
- int n_vecs, n_elms;
+sbitmap_vector_alloc (unsigned int n_vecs, unsigned int n_elms)
{
- int i, bytes, offset, elm_bytes, size, amt, vector_bytes;
+ unsigned int i, bytes, offset, elm_bytes, size, amt, vector_bytes;
sbitmap *bitmap_vector;
size = SBITMAP_SET_SIZE (n_elms);
@@ -74,17 +218,16 @@ sbitmap_vector_alloc (n_vecs, n_elms)
}
amt = vector_bytes + (n_vecs * elm_bytes);
- bitmap_vector = (sbitmap *) xmalloc (amt);
+ bitmap_vector = xmalloc (amt);
- for (i = 0, offset = vector_bytes;
- i < n_vecs;
- i++, offset += elm_bytes)
+ for (i = 0, offset = vector_bytes; i < n_vecs; i++, offset += elm_bytes)
{
sbitmap b = (sbitmap) ((char *) bitmap_vector + offset);
+
bitmap_vector[i] = b;
b->n_bits = n_elms;
b->size = size;
- b->bytes = bytes;
+ b->popcount = NULL;
}
return bitmap_vector;
@@ -93,52 +236,92 @@ sbitmap_vector_alloc (n_vecs, n_elms)
/* Copy sbitmap SRC to DST. */
void
-sbitmap_copy (dst, src)
- sbitmap dst, src;
+sbitmap_copy (sbitmap dst, const_sbitmap src)
{
- bcopy ((PTR) src->elms, (PTR) dst->elms,
- sizeof (SBITMAP_ELT_TYPE) * dst->size);
+ memcpy (dst->elms, src->elms, sizeof (SBITMAP_ELT_TYPE) * dst->size);
+ if (dst->popcount)
+ memcpy (dst->popcount, src->popcount, sizeof (unsigned char) * dst->size);
+}
+
+/* Copy the first N elements of sbitmap SRC to DST. */
+
+void
+sbitmap_copy_n (sbitmap dst, const_sbitmap src, unsigned int n)
+{
+ memcpy (dst->elms, src->elms, sizeof (SBITMAP_ELT_TYPE) * n);
+ if (dst->popcount)
+ memcpy (dst->popcount, src->popcount, sizeof (unsigned char) * n);
+}
+
+/* Determine if a == b. */
+int
+sbitmap_equal (const_sbitmap a, const_sbitmap b)
+{
+ return !memcmp (a->elms, b->elms, sizeof (SBITMAP_ELT_TYPE) * a->size);
+}
+
+/* Return true if the bitmap is empty. */
+
+bool
+sbitmap_empty_p (const_sbitmap bmap)
+{
+ unsigned int i;
+ for (i=0; isize; i++)
+ if (bmap->elms[i])
+ return false;
+
+ return true;
}
/* Zero all elements in a bitmap. */
void
-sbitmap_zero (bmap)
- sbitmap bmap;
+sbitmap_zero (sbitmap bmap)
{
- bzero ((char *) bmap->elms, bmap->bytes);
+ memset (bmap->elms, 0, SBITMAP_SIZE_BYTES (bmap));
+ if (bmap->popcount)
+ memset (bmap->popcount, 0, bmap->size * sizeof (unsigned char));
}
-/* Set to ones all elements in a bitmap. */
+/* Set all elements in a bitmap to ones. */
void
-sbitmap_ones (bmap)
- sbitmap bmap;
+sbitmap_ones (sbitmap bmap)
{
- memset (bmap->elms, -1, bmap->bytes);
+ unsigned int last_bit;
+
+ memset (bmap->elms, -1, SBITMAP_SIZE_BYTES (bmap));
+ if (bmap->popcount)
+ memset (bmap->popcount, -1, bmap->size * sizeof (unsigned char));
+
+ last_bit = bmap->n_bits % SBITMAP_ELT_BITS;
+ if (last_bit)
+ {
+ bmap->elms[bmap->size - 1]
+ = (SBITMAP_ELT_TYPE)-1 >> (SBITMAP_ELT_BITS - last_bit);
+ if (bmap->popcount)
+ bmap->popcount[bmap->size - 1]
+ = do_popcount (bmap->elms[bmap->size - 1]);
+ }
}
/* Zero a vector of N_VECS bitmaps. */
void
-sbitmap_vector_zero (bmap, n_vecs)
- sbitmap *bmap;
- int n_vecs;
+sbitmap_vector_zero (sbitmap *bmap, unsigned int n_vecs)
{
- int i;
+ unsigned int i;
for (i = 0; i < n_vecs; i++)
sbitmap_zero (bmap[i]);
}
-/* Set to ones a vector of N_VECS bitmaps. */
+/* Set a vector of N_VECS bitmaps to ones. */
void
-sbitmap_vector_ones (bmap, n_vecs)
- sbitmap *bmap;
- int n_vecs;
+sbitmap_vector_ones (sbitmap *bmap, unsigned int n_vecs)
{
- int i;
+ unsigned int i;
for (i = 0; i < n_vecs; i++)
sbitmap_ones (bmap[i]);
@@ -146,477 +329,632 @@ sbitmap_vector_ones (bmap, n_vecs)
/* Set DST to be A union (B - C).
DST = A | (B & ~C).
- Return non-zero if any change is made. */
+ Returns true if any change is made. */
-int
-sbitmap_union_of_diff (dst, a, b, c)
- sbitmap dst, a, b, c;
-{
- int i,changed;
- sbitmap_ptr dstp, ap, bp, cp;
-
- changed = 0;
- dstp = dst->elms;
- ap = a->elms;
- bp = b->elms;
- cp = c->elms;
- for (i = 0; i < dst->size; i++)
+bool
+sbitmap_union_of_diff_cg (sbitmap dst, const_sbitmap a, const_sbitmap b, const_sbitmap c)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ const_sbitmap_ptr cp = c->elms;
+ SBITMAP_ELT_TYPE changed = 0;
+
+ gcc_assert (!dst->popcount);
+
+ for (i = 0; i < n; i++)
{
- SBITMAP_ELT_TYPE tmp = *ap | (*bp & ~*cp);
- if (*dstp != tmp)
- changed = 1;
- *dstp = tmp;
- dstp++; ap++; bp++; cp++;
+ const SBITMAP_ELT_TYPE tmp = *ap++ | (*bp++ & ~*cp++);
+ changed |= *dstp ^ tmp;
+ *dstp++ = tmp;
}
- return changed;
+
+ return changed != 0;
+}
+
+void
+sbitmap_union_of_diff (sbitmap dst, const_sbitmap a, const_sbitmap b, const_sbitmap c)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ const_sbitmap_ptr cp = c->elms;
+
+ gcc_assert (!dst->popcount && !a->popcount
+ && !b->popcount && !c->popcount);
+
+ for (i = 0; i < n; i++)
+ *dstp++ = *ap++ | (*bp++ & ~*cp++);
}
/* Set bitmap DST to the bitwise negation of the bitmap SRC. */
void
-sbitmap_not (dst, src)
- sbitmap dst, src;
+sbitmap_not (sbitmap dst, const_sbitmap src)
{
- int i;
- sbitmap_ptr dstp, ap;
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr srcp = src->elms;
+ unsigned int last_bit;
- dstp = dst->elms;
- ap = src->elms;
- for (i = 0; i < dst->size; i++)
- {
- SBITMAP_ELT_TYPE tmp = ~(*ap);
- *dstp = tmp;
- dstp++; ap++;
- }
+ gcc_assert (!dst->popcount);
+
+ for (i = 0; i < n; i++)
+ *dstp++ = ~*srcp++;
+
+ /* Zero all bits past n_bits, by ANDing dst with sbitmap_ones. */
+ last_bit = src->n_bits % SBITMAP_ELT_BITS;
+ if (last_bit)
+ dst->elms[n-1] = dst->elms[n-1]
+ & ((SBITMAP_ELT_TYPE)-1 >> (SBITMAP_ELT_BITS - last_bit));
}
/* Set the bits in DST to be the difference between the bits
- in A and the bits in B. i.e. dst = a - b.
- The - operator is implemented as a & (~b). */
+ in A and the bits in B. i.e. dst = a & (~b). */
void
-sbitmap_difference (dst, a, b)
- sbitmap dst, a, b;
+sbitmap_difference (sbitmap dst, const_sbitmap a, const_sbitmap b)
{
- int i;
- sbitmap_ptr dstp, ap, bp;
-
- dstp = dst->elms;
- ap = a->elms;
- bp = b->elms;
- for (i = 0; i < dst->size; i++)
+ unsigned int i, dst_size = dst->size;
+ unsigned int min_size = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+
+ gcc_assert (!dst->popcount);
+
+ /* A should be at least as large as DEST, to have a defined source. */
+ gcc_assert (a->size >= dst_size);
+ /* If minuend is smaller, we simply pretend it to be zero bits, i.e.
+ only copy the subtrahend into dest. */
+ if (b->size < min_size)
+ min_size = b->size;
+ for (i = 0; i < min_size; i++)
*dstp++ = *ap++ & (~*bp++);
+ /* Now fill the rest of dest from A, if B was too short.
+ This makes sense only when destination and A differ. */
+ if (dst != a && i != dst_size)
+ for (; i < dst_size; i++)
+ *dstp++ = *ap++;
}
-/* Set DST to be (A and B)).
- Return non-zero if any change is made. */
+/* Return true if there are any bits set in A are also set in B.
+ Return false otherwise. */
-int
-sbitmap_a_and_b (dst, a, b)
- sbitmap dst, a, b;
+bool
+sbitmap_any_common_bits (const_sbitmap a, const_sbitmap b)
{
- int i,changed;
- sbitmap_ptr dstp, ap, bp;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ unsigned int i, n;
- changed = 0;
- dstp = dst->elms;
- ap = a->elms;
- bp = b->elms;
- for (i = 0; i < dst->size; i++)
- {
- SBITMAP_ELT_TYPE tmp = *ap & *bp;
- if (*dstp != tmp)
- changed = 1;
- *dstp = tmp;
- dstp++; ap++; bp++;
- }
- return changed;
+ n = MIN (a->size, b->size);
+ for (i = 0; i < n; i++)
+ if ((*ap++ & *bp++) != 0)
+ return true;
+
+ return false;
}
-/* Set DST to be (A or B)).
- Return non-zero if any change is made. */
-int
-sbitmap_a_or_b (dst, a, b)
- sbitmap dst, a, b;
+/* Set DST to be (A and B).
+ Return nonzero if any change is made. */
+
+bool
+sbitmap_a_and_b_cg (sbitmap dst, const_sbitmap a, const_sbitmap b)
{
- int i,changed;
- sbitmap_ptr dstp, ap, bp;
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ SBITMAP_ELT_TYPE changed = 0;
+
+ gcc_assert (!dst->popcount);
- changed = 0;
- dstp = dst->elms;
- ap = a->elms;
- bp = b->elms;
- for (i = 0; i < dst->size; i++)
+ for (i = 0; i < n; i++)
{
- SBITMAP_ELT_TYPE tmp = *ap | *bp;
- if (*dstp != tmp)
- changed = 1;
- *dstp = tmp;
- dstp++; ap++; bp++;
+ const SBITMAP_ELT_TYPE tmp = *ap++ & *bp++;
+ changed |= *dstp ^ tmp;
+ *dstp++ = tmp;
}
- return changed;
-}
-/* Set DST to be (A or (B and C)).
- Return non-zero if any change is made. */
+ return changed != 0;
+}
-int
-sbitmap_a_or_b_and_c (dst, a, b, c)
- sbitmap dst, a, b, c;
-{
- int i,changed;
- sbitmap_ptr dstp, ap, bp, cp;
-
- changed = 0;
- dstp = dst->elms;
- ap = a->elms;
- bp = b->elms;
- cp = c->elms;
- for (i = 0; i < dst->size; i++)
+void
+sbitmap_a_and_b (sbitmap dst, const_sbitmap a, const_sbitmap b)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ bool has_popcount = dst->popcount != NULL;
+ unsigned char *popcountp = dst->popcount;
+
+ for (i = 0; i < n; i++)
{
- SBITMAP_ELT_TYPE tmp = *ap | (*bp & *cp);
- if (*dstp != tmp)
- changed = 1;
- *dstp = tmp;
- dstp++; ap++; bp++; cp++;
+ const SBITMAP_ELT_TYPE tmp = *ap++ & *bp++;
+ if (has_popcount)
+ {
+ bool wordchanged = (*dstp ^ tmp) != 0;
+ if (wordchanged)
+ *popcountp = do_popcount (tmp);
+ popcountp++;
+ }
+ *dstp++ = tmp;
}
- return changed;
+#ifdef BITMAP_DEBUGGING
+ if (has_popcount)
+ sbitmap_verify_popcount (dst);
+#endif
}
-/* Set DST to be (A ann (B or C)).
- Return non-zero if any change is made. */
+/* Set DST to be (A xor B)).
+ Return nonzero if any change is made. */
-int
-sbitmap_a_and_b_or_c (dst, a, b, c)
- sbitmap dst, a, b, c;
-{
- int i,changed;
- sbitmap_ptr dstp, ap, bp, cp;
-
- changed = 0;
- dstp = dst->elms;
- ap = a->elms;
- bp = b->elms;
- cp = c->elms;
- for (i = 0; i < dst->size; i++)
+bool
+sbitmap_a_xor_b_cg (sbitmap dst, const_sbitmap a, const_sbitmap b)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ SBITMAP_ELT_TYPE changed = 0;
+
+ gcc_assert (!dst->popcount);
+
+ for (i = 0; i < n; i++)
{
- SBITMAP_ELT_TYPE tmp = *ap & (*bp | *cp);
- if (*dstp != tmp)
- changed = 1;
- *dstp = tmp;
- dstp++; ap++; bp++; cp++;
+ const SBITMAP_ELT_TYPE tmp = *ap++ ^ *bp++;
+ changed |= *dstp ^ tmp;
+ *dstp++ = tmp;
}
- return changed;
-}
-/* Set the bitmap DST to the intersection of SRC of all predecessors or
- successors of block number BB (PRED_SUCC says which). */
+ return changed != 0;
+}
void
-sbitmap_intersect_of_predsucc (dst, src, bb, pred_succ)
- sbitmap dst;
- sbitmap *src;
- int bb;
- int_list_ptr *pred_succ;
+sbitmap_a_xor_b (sbitmap dst, const_sbitmap a, const_sbitmap b)
{
- int_list_ptr ps;
- int ps_bb;
- int set_size = dst->size;
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ bool has_popcount = dst->popcount != NULL;
+ unsigned char *popcountp = dst->popcount;
+
+ for (i = 0; i < n; i++)
+ {
+ const SBITMAP_ELT_TYPE tmp = *ap++ ^ *bp++;
+ if (has_popcount)
+ {
+ bool wordchanged = (*dstp ^ tmp) != 0;
+ if (wordchanged)
+ *popcountp = do_popcount (tmp);
+ popcountp++;
+ }
+ *dstp++ = tmp;
+ }
+#ifdef BITMAP_DEBUGGING
+ if (has_popcount)
+ sbitmap_verify_popcount (dst);
+#endif
+}
- ps = pred_succ[bb];
+/* Set DST to be (A or B)).
+ Return nonzero if any change is made. */
+
+bool
+sbitmap_a_or_b_cg (sbitmap dst, const_sbitmap a, const_sbitmap b)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ SBITMAP_ELT_TYPE changed = 0;
- /* It is possible that there are no predecessors(/successors).
- This can happen for example in unreachable code. */
+ gcc_assert (!dst->popcount);
- if (ps == NULL)
+ for (i = 0; i < n; i++)
{
- /* In APL-speak this is the `and' reduction of the empty set and thus
- the result is the identity for `and'. */
- sbitmap_ones (dst);
- return;
+ const SBITMAP_ELT_TYPE tmp = *ap++ | *bp++;
+ changed |= *dstp ^ tmp;
+ *dstp++ = tmp;
}
- /* Set result to first predecessor/successor. */
+ return changed != 0;
+}
- for ( ; ps != NULL; ps = ps->next)
+void
+sbitmap_a_or_b (sbitmap dst, const_sbitmap a, const_sbitmap b)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ bool has_popcount = dst->popcount != NULL;
+ unsigned char *popcountp = dst->popcount;
+
+ for (i = 0; i < n; i++)
{
- ps_bb = INT_LIST_VAL (ps);
- if (ps_bb == ENTRY_BLOCK || ps_bb == EXIT_BLOCK)
- continue;
- sbitmap_copy (dst, src[ps_bb]);
- /* Break out since we're only doing first predecessor. */
- break;
+ const SBITMAP_ELT_TYPE tmp = *ap++ | *bp++;
+ if (has_popcount)
+ {
+ bool wordchanged = (*dstp ^ tmp) != 0;
+ if (wordchanged)
+ *popcountp = do_popcount (tmp);
+ popcountp++;
+ }
+ *dstp++ = tmp;
}
- if (ps == NULL)
- return;
+#ifdef BITMAP_DEBUGGING
+ if (has_popcount)
+ sbitmap_verify_popcount (dst);
+#endif
+}
- /* Now do the remaining predecessors/successors. */
+/* Return nonzero if A is a subset of B. */
- for (ps = ps->next; ps != NULL; ps = ps->next)
- {
- int i;
- sbitmap_ptr p,r;
-
- ps_bb = INT_LIST_VAL (ps);
- if (ps_bb == ENTRY_BLOCK || ps_bb == EXIT_BLOCK)
- continue;
+bool
+sbitmap_a_subset_b_p (const_sbitmap a, const_sbitmap b)
+{
+ unsigned int i, n = a->size;
+ const_sbitmap_ptr ap, bp;
- p = src[ps_bb]->elms;
- r = dst->elms;
+ for (ap = a->elms, bp = b->elms, i = 0; i < n; i++, ap++, bp++)
+ if ((*ap | *bp) != *bp)
+ return false;
- for (i = 0; i < set_size; i++)
- *r++ &= *p++;
- }
+ return true;
}
-/* Set the bitmap DST to the union of SRC of all predecessors/successors of
- block number BB. */
+/* Set DST to be (A or (B and C)).
+ Return nonzero if any change is made. */
-void
-sbitmap_union_of_predsucc (dst, src, bb, pred_succ)
- sbitmap dst;
- sbitmap *src;
- int bb;
- int_list_ptr *pred_succ;
+bool
+sbitmap_a_or_b_and_c_cg (sbitmap dst, const_sbitmap a, const_sbitmap b, const_sbitmap c)
{
- int_list_ptr ps;
- int ps_bb;
- int set_size = dst->size;
-
- ps = pred_succ[bb];
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ const_sbitmap_ptr cp = c->elms;
+ SBITMAP_ELT_TYPE changed = 0;
- /* It is possible that there are no predecessors(/successors).
- This can happen for example in unreachable code. */
+ gcc_assert (!dst->popcount);
- if (ps == NULL)
+ for (i = 0; i < n; i++)
{
- /* In APL-speak this is the `or' reduction of the empty set and thus
- the result is the identity for `or'. */
- sbitmap_zero (dst);
- return;
+ const SBITMAP_ELT_TYPE tmp = *ap++ | (*bp++ & *cp++);
+ changed |= *dstp ^ tmp;
+ *dstp++ = tmp;
}
- /* Set result to first predecessor/successor. */
+ return changed != 0;
+}
- for ( ; ps != NULL; ps = ps->next)
- {
- ps_bb = INT_LIST_VAL (ps);
- if (ps_bb == ENTRY_BLOCK || ps_bb == EXIT_BLOCK)
- continue;
- sbitmap_copy (dst, src[ps_bb]);
- /* Break out since we're only doing first predecessor. */
- break;
- }
- if (ps == NULL)
- return;
+void
+sbitmap_a_or_b_and_c (sbitmap dst, const_sbitmap a, const_sbitmap b, const_sbitmap c)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ const_sbitmap_ptr cp = c->elms;
- /* Now do the remaining predecessors/successors. */
+ gcc_assert (!dst->popcount);
- for (ps = ps->next; ps != NULL; ps = ps->next)
- {
- int i;
- sbitmap_ptr p,r;
+ for (i = 0; i < n; i++)
+ *dstp++ = *ap++ | (*bp++ & *cp++);
+}
- ps_bb = INT_LIST_VAL (ps);
- if (ps_bb == ENTRY_BLOCK || ps_bb == EXIT_BLOCK)
- continue;
+/* Set DST to be (A and (B or C)).
+ Return nonzero if any change is made. */
- p = src[ps_bb]->elms;
- r = dst->elms;
+bool
+sbitmap_a_and_b_or_c_cg (sbitmap dst, const_sbitmap a, const_sbitmap b, const_sbitmap c)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ const_sbitmap_ptr cp = c->elms;
+ SBITMAP_ELT_TYPE changed = 0;
+
+ gcc_assert (!dst->popcount);
- for (i = 0; i < set_size; i++)
- *r++ |= *p++;
+ for (i = 0; i < n; i++)
+ {
+ const SBITMAP_ELT_TYPE tmp = *ap++ & (*bp++ | *cp++);
+ changed |= *dstp ^ tmp;
+ *dstp++ = tmp;
}
+
+ return changed != 0;
+}
+
+void
+sbitmap_a_and_b_or_c (sbitmap dst, const_sbitmap a, const_sbitmap b, const_sbitmap c)
+{
+ unsigned int i, n = dst->size;
+ sbitmap_ptr dstp = dst->elms;
+ const_sbitmap_ptr ap = a->elms;
+ const_sbitmap_ptr bp = b->elms;
+ const_sbitmap_ptr cp = c->elms;
+
+ for (i = 0; i < n; i++)
+ *dstp++ = *ap++ & (*bp++ | *cp++);
}
+#ifdef IN_GCC
/* Set the bitmap DST to the intersection of SRC of successors of
block number BB, using the new flow graph structures. */
void
-sbitmap_intersection_of_succs (dst, src, bb)
- sbitmap dst;
- sbitmap *src;
- int bb;
+sbitmap_intersection_of_succs (sbitmap dst, sbitmap *src, int bb)
{
basic_block b = BASIC_BLOCK (bb);
- edge e = b->succ;
- int set_size = dst->size;
+ unsigned int set_size = dst->size;
+ edge e;
+ unsigned ix;
- for ( ; e != NULL; e = e->succ_next)
+ gcc_assert (!dst->popcount);
+
+ for (e = NULL, ix = 0; ix < EDGE_COUNT (b->succs); ix++)
{
+ e = EDGE_SUCC (b, ix);
if (e->dest == EXIT_BLOCK_PTR)
- continue;
+ continue;
+
sbitmap_copy (dst, src[e->dest->index]);
break;
}
- if (e == NULL)
+
+ if (e == 0)
sbitmap_ones (dst);
else
- {
- for ( e = e->succ_next; e != NULL; e = e->succ_next)
- {
- int i;
- sbitmap_ptr p,r;
-
- if (e->dest == EXIT_BLOCK_PTR)
- continue;
-
- p = src[e->dest->index]->elms;
- r = dst->elms;
- for (i = 0; i < set_size; i++)
- *r++ &= *p++;
- }
- }
+ for (++ix; ix < EDGE_COUNT (b->succs); ix++)
+ {
+ unsigned int i;
+ sbitmap_ptr p, r;
+
+ e = EDGE_SUCC (b, ix);
+ if (e->dest == EXIT_BLOCK_PTR)
+ continue;
+
+ p = src[e->dest->index]->elms;
+ r = dst->elms;
+ for (i = 0; i < set_size; i++)
+ *r++ &= *p++;
+ }
}
/* Set the bitmap DST to the intersection of SRC of predecessors of
block number BB, using the new flow graph structures. */
void
-sbitmap_intersection_of_preds (dst, src, bb)
- sbitmap dst;
- sbitmap *src;
- int bb;
+sbitmap_intersection_of_preds (sbitmap dst, sbitmap *src, int bb)
{
basic_block b = BASIC_BLOCK (bb);
- edge e = b->pred;
- int set_size = dst->size;
+ unsigned int set_size = dst->size;
+ edge e;
+ unsigned ix;
+
+ gcc_assert (!dst->popcount);
- for ( ; e != NULL; e = e->pred_next)
+ for (e = NULL, ix = 0; ix < EDGE_COUNT (b->preds); ix++)
{
- if (e->src== ENTRY_BLOCK_PTR)
- continue;
+ e = EDGE_PRED (b, ix);
+ if (e->src == ENTRY_BLOCK_PTR)
+ continue;
+
sbitmap_copy (dst, src[e->src->index]);
break;
}
- if (e == NULL)
+
+ if (e == 0)
sbitmap_ones (dst);
else
- {
- for ( e = e->pred_next; e != NULL; e = e->pred_next)
- {
- int i;
- sbitmap_ptr p,r;
-
- if (e->src == ENTRY_BLOCK_PTR)
- continue;
-
- p = src[e->src->index]->elms;
- r = dst->elms;
- for (i = 0; i < set_size; i++)
- *r++ &= *p++;
- }
- }
+ for (++ix; ix < EDGE_COUNT (b->preds); ix++)
+ {
+ unsigned int i;
+ sbitmap_ptr p, r;
+
+ e = EDGE_PRED (b, ix);
+ if (e->src == ENTRY_BLOCK_PTR)
+ continue;
+
+ p = src[e->src->index]->elms;
+ r = dst->elms;
+ for (i = 0; i < set_size; i++)
+ *r++ &= *p++;
+ }
}
/* Set the bitmap DST to the union of SRC of successors of
block number BB, using the new flow graph structures. */
void
-sbitmap_union_of_succs (dst, src, bb)
- sbitmap dst;
- sbitmap *src;
- int bb;
+sbitmap_union_of_succs (sbitmap dst, sbitmap *src, int bb)
{
basic_block b = BASIC_BLOCK (bb);
- edge e = b->succ;
- int set_size = dst->size;
+ unsigned int set_size = dst->size;
+ edge e;
+ unsigned ix;
+
+ gcc_assert (!dst->popcount);
- for ( ; e != NULL; e = e->succ_next)
+ for (ix = 0; ix < EDGE_COUNT (b->succs); ix++)
{
+ e = EDGE_SUCC (b, ix);
if (e->dest == EXIT_BLOCK_PTR)
- continue;
+ continue;
+
sbitmap_copy (dst, src[e->dest->index]);
break;
}
- if (e == NULL)
+
+ if (ix == EDGE_COUNT (b->succs))
sbitmap_zero (dst);
else
- {
- for ( e = e->succ_next; e != NULL; e = e->succ_next)
- {
- int i;
- sbitmap_ptr p,r;
-
- if (e->dest == EXIT_BLOCK_PTR)
- continue;
-
- p = src[e->dest->index]->elms;
- r = dst->elms;
- for (i = 0; i < set_size; i++)
- *r++ |= *p++;
- }
- }
+ for (ix++; ix < EDGE_COUNT (b->succs); ix++)
+ {
+ unsigned int i;
+ sbitmap_ptr p, r;
+
+ e = EDGE_SUCC (b, ix);
+ if (e->dest == EXIT_BLOCK_PTR)
+ continue;
+
+ p = src[e->dest->index]->elms;
+ r = dst->elms;
+ for (i = 0; i < set_size; i++)
+ *r++ |= *p++;
+ }
}
/* Set the bitmap DST to the union of SRC of predecessors of
block number BB, using the new flow graph structures. */
void
-sbitmap_union_of_preds (dst, src, bb)
- sbitmap dst;
- sbitmap *src;
- int bb;
+sbitmap_union_of_preds (sbitmap dst, sbitmap *src, int bb)
{
basic_block b = BASIC_BLOCK (bb);
- edge e = b->pred;
- int set_size = dst->size;
+ unsigned int set_size = dst->size;
+ edge e;
+ unsigned ix;
+
+ gcc_assert (!dst->popcount);
- for ( ; e != NULL; e = e->pred_next)
+ for (ix = 0; ix < EDGE_COUNT (b->preds); ix++)
{
+ e = EDGE_PRED (b, ix);
if (e->src== ENTRY_BLOCK_PTR)
- continue;
+ continue;
+
sbitmap_copy (dst, src[e->src->index]);
break;
}
- if (e == NULL)
+
+ if (ix == EDGE_COUNT (b->preds))
sbitmap_zero (dst);
else
+ for (ix++; ix < EDGE_COUNT (b->preds); ix++)
+ {
+ unsigned int i;
+ sbitmap_ptr p, r;
+
+ e = EDGE_PRED (b, ix);
+ if (e->src == ENTRY_BLOCK_PTR)
+ continue;
+
+ p = src[e->src->index]->elms;
+ r = dst->elms;
+ for (i = 0; i < set_size; i++)
+ *r++ |= *p++;
+ }
+}
+#endif
+
+/* Return number of first bit set in the bitmap, -1 if none. */
+
+int
+sbitmap_first_set_bit (const_sbitmap bmap)
+{
+ unsigned int n = 0;
+ sbitmap_iterator sbi;
+
+ EXECUTE_IF_SET_IN_SBITMAP (bmap, 0, n, sbi)
+ return n;
+ return -1;
+}
+
+/* Return number of last bit set in the bitmap, -1 if none. */
+
+int
+sbitmap_last_set_bit (const_sbitmap bmap)
+{
+ int i;
+ const SBITMAP_ELT_TYPE *const ptr = bmap->elms;
+
+ for (i = bmap->size - 1; i >= 0; i--)
{
- for ( e = e->pred_next; e != NULL; e = e->pred_next)
- {
- int i;
- sbitmap_ptr p,r;
-
- if (e->src == ENTRY_BLOCK_PTR)
- continue;
-
- p = src[e->src->index]->elms;
- r = dst->elms;
- for (i = 0; i < set_size; i++)
- *r++ |= *p++;
+ const SBITMAP_ELT_TYPE word = ptr[i];
+
+ if (word != 0)
+ {
+ unsigned int index = (i + 1) * SBITMAP_ELT_BITS - 1;
+ SBITMAP_ELT_TYPE mask
+ = (SBITMAP_ELT_TYPE) 1 << (SBITMAP_ELT_BITS - 1);
+
+ while (1)
+ {
+ if ((word & mask) != 0)
+ return index;
+
+ mask >>= 1;
+ index--;
+ }
}
}
+
+ return -1;
}
void
-dump_sbitmap (file, bmap)
- FILE *file;
- sbitmap bmap;
+dump_sbitmap (FILE *file, const_sbitmap bmap)
{
- int i,j,n;
- int set_size = bmap->size;
- int total_bits = bmap->n_bits;
+ unsigned int i, n, j;
+ unsigned int set_size = bmap->size;
+ unsigned int total_bits = bmap->n_bits;
fprintf (file, " ");
for (i = n = 0; i < set_size && n < total_bits; i++)
- {
- for (j = 0; j < SBITMAP_ELT_BITS && n < total_bits; j++, n++)
- {
- if (n != 0 && n % 10 == 0)
- fprintf (file, " ");
- fprintf (file, "%d", (bmap->elms[i] & (1L << j)) != 0);
- }
- }
+ for (j = 0; j < SBITMAP_ELT_BITS && n < total_bits; j++, n++)
+ {
+ if (n != 0 && n % 10 == 0)
+ fprintf (file, " ");
+
+ fprintf (file, "%d",
+ (bmap->elms[i] & ((SBITMAP_ELT_TYPE) 1 << j)) != 0);
+ }
+
fprintf (file, "\n");
}
void
-dump_sbitmap_vector (file, title, subtitle, bmaps, n_maps)
- FILE *file;
- const char *title, *subtitle;
- sbitmap *bmaps;
- int n_maps;
+dump_sbitmap_file (FILE *file, const_sbitmap bmap)
+{
+ unsigned int i, pos;
+
+ fprintf (file, "n_bits = %d, set = {", bmap->n_bits);
+
+ for (pos = 30, i = 0; i < bmap->n_bits; i++)
+ if (TEST_BIT (bmap, i))
+ {
+ if (pos > 70)
+ {
+ fprintf (file, "\n ");
+ pos = 0;
+ }
+
+ fprintf (file, "%d ", i);
+ pos += 2 + (i >= 10) + (i >= 100) + (i >= 1000);
+ }
+
+ fprintf (file, "}\n");
+}
+
+void
+debug_sbitmap (const_sbitmap bmap)
+{
+ dump_sbitmap_file (stderr, bmap);
+}
+
+void
+dump_sbitmap_vector (FILE *file, const char *title, const char *subtitle,
+ sbitmap *bmaps, int n_maps)
{
int bb;
@@ -626,5 +964,85 @@ dump_sbitmap_vector (file, title, subtitle, bmaps, n_maps)
fprintf (file, "%s %d\n", subtitle, bb);
dump_sbitmap (file, bmaps[bb]);
}
+
fprintf (file, "\n");
}
+
+#if GCC_VERSION < 3400
+/* Table of number of set bits in a character, indexed by value of char. */
+static const unsigned char popcount_table[] =
+{
+ 0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,
+ 1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+ 1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+ 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,
+ 1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+ 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,
+ 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,
+ 3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8,
+};
+
+/* Count the bits in an SBITMAP element A. */
+
+static unsigned long
+sbitmap_elt_popcount (SBITMAP_ELT_TYPE a)
+{
+ unsigned long ret = 0;
+ unsigned i;
+
+ if (a == 0)
+ return 0;
+
+ /* Just do this the table way for now */
+ for (i = 0; i < SBITMAP_ELT_BITS; i += 8)
+ ret += popcount_table[(a >> i) & 0xff];
+ return ret;
+}
+#endif
+
+/* Count the number of bits in SBITMAP a, up to bit MAXBIT. */
+
+unsigned long
+sbitmap_popcount (const_sbitmap a, unsigned long maxbit)
+{
+ unsigned long count = 0;
+ unsigned ix;
+ unsigned int lastword;
+
+ if (maxbit == 0)
+ return 0;
+
+ if (maxbit >= a->n_bits)
+ maxbit = a->n_bits;
+
+ /* Count the bits in the full word. */
+ lastword = MIN (a->size, SBITMAP_SET_SIZE (maxbit + 1) - 1);
+ for (ix = 0; ix < lastword; ix++)
+ {
+ if (a->popcount)
+ {
+ count += a->popcount[ix];
+#ifdef BITMAP_DEBUGGING
+ gcc_assert (a->popcount[ix] == do_popcount (a->elms[ix]));
+#endif
+ }
+ else
+ count += do_popcount (a->elms[ix]);
+ }
+
+ /* Count the remaining bits. */
+ if (lastword < a->size)
+ {
+ unsigned int bitindex;
+ SBITMAP_ELT_TYPE theword = a->elms[lastword];
+
+ bitindex = maxbit % SBITMAP_ELT_BITS;
+ if (bitindex != 0)
+ {
+ theword &= (SBITMAP_ELT_TYPE)-1 >> (SBITMAP_ELT_BITS - bitindex);
+ count += do_popcount (theword);
+ }
+ }
+ return count;
+}
+