X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fbitmap.c;h=4575f62a531614d58778422207c20b9a229e9599;hb=424b5d7fb17a76082d207229a9aae376d28cbeba;hp=70845c06d1031e34f3cf93623e8cee6018ea844f;hpb=2f925a602e3e163ea1bc28726703fb3cdccef04a;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/bitmap.c b/gcc/bitmap.c index 70845c06d10..4575f62a531 100644 --- a/gcc/bitmap.c +++ b/gcc/bitmap.c @@ -1,38 +1,37 @@ /* Functions to support general ended bitmaps. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003 + 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 2, 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 COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ -#include #include "config.h" +#include "system.h" +#include "coretypes.h" +#include "tm.h" #include "rtl.h" #include "flags.h" #include "obstack.h" -#include "regs.h" -#include "basic-block.h" - -/* The contents of the current function definition are allocated - in this obstack, and all are freed at the end of the function. - For top-level functions, this is temporary_obstack. - Separate obstacks are made for nested functions. */ - -extern struct obstack *function_obstack; +#include "ggc.h" +#include "bitmap.h" +/* Obstack to allocate bitmap elements from. */ +static struct obstack bitmap_obstack; +static int bitmap_obstack_init = FALSE; #ifndef INLINE #ifndef __GNUC__ @@ -43,16 +42,37 @@ extern struct obstack *function_obstack; #endif /* Global data */ -bitmap_element bitmap_zero; /* An element of all zero bits. */ -bitmap_element *bitmap_free; /* Freelist of bitmap elements. */ - -static void bitmap_element_free PROTO((bitmap, bitmap_element *)); -static bitmap_element *bitmap_element_allocate PROTO((bitmap)); -static int bitmap_element_zerop PROTO((bitmap_element *)); -static void bitmap_element_link PROTO((bitmap, bitmap_element *)); -static bitmap_element *bitmap_find_bit PROTO((bitmap, unsigned int)); +bitmap_element bitmap_zero_bits; /* An element of all zero bits. */ +static bitmap_element *bitmap_free; /* Freelist of bitmap elements. */ +static GTY((deletable (""))) bitmap_element *bitmap_ggc_free; + +static void bitmap_elem_to_freelist PARAMS ((bitmap, bitmap_element *)); +static void bitmap_element_free PARAMS ((bitmap, bitmap_element *)); +static bitmap_element *bitmap_element_allocate PARAMS ((bitmap)); +static int bitmap_element_zerop PARAMS ((bitmap_element *)); +static void bitmap_element_link PARAMS ((bitmap, bitmap_element *)); +static bitmap_element *bitmap_find_bit PARAMS ((bitmap, unsigned int)); -/* Free a bitmap element */ +/* Add ELEM to the appropriate freelist. */ +static INLINE void +bitmap_elem_to_freelist (head, elt) + bitmap head; + bitmap_element *elt; +{ + if (head->using_obstack) + { + elt->next = bitmap_free; + bitmap_free = elt; + } + else + { + elt->next = bitmap_ggc_free; + bitmap_ggc_free = elt; + } +} + +/* Free a bitmap element. Since these are allocated off the + bitmap_obstack, "free" actually means "put onto the freelist". */ static INLINE void bitmap_element_free (head, elt) @@ -74,10 +94,12 @@ bitmap_element_free (head, elt) /* Since the first thing we try is to insert before current, make current the next entry in preference to the previous. */ if (head->current == elt) - head->current = next != 0 ? next : prev; - - elt->next = bitmap_free; - bitmap_free = elt; + { + head->current = next != 0 ? next : prev; + if (head->current) + head->indx = head->current->indx; + } + bitmap_elem_to_freelist (head, elt); } /* Allocate a bitmap element. The bits are cleared, but nothing else is. */ @@ -87,27 +109,78 @@ bitmap_element_allocate (head) bitmap head; { bitmap_element *element; - int i; - if (bitmap_free != 0) + if (head->using_obstack) { - element = bitmap_free; - bitmap_free = element->next; + if (bitmap_free != 0) + { + element = bitmap_free; + bitmap_free = element->next; + } + else + { + /* We can't use gcc_obstack_init to initialize the obstack since + print-rtl.c now calls bitmap functions, and bitmap is linked + into the gen* functions. */ + if (!bitmap_obstack_init) + { + bitmap_obstack_init = TRUE; + + /* Let particular systems override the size of a chunk. */ +#ifndef OBSTACK_CHUNK_SIZE +#define OBSTACK_CHUNK_SIZE 0 +#endif + /* Let them override the alloc and free routines too. */ +#ifndef OBSTACK_CHUNK_ALLOC +#define OBSTACK_CHUNK_ALLOC xmalloc +#endif +#ifndef OBSTACK_CHUNK_FREE +#define OBSTACK_CHUNK_FREE free +#endif + +#if !defined(__GNUC__) || (__GNUC__ < 2) +#define __alignof__(type) 0 +#endif + + obstack_specify_allocation (&bitmap_obstack, OBSTACK_CHUNK_SIZE, + __alignof__ (bitmap_element), + (void *(*) PARAMS ((long))) OBSTACK_CHUNK_ALLOC, + (void (*) PARAMS ((void *))) OBSTACK_CHUNK_FREE); + } + + element = (bitmap_element *) obstack_alloc (&bitmap_obstack, + sizeof (bitmap_element)); + } } else - element = (bitmap_element *) obstack_alloc (function_obstack, - sizeof (bitmap_element)); + { + if (bitmap_ggc_free != NULL) + { + element = bitmap_ggc_free; + bitmap_ggc_free = element->next; + } + else + element = ggc_alloc (sizeof (bitmap_element)); + } -#if BITMAP_ELEMENT_WORDS == 2 - element->bits[0] = element->bits[1] = 0; -#else - for (i = 0; i < BITMAP_ELEMENT_WORDS; i++) - element->bits[i] = 0; -#endif + memset (element->bits, 0, sizeof (element->bits)); return element; } +/* Release any memory allocated by bitmaps. */ + +void +bitmap_release_memory () +{ + bitmap_free = 0; + if (bitmap_obstack_init) + { + bitmap_obstack_init = FALSE; + obstack_free (&bitmap_obstack, NULL); + } +} + /* Return nonzero if all bits in an element are zero. */ static INLINE int @@ -186,7 +259,7 @@ bitmap_element_link (head, element) /* Clear a bitmap by freeing the linked list. */ -void INLINE +INLINE void bitmap_clear (head) bitmap head; { @@ -195,14 +268,13 @@ bitmap_clear (head) for (element = head->first; element != 0; element = next) { next = element->next; - element->next = bitmap_free; - bitmap_free = element; + bitmap_elem_to_freelist (head, element); } - head->first = head->current = 0; + head->first = head->current = 0; } -/* Copy a bitmap to another bitmap */ +/* Copy a bitmap to another bitmap. */ void bitmap_copy (to, from) @@ -210,7 +282,9 @@ bitmap_copy (to, from) bitmap from; { bitmap_element *from_ptr, *to_ptr = 0; +#if BITMAP_ELEMENT_WORDS != 2 int i; +#endif bitmap_clear (to); @@ -259,10 +333,11 @@ bitmap_find_bit (head, bit) unsigned int bit; { bitmap_element *element; - unsigned HOST_WIDE_INT indx = bit / BITMAP_ELEMENT_ALL_BITS; + unsigned int indx = bit / BITMAP_ELEMENT_ALL_BITS; - if (head->current == 0) - return 0; + if (head->current == 0 + || head->indx == indx) + return head->current; if (head->indx > indx) for (element = head->current; @@ -297,10 +372,9 @@ bitmap_clear_bit (head, bit) if (ptr != 0) { - unsigned bit_num = bit % (unsigned) HOST_BITS_PER_WIDE_INT; - unsigned word_num = ((bit / (unsigned) HOST_BITS_PER_WIDE_INT) - % BITMAP_ELEMENT_WORDS); - ptr->bits[word_num] &= ~ (((unsigned HOST_WIDE_INT) 1) << bit_num); + unsigned bit_num = bit % BITMAP_WORD_BITS; + unsigned word_num = bit / BITMAP_WORD_BITS % BITMAP_ELEMENT_WORDS; + ptr->bits[word_num] &= ~ (((BITMAP_WORD) 1) << bit_num); /* If we cleared the entire word, free up the element */ if (bitmap_element_zerop (ptr)) @@ -308,7 +382,6 @@ bitmap_clear_bit (head, bit) } } - /* Set a single bit in a bitmap. */ void @@ -317,10 +390,9 @@ bitmap_set_bit (head, bit) int bit; { bitmap_element *ptr = bitmap_find_bit (head, bit); - unsigned word_num - = ((bit / (unsigned) HOST_BITS_PER_WIDE_INT) % BITMAP_ELEMENT_WORDS); - unsigned bit_num = bit % (unsigned) HOST_BITS_PER_WIDE_INT; - unsigned HOST_WIDE_INT bit_val = ((unsigned HOST_WIDE_INT) 1) << bit_num; + unsigned word_num = bit / BITMAP_WORD_BITS % BITMAP_ELEMENT_WORDS; + unsigned bit_num = bit % BITMAP_WORD_BITS; + BITMAP_WORD bit_val = ((BITMAP_WORD) 1) << bit_num; if (ptr == 0) { @@ -332,7 +404,7 @@ bitmap_set_bit (head, bit) else ptr->bits[word_num] |= bit_val; } - + /* Return whether a bit is set within a bitmap. */ int @@ -348,46 +420,173 @@ bitmap_bit_p (head, bit) if (ptr == 0) return 0; - bit_num = bit % (unsigned) HOST_BITS_PER_WIDE_INT; - word_num - = ((bit / (unsigned) HOST_BITS_PER_WIDE_INT) % BITMAP_ELEMENT_WORDS); + bit_num = bit % BITMAP_WORD_BITS; + word_num = bit / BITMAP_WORD_BITS % BITMAP_ELEMENT_WORDS; - return - (ptr->bits[word_num] & (((unsigned HOST_WIDE_INT) 1) << bit_num)) != 0; + return (ptr->bits[word_num] >> bit_num) & 1; } -/* Store in bitmap TO the result of combining bitmap FROM1 and - FROM2 using a specific bit manipulation. */ +/* Return the bit number of the first set bit in the bitmap, or -1 + if the bitmap is empty. */ -void +int +bitmap_first_set_bit (a) + bitmap a; +{ + bitmap_element *ptr = a->first; + BITMAP_WORD word; + unsigned word_num, bit_num; + + if (ptr == NULL) + return -1; + +#if BITMAP_ELEMENT_WORDS == 2 + word_num = 0, word = ptr->bits[0]; + if (word == 0) + word_num = 1, word = ptr->bits[1]; +#else + for (word_num = 0; word_num < BITMAP_ELEMENT_WORDS; ++word_num) + if ((word = ptr->bits[word_num]) != 0) + break; +#endif + + /* Binary search for the first set bit. */ + /* ??? It'd be nice to know if ffs or ffsl was available. */ + + bit_num = 0; + word = word & -word; + +#if nBITMAP_WORD_BITS > 64 + #error "Fill out the table." +#endif +#if nBITMAP_WORD_BITS > 32 + if ((word & 0xffffffff) == 0) + word >>= 32, bit_num += 32; +#endif + if ((word & 0xffff) == 0) + word >>= 16, bit_num += 16; + if ((word & 0xff) == 0) + word >>= 8, bit_num += 8; + if (word & 0xf0) + bit_num += 4; + if (word & 0xcc) + bit_num += 2; + if (word & 0xaa) + bit_num += 1; + + return (ptr->indx * BITMAP_ELEMENT_ALL_BITS + + word_num * BITMAP_WORD_BITS + + bit_num); +} + +/* Return the bit number of the last set bit in the bitmap, or -1 + if the bitmap is empty. */ + +int +bitmap_last_set_bit (a) + bitmap a; +{ + bitmap_element *ptr = a->first; + BITMAP_WORD word; + unsigned word_num, bit_num; + + if (ptr == NULL) + return -1; + + while (ptr->next != NULL) + ptr = ptr->next; + +#if BITMAP_ELEMENT_WORDS == 2 + word_num = 1, word = ptr->bits[1]; + if (word == 0) + word_num = 0, word = ptr->bits[0]; +#else + for (word_num = BITMAP_ELEMENT_WORDS; word_num-- > 0; ) + if ((word = ptr->bits[word_num]) != 0) + break; +#endif + + /* Binary search for the last set bit. */ + + bit_num = 0; +#if nBITMAP_WORD_BITS > 64 + #error "Fill out the table." +#endif +#if nBITMAP_WORD_BITS > 32 + if (word & ~(BITMAP_WORD)0xffffffff) + word >>= 32, bit_num += 32; +#endif + if (word & 0xffff0000) + word >>= 16, bit_num += 16; + if (word & 0xff00) + word >>= 8, bit_num += 8; + if (word & 0xf0) + word >>= 4, bit_num += 4; + if (word & 0xc) + word >>= 2, bit_num += 2; + if (word & 0x2) + bit_num += 1; + + return (ptr->indx * BITMAP_ELEMENT_ALL_BITS + + word_num * BITMAP_WORD_BITS + + bit_num); +} + +/* Store in bitmap TO the result of combining bitmap FROM1 and FROM2 using + a specific bit manipulation. Return true if TO changes. */ + +int bitmap_operation (to, from1, from2, operation) bitmap to; bitmap from1; bitmap from2; enum bitmap_bits operation; { - bitmap_element *delete_list = 0; +#define HIGHEST_INDEX (unsigned int) ~0 + bitmap_element *from1_ptr = from1->first; bitmap_element *from2_ptr = from2->first; - unsigned int indx1 - = (from1_ptr) ? from1_ptr->indx : ~ (unsigned HOST_WIDE_INT) 0; - unsigned int indx2 - = (from2_ptr) ? from2_ptr->indx : ~ (unsigned HOST_WIDE_INT) 0; - bitmap_element *to_ptr = 0; + unsigned int indx1 = (from1_ptr) ? from1_ptr->indx : HIGHEST_INDEX; + unsigned int indx2 = (from2_ptr) ? from2_ptr->indx : HIGHEST_INDEX; + bitmap_element *to_ptr = to->first; bitmap_element *from1_tmp; bitmap_element *from2_tmp; + bitmap_element *to_tmp; unsigned int indx; - int i; + int changed = 0; - /* To simplify things, always create a new list. If the old list was one - of the inputs, free it later. Otherwise, free it now. */ - if (to == from1 || to == from2) - { - delete_list = to->first; - to->first = 0; - } - else - bitmap_clear (to); +#if BITMAP_ELEMENT_WORDS == 2 +#define DOIT(OP) \ + do { \ + BITMAP_WORD t0, t1, f10, f11, f20, f21; \ + f10 = from1_tmp->bits[0]; \ + f20 = from2_tmp->bits[0]; \ + t0 = f10 OP f20; \ + changed |= (t0 != to_tmp->bits[0]); \ + f11 = from1_tmp->bits[1]; \ + f21 = from2_tmp->bits[1]; \ + t1 = f11 OP f21; \ + changed |= (t1 != to_tmp->bits[1]); \ + to_tmp->bits[0] = t0; \ + to_tmp->bits[1] = t1; \ + } while (0) +#else +#define DOIT(OP) \ + do { \ + BITMAP_WORD t, f1, f2; \ + int i; \ + for (i = 0; i < BITMAP_ELEMENT_WORDS; ++i) \ + { \ + f1 = from1_tmp->bits[i]; \ + f2 = from2_tmp->bits[i]; \ + t = f1 OP f2; \ + changed |= (t != to_tmp->bits[i]); \ + to_tmp->bits[i] = t; \ + } \ + } while (0) +#endif + + to->first = to->current = 0; while (from1_ptr != 0 || from2_ptr != 0) { @@ -399,29 +598,43 @@ bitmap_operation (to, from1, from2, operation) from1_tmp = from1_ptr; from2_tmp = from2_ptr; from1_ptr = from1_ptr->next; - indx1 = (from1_ptr) ? from1_ptr->indx : ~ (unsigned HOST_WIDE_INT) 0; + indx1 = (from1_ptr) ? from1_ptr->indx : HIGHEST_INDEX; from2_ptr = from2_ptr->next; - indx2 = (from2_ptr) ? from2_ptr->indx : ~ (unsigned HOST_WIDE_INT) 0; + indx2 = (from2_ptr) ? from2_ptr->indx : HIGHEST_INDEX; } else if (indx1 < indx2) { indx = indx1; from1_tmp = from1_ptr; - from2_tmp = &bitmap_zero; + from2_tmp = &bitmap_zero_bits; from1_ptr = from1_ptr->next; - indx1 = (from1_ptr) ? from1_ptr->indx : ~ (unsigned HOST_WIDE_INT) 0; + indx1 = (from1_ptr) ? from1_ptr->indx : HIGHEST_INDEX; } else { indx = indx2; - from1_tmp = &bitmap_zero; + from1_tmp = &bitmap_zero_bits; from2_tmp = from2_ptr; from2_ptr = from2_ptr->next; - indx2 = (from2_ptr) ? from2_ptr->indx : ~ (unsigned HOST_WIDE_INT) 0; + indx2 = (from2_ptr) ? from2_ptr->indx : HIGHEST_INDEX; } - if (to_ptr == 0) - to_ptr = bitmap_element_allocate (to); + /* Find the appropriate element from TO. Begin by discarding + elements that we've skipped. */ + while (to_ptr && to_ptr->indx < indx) + { + changed = 1; + to_tmp = to_ptr; + to_ptr = to_ptr->next; + bitmap_elem_to_freelist (to, to_tmp); + } + if (to_ptr && to_ptr->indx == indx) + { + to_tmp = to_ptr; + to_ptr = to_ptr->next; + } + else + to_tmp = bitmap_element_allocate (to); /* Do the operation, and if any bits are set, link it into the linked list. */ @@ -431,65 +644,77 @@ bitmap_operation (to, from1, from2, operation) abort (); case BITMAP_AND: -#if BITMAP_ELEMENT_WORDS == 2 - to_ptr->bits[0] = from1_tmp->bits[0] & from2_tmp->bits[0]; - to_ptr->bits[1] = from1_tmp->bits[1] & from2_tmp->bits[1]; -#else - for (i = BITMAP_ELEMENT_WORDS - 1; i >= 0; i--) - to_ptr->bits[i] = from1_tmp->bits[i] & from2_tmp->bits[i]; -#endif + DOIT (&); break; case BITMAP_AND_COMPL: -#if BITMAP_ELEMENT_WORDS == 2 - to_ptr->bits[0] = from1_tmp->bits[0] & ~ from2_tmp->bits[0]; - to_ptr->bits[1] = from1_tmp->bits[1] & ~ from2_tmp->bits[1]; -#else - for (i = BITMAP_ELEMENT_WORDS - 1; i >= 0; i--) - to_ptr->bits[i] = from1_tmp->bits[i] & ~ from2_tmp->bits[i]; -#endif + DOIT (&~); break; case BITMAP_IOR: -#if BITMAP_ELEMENT_WORDS == 2 - to_ptr->bits[0] = from1_tmp->bits[0] | from2_tmp->bits[0]; - to_ptr->bits[1] = from1_tmp->bits[1] | from2_tmp->bits[1]; -#else - for (i = BITMAP_ELEMENT_WORDS - 1; i >= 0; i--) - to_ptr->bits[i] = from1_tmp->bits[i] | from2_tmp->bits[i]; -#endif + DOIT (|); + break; + case BITMAP_IOR_COMPL: + DOIT (|~); + break; + case BITMAP_XOR: + DOIT (^); break; } - if (! bitmap_element_zerop (to_ptr)) + if (! bitmap_element_zerop (to_tmp)) + { + to_tmp->indx = indx; + bitmap_element_link (to, to_tmp); + } + else { - to_ptr->indx = indx; - bitmap_element_link (to, to_ptr); - to_ptr = 0; + bitmap_elem_to_freelist (to, to_tmp); } } - /* If we have an unallocated element due to the last element being 0, - release it back to the free pool. Don't bother calling - bitmap_element_free since it was never linked into a bitmap. */ - if (to_ptr != 0) + /* If we have elements of TO left over, free the lot. */ + if (to_ptr) { - to_ptr->next = bitmap_free; - bitmap_free = to_ptr; + changed = 1; + for (to_tmp = to_ptr; to_tmp->next ; to_tmp = to_tmp->next) + continue; + if (to->using_obstack) + { + to_tmp->next = bitmap_free; + bitmap_free = to_ptr; + } + else + { + to_tmp->next = bitmap_ggc_free; + bitmap_ggc_free = to_ptr; + } } - /* If the output bitmap was one of the inputs, free up its - elements now that we're done. */ - for (; delete_list != 0; delete_list = to_ptr) - { - to_ptr = delete_list->next; - delete_list->next = bitmap_free; - bitmap_free = delete_list; - } +#undef DOIT + + return changed; +} + +/* Return true if two bitmaps are identical. */ + +int +bitmap_equal_p (a, b) + bitmap a; + bitmap b; +{ + bitmap_head c; + int ret; + + memset (&c, 0, sizeof (c)); + ret = ! bitmap_operation (&c, a, b, BITMAP_XOR); + bitmap_clear (&c); + + return ret; } /* Or into bitmap TO bitmap FROM1 and'ed with the complement of - bitmap FROM2. */ + bitmap FROM2. */ void bitmap_ior_and_compl (to, from1, from2) @@ -500,19 +725,45 @@ bitmap_ior_and_compl (to, from1, from2) bitmap_head tmp; tmp.first = tmp.current = 0; + tmp.using_obstack = 0; bitmap_operation (&tmp, from1, from2, BITMAP_AND_COMPL); bitmap_operation (to, to, &tmp, BITMAP_IOR); bitmap_clear (&tmp); } + +int +bitmap_union_of_diff (dst, a, b, c) + bitmap dst; + bitmap a; + bitmap b; + bitmap c; +{ + bitmap_head tmp; + int changed; + + tmp.first = tmp.current = 0; + tmp.using_obstack = 0; + + bitmap_operation (&tmp, b, c, BITMAP_AND_COMPL); + changed = bitmap_operation (dst, &tmp, a, BITMAP_IOR); + bitmap_clear (&tmp); + + return changed; +} /* Initialize a bitmap header. */ bitmap -bitmap_initialize (head) +bitmap_initialize (head, using_obstack) bitmap head; + int using_obstack; { + if (head == NULL && ! using_obstack) + head = ggc_alloc (sizeof (*head)); + head->first = head->current = 0; + head->using_obstack = using_obstack; return head; } @@ -520,33 +771,33 @@ bitmap_initialize (head) /* Debugging function to print out the contents of a bitmap. */ void -bitmap_debug_file (file, head) +debug_bitmap_file (file, head) FILE *file; bitmap head; { bitmap_element *ptr; fprintf (file, "\nfirst = "); - fprintf (file, HOST_PTR_PRINTF, (HOST_WIDE_INT) head->first); + fprintf (file, HOST_PTR_PRINTF, (PTR) head->first); fprintf (file, " current = "); - fprintf (file, HOST_PTR_PRINTF, (HOST_WIDE_INT) head->current); + fprintf (file, HOST_PTR_PRINTF, (PTR) head->current); fprintf (file, " indx = %u\n", head->indx); for (ptr = head->first; ptr; ptr = ptr->next) { - int i, j, col = 26; + unsigned int i, j, col = 26; fprintf (file, "\t"); - fprintf (file, HOST_PTR_PRINTF, (HOST_WIDE_INT) ptr); + fprintf (file, HOST_PTR_PRINTF, (PTR) ptr); fprintf (file, " next = "); - fprintf (file, HOST_PTR_PRINTF, (HOST_WIDE_INT) ptr->next); + fprintf (file, HOST_PTR_PRINTF, (PTR) ptr->next); fprintf (file, " prev = "); - fprintf (file, HOST_PTR_PRINTF, (HOST_WIDE_INT) ptr->prev); + fprintf (file, HOST_PTR_PRINTF, (PTR) ptr->prev); fprintf (file, " indx = %u\n\t\tbits = {", ptr->indx); for (i = 0; i < BITMAP_ELEMENT_WORDS; i++) - for (j = 0; j < HOST_BITS_PER_WIDE_INT; j++) - if ((ptr->bits[i] & (((unsigned HOST_WIDE_INT) 1) << j)) != 0) + for (j = 0; j < BITMAP_WORD_BITS; j++) + if ((ptr->bits[i] >> j) & 1) { if (col > 70) { @@ -555,14 +806,14 @@ bitmap_debug_file (file, head) } fprintf (file, " %u", (ptr->indx * BITMAP_ELEMENT_ALL_BITS - + i * HOST_BITS_PER_WIDE_INT + j)); + + i * BITMAP_WORD_BITS + j)); col += 4; } fprintf (file, " }\n"); } } - + /* Function to be called from the debugger to print the contents of a bitmap. */ @@ -570,14 +821,29 @@ void debug_bitmap (head) bitmap head; { - bitmap_debug_file (stdout, head); + debug_bitmap_file (stdout, head); } - -/* Release any memory allocated by bitmaps. Since we allocate off of the - function_obstack, just zap the free list. */ + +/* Function to print out the contents of a bitmap. Unlike debug_bitmap_file, + it does not print anything but the bits. */ void -bitmap_release_memory () +bitmap_print (file, head, prefix, suffix) + FILE *file; + bitmap head; + const char *prefix; + const char *suffix; { - bitmap_free = 0; + const char *comma = ""; + int i; + + fputs (prefix, file); + EXECUTE_IF_SET_IN_BITMAP (head, 0, i, + { + fprintf (file, "%s%d", comma, i); + comma = ", "; + }); + fputs (suffix, file); } + +#include "gt-bitmap.h"