X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fbitmap.c;h=2cf4c8cf5d69de70603a679981e89078d6dab143;hb=ffca001431383db73c1c827b614283aaf6a9c832;hp=68b8429e80124ebef9e04f4fc3e73e071fdd1df1;hpb=42fe97ed1a1d59a2d77f80a2823ec938a94ecc7b;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/bitmap.c b/gcc/bitmap.c index 68b8429e801..2cf4c8cf5d6 100644 --- a/gcc/bitmap.c +++ b/gcc/bitmap.c @@ -1,5 +1,5 @@ /* Functions to support general ended bitmaps. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GCC. @@ -29,16 +29,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "ggc.h" #include "bitmap.h" -/* Obstack to allocate bitmap elements from. */ - -#ifndef INLINE -#ifndef __GNUC__ -#define INLINE -#else -#define INLINE __inline__ -#endif -#endif - /* Global data */ bitmap_element bitmap_zero_bits; /* An element of all zero bits. */ bitmap_obstack bitmap_default_obstack; /* The default bitmap obstack. */ @@ -56,7 +46,7 @@ static bitmap_element *bitmap_find_bit (bitmap, unsigned int); /* Add ELEM to the appropriate freelist. */ -static INLINE void +static inline void bitmap_elem_to_freelist (bitmap head, bitmap_element *elt) { bitmap_obstack *bit_obstack = head->obstack; @@ -76,7 +66,7 @@ bitmap_elem_to_freelist (bitmap head, bitmap_element *elt) /* Free a bitmap element. Since these are allocated off the bitmap_obstack, "free" actually means "put onto the freelist". */ -static INLINE void +static inline void bitmap_element_free (bitmap head, bitmap_element *elt) { bitmap_element *next = elt->next; @@ -104,7 +94,7 @@ bitmap_element_free (bitmap head, bitmap_element *elt) /* Allocate a bitmap element. The bits are cleared, but nothing else is. */ -static INLINE bitmap_element * +static inline bitmap_element * bitmap_element_allocate (bitmap head) { bitmap_element *element; @@ -150,7 +140,7 @@ bitmap_elt_clear_from (bitmap head, bitmap_element *elt) /* Clear a bitmap by freeing the linked list. */ -INLINE void +inline void bitmap_clear (bitmap head) { bitmap_element *element, *next; @@ -232,43 +222,23 @@ bitmap_gc_alloc (void) return map; } -/* Create a new malloced bitmap. Elements will be allocated from the - default bitmap obstack. */ - -bitmap -bitmap_malloc_alloc (void) -{ - bitmap map; - - map = xmalloc (sizeof (bitmap_head)); - bitmap_initialize (map, &bitmap_default_obstack); - - return map; -} - /* Release an obstack allocated bitmap. */ void bitmap_obstack_free (bitmap map) { - bitmap_clear (map); - map->first = (void *)map->obstack->heads; - map->obstack->heads = map; -} - -/* Release a malloc allocated bitmap. */ - -void -bitmap_malloc_free (bitmap map) -{ - bitmap_clear (map); - free (map); + if (map) + { + bitmap_clear (map); + map->first = (void *)map->obstack->heads; + map->obstack->heads = map; + } } /* Return nonzero if all bits in an element are zero. */ -static INLINE int +static inline int bitmap_element_zerop (bitmap_element *element) { #if BITMAP_ELEMENT_WORDS == 2 @@ -286,7 +256,7 @@ bitmap_element_zerop (bitmap_element *element) /* Link the bitmap element into the current bitmap linked list. */ -static INLINE void +static inline void bitmap_element_link (bitmap head, bitmap_element *element) { unsigned int indx = element->indx; @@ -376,9 +346,6 @@ void bitmap_copy (bitmap to, bitmap from) { bitmap_element *from_ptr, *to_ptr = 0; -#if BITMAP_ELEMENT_WORDS != 2 - unsigned i; -#endif bitmap_clear (to); @@ -388,14 +355,7 @@ bitmap_copy (bitmap to, bitmap from) bitmap_element *to_elt = bitmap_element_allocate (to); to_elt->indx = from_ptr->indx; - -#if BITMAP_ELEMENT_WORDS == 2 - to_elt->bits[0] = from_ptr->bits[0]; - to_elt->bits[1] = from_ptr->bits[1]; -#else - for (i = 0; i < BITMAP_ELEMENT_WORDS; i++) - to_elt->bits[i] = from_ptr->bits[i]; -#endif + memcpy (to_elt->bits, from_ptr->bits, sizeof (to_elt->bits)); /* Here we have a special case of bitmap_element_link, for the case where we know the links are being entered in sequence. */ @@ -421,7 +381,7 @@ bitmap_copy (bitmap to, bitmap from) would hold the bitmap's bit to make eventual allocation faster. */ -static INLINE bitmap_element * +static inline bitmap_element * bitmap_find_bit (bitmap head, unsigned int bit) { bitmap_element *element; @@ -431,14 +391,26 @@ bitmap_find_bit (bitmap head, unsigned int bit) || head->indx == indx) return head->current; - if (head->indx > indx) + if (head->indx < indx) + /* INDX is beyond head->indx. Search from head->current + forward. */ + for (element = head->current; + element->next != 0 && element->indx < indx; + element = element->next) + ; + + else if (head->indx / 2 < indx) + /* INDX is less than head->indx and closer to head->indx than to + 0. Search from head->current backward. */ for (element = head->current; element->prev != 0 && element->indx > indx; element = element->prev) ; else - for (element = head->current; + /* INDX is less than head->indx and closer to 0 than to + head->indx. Search from head->first forward. */ + for (element = head->first; element->next != 0 && element->indx < indx; element = element->next) ; @@ -718,14 +690,15 @@ bitmap_and_compl (bitmap dst, bitmap a, bitmap b) dst->indx = dst->current->indx; } -/* A &= ~B */ +/* A &= ~B. Returns true if A changes */ -void +bool bitmap_and_compl_into (bitmap a, bitmap b) { bitmap_element *a_elt = a->first; bitmap_element *b_elt = b->first; bitmap_element *next; + BITMAP_WORD changed = 0; gcc_assert (a != b); while (a_elt && b_elt) @@ -742,9 +715,11 @@ bitmap_and_compl_into (bitmap a, bitmap b) for (ix = BITMAP_ELEMENT_WORDS; ix--;) { - BITMAP_WORD r = a_elt->bits[ix] & ~b_elt->bits[ix]; + BITMAP_WORD cleared = a_elt->bits[ix] & b_elt->bits[ix]; + BITMAP_WORD r = a_elt->bits[ix] ^ cleared; a_elt->bits[ix] = r; + changed |= cleared; ior |= r; } next = a_elt->next; @@ -756,6 +731,7 @@ bitmap_and_compl_into (bitmap a, bitmap b) } gcc_assert (!a->current == !a->first); gcc_assert (!a->current || a->indx == a->current->indx); + return changed != 0; } /* DST = A | B. Return true if DST changes. */