CbC/CbC_gcc: gcc/bitmap.c comparison

comparison gcc/bitmap.c @ 131:84e7813d76e9

gcc-8.2

author	mir3636
date	Thu, 25 Oct 2018 07:37:49 +0900
parents	04ced10e8804
children	1830386684a0

comparison

equal deleted inserted replaced

-:04ced10e8804
+:84e7813d76e9
 /* Functions to support general ended bitmaps.
-Copyright (C) 1997-2017 Free Software Foundation, Inc.
+Copyright (C) 1997-2018 Free Software Foundation, Inc.
 This file is part of GCC.
 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
 #include "bitmap.h"
 #include "selftest.h"
 /* Memory allocation statistics purpose instance.  */
 mem_alloc_description<bitmap_usage> bitmap_mem_desc;
+static bitmap_element *bitmap_tree_listify_from (bitmap, bitmap_element *);
 /* Register new bitmap.  */
 void
 bitmap_register (bitmap b MEM_STAT_DECL)
 {
 bitmap_obstack bitmap_default_obstack;    /* The default bitmap obstack.  */
 static int bitmap_default_obstack_depth;
 static GTY((deletable)) bitmap_element *bitmap_ggc_free; /* Freelist of
 							    GC'd elements.  */
-static void bitmap_elem_to_freelist (bitmap, bitmap_element *);
-static void bitmap_element_free (bitmap, bitmap_element *);
-static bitmap_element *bitmap_element_allocate (bitmap);
-static int bitmap_element_zerop (const bitmap_element *);
-static void bitmap_element_link (bitmap, bitmap_element *);
-static bitmap_element *bitmap_elt_insert_after (bitmap, bitmap_element *, unsigned int);
-static void bitmap_elt_clear_from (bitmap, bitmap_element *);
-static bitmap_element *bitmap_find_bit (bitmap, unsigned int);
+/* Bitmap memory management.  */
-/* Add ELEM to the appropriate freelist.  */
+/* Add ELT to the appropriate freelist.  */
 static inline void
 bitmap_elem_to_freelist (bitmap head, bitmap_element *elt)
 {
 bitmap_obstack *bit_obstack = head->obstack;
+if (GATHER_STATISTICS)
+register_overhead (head, -((int)sizeof (bitmap_element)));
 elt->next = NULL;
 elt->indx = -1;
 if (bit_obstack)
 {
 elt->prev = 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 (bitmap head, bitmap_element *elt)
-{
-bitmap_element *next = elt->next;
-bitmap_element *prev = elt->prev;
-if (prev)
-prev->next = next;
-if (next)
-next->prev = prev;
-if (head->first == elt)
-head->first = next;
-/* 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;
-if (head->current)
-	head->indx = head->current->indx;
-else
-	head->indx = 0;
-}
-if (GATHER_STATISTICS)
-register_overhead (head, -((int)sizeof (bitmap_element)));
-bitmap_elem_to_freelist (head, elt);
-}
 /* Allocate a bitmap element.  The bits are cleared, but nothing else is.  */
 static inline bitmap_element *
 bitmap_element_allocate (bitmap head)
 {
 memset (element->bits, 0, sizeof (element->bits));
 return element;
 }
-/* Remove ELT and all following elements from bitmap HEAD.  */
+/* Remove ELT and all following elements from bitmap HEAD.
+Put the released elements in the freelist for HEAD.  */
 void
 bitmap_elt_clear_from (bitmap head, bitmap_element *elt)
 {
 bitmap_element *prev;
 bitmap_obstack *bit_obstack = head->obstack;
-if (!elt) return;
+if (!elt)
+return;
+if (head->tree_form)
+elt = bitmap_tree_listify_from (head, elt);
 if (GATHER_STATISTICS)
 {
 int n = 0;
 for (prev = elt; prev; prev = prev->next)
 head->first = NULL;
 head->current = NULL;
 head->indx = 0;
 }
-/* Put the entire list onto the free list in one operation. */
+/* Put the entire list onto the freelist in one operation. */
 if (bit_obstack)
 {
 elt->prev = bit_obstack->elements;
 bit_obstack->elements = elt;
 }
 {
 elt->prev = bitmap_ggc_free;
 bitmap_ggc_free = elt;
 }
 }
-/* Clear a bitmap by freeing the linked list.  */
-void
-bitmap_clear (bitmap head)
-{
-if (head->first)
-bitmap_elt_clear_from (head, head->first);
-}
-/* Initialize a bitmap obstack.  If BIT_OBSTACK is NULL, initialize
+/* Linked-list view of bitmaps.
-the default bitmap obstack.  */
+In this representation, the bitmap elements form a double-linked list
-void
+with elements sorted by increasing index.  */
-bitmap_obstack_initialize (bitmap_obstack *bit_obstack)
-{
-if (!bit_obstack)
-{
-if (bitmap_default_obstack_depth++)
-	return;
-bit_obstack = &bitmap_default_obstack;
-}
-#if !defined(__GNUC__) || (__GNUC__ < 2)
-#define __alignof__(type) 0
-#endif
-bit_obstack->elements = NULL;
-bit_obstack->heads = NULL;
-obstack_specify_allocation (&bit_obstack->obstack, OBSTACK_CHUNK_SIZE,
-			      __alignof__ (bitmap_element),
-			      obstack_chunk_alloc,
-			      obstack_chunk_free);
-}
-/* Release the memory from a bitmap obstack.  If BIT_OBSTACK is NULL,
-release the default bitmap obstack.  */
-void
-bitmap_obstack_release (bitmap_obstack *bit_obstack)
-{
-if (!bit_obstack)
-{
-if (--bitmap_default_obstack_depth)
-	{
-	  gcc_assert (bitmap_default_obstack_depth > 0);
-	  return;
-	}
-bit_obstack = &bitmap_default_obstack;
-}
-bit_obstack->elements = NULL;
-bit_obstack->heads = NULL;
-obstack_free (&bit_obstack->obstack, NULL);
-}
-/* Create a new bitmap on an obstack.  If BIT_OBSTACK is NULL, create
-it on the default bitmap obstack.  */
-bitmap
-bitmap_alloc (bitmap_obstack *bit_obstack MEM_STAT_DECL)
-{
-bitmap map;
-if (!bit_obstack)
-bit_obstack = &bitmap_default_obstack;
-map = bit_obstack->heads;
-if (map)
-bit_obstack->heads = (struct bitmap_head *) map->first;
-else
-map = XOBNEW (&bit_obstack->obstack, bitmap_head);
-bitmap_initialize (map, bit_obstack PASS_MEM_STAT);
-if (GATHER_STATISTICS)
-register_overhead (map, sizeof (bitmap_head));
-return map;
-}
-/* Create a new GCd bitmap.  */
-bitmap
-bitmap_gc_alloc (ALONE_MEM_STAT_DECL)
-{
-bitmap map;
-map = ggc_alloc<bitmap_head> ();
-bitmap_initialize (map, NULL PASS_MEM_STAT);
-if (GATHER_STATISTICS)
-register_overhead (map, sizeof (bitmap_head));
-return map;
-}
-/* Release an obstack allocated bitmap.  */
-void
-bitmap_obstack_free (bitmap map)
-{
-if (map)
-{
-bitmap_clear (map);
-map->first = (bitmap_element *) map->obstack->heads;
-if (GATHER_STATISTICS)
-	register_overhead (map, -((int)sizeof (bitmap_head)));
-map->obstack->heads = map;
-}
-}
-/* Return nonzero if all bits in an element are zero.  */
-static inline int
-bitmap_element_zerop (const bitmap_element *element)
-{
-#if BITMAP_ELEMENT_WORDS == 2
-return (element->bits[0] | element->bits[1]) == 0;
-#else
-unsigned i;
-for (i = 0; i < BITMAP_ELEMENT_WORDS; i++)
-if (element->bits[i] != 0)
-return 0;
-return 1;
-#endif
-}
 /* Link the bitmap element into the current bitmap linked list.  */
 static inline void
-bitmap_element_link (bitmap head, bitmap_element *element)
+bitmap_list_link_element (bitmap head, bitmap_element *element)
 {
 unsigned int indx = element->indx;
 bitmap_element *ptr;
+gcc_checking_assert (!head->tree_form);
 /* If this is the first and only element, set it in.  */
 if (head->first == 0)
 {
 element->next = element->prev = 0;
 /* Set up so this is the first element searched.  */
 head->current = element;
 head->indx = indx;
 }
+/* Unlink the bitmap element from the current bitmap linked list,
+and return it to the freelist.  */
+static inline void
+bitmap_list_unlink_element (bitmap head, bitmap_element *element)
+{
+bitmap_element *next = element->next;
+bitmap_element *prev = element->prev;
+gcc_checking_assert (!head->tree_form);
+if (prev)
+prev->next = next;
+if (next)
+next->prev = prev;
+if (head->first == element)
+head->first = next;
+/* Since the first thing we try is to insert before current,
+make current the next entry in preference to the previous.  */
+if (head->current == element)
+{
+head->current = next != 0 ? next : prev;
+if (head->current)
+	head->indx = head->current->indx;
+else
+	head->indx = 0;
+}
+bitmap_elem_to_freelist (head, element);
+}
 /* Insert a new uninitialized element into bitmap HEAD after element
 ELT.  If ELT is NULL, insert the element at the start.  Return the
 new element.  */
 static bitmap_element *
-bitmap_elt_insert_after (bitmap head, bitmap_element *elt, unsigned int indx)
+bitmap_list_insert_element_after (bitmap head,
+				  bitmap_element *elt, unsigned int indx)
 {
 bitmap_element *node = bitmap_element_allocate (head);
 node->indx = indx;
+gcc_checking_assert (!head->tree_form);
 if (!elt)
 {
 if (!head->current)
 	{
 elt->next = node;
 node->prev = elt;
 }
 return node;
 }
-/* Copy a bitmap to another bitmap.  */
+/* Return the element for INDX, or NULL if the element doesn't exist.
+Update the `current' field even if we can't find an element that
-void
-bitmap_copy (bitmap to, const_bitmap from)
-{
-const bitmap_element *from_ptr;
-bitmap_element *to_ptr = 0;
-bitmap_clear (to);
-/* Copy elements in forward direction one at a time.  */
-for (from_ptr = from->first; from_ptr; from_ptr = from_ptr->next)
-{
-bitmap_element *to_elt = bitmap_element_allocate (to);
-to_elt->indx = from_ptr->indx;
-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.  */
-if (to_ptr == 0)
-	{
-	  to->first = to->current = to_elt;
-	  to->indx = from_ptr->indx;
-	  to_elt->next = to_elt->prev = 0;
-	}
-else
-	{
-	  to_elt->prev = to_ptr;
-	  to_elt->next = 0;
-	  to_ptr->next = to_elt;
-	}
-to_ptr = to_elt;
-}
-}
-/* Move a bitmap to another bitmap.  */
-void
-bitmap_move (bitmap to, bitmap from)
-{
-gcc_assert (to->obstack == from->obstack);
-bitmap_clear (to);
-*to = *from;
-if (GATHER_STATISTICS)
-{
-size_t sz = 0;
-for (bitmap_element *e = to->first; e; e = e->next)
-	sz += sizeof (bitmap_element);
-register_overhead (to, sz);
-register_overhead (from, -sz);
-}
-}
-/* Find a bitmap element that would hold a bitmap's bit.
-Update the `current' field even if we can't find an element that
 would hold the bitmap's bit to make eventual allocation
 faster.  */
 static inline bitmap_element *
-bitmap_find_bit (bitmap head, unsigned int bit)
+bitmap_list_find_element (bitmap head, unsigned int indx)
 {
 bitmap_element *element;
-unsigned int indx = bit / BITMAP_ELEMENT_ALL_BITS;
 if (head->current == NULL
 || head->indx == indx)
 return head->current;
 if (head->current == head->first
 && head->first->next == NULL)
 return NULL;
 /* Usage can be NULL due to allocated bitmaps for which we do not
 /* 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)
-if (GATHER_STATISTICS && usage)
+{
-	{
+	if (GATHER_STATISTICS && usage)
 	  usage->m_search_iter++;
-	}
+}
 /* `element' is the nearest to the one we want.  If it's not the one we
 want, the one we want doesn't exist.  */
+gcc_checking_assert (element != NULL);
 head->current = element;
 head->indx = element->indx;
 if (element->indx != indx)
 element = 0;
 return element;
+}
+/* Splay-tree view of bitmaps.
+This is an almost one-to-one the implementatin of the simple top-down
+splay tree in Sleator and Tarjan's "Self-adjusting Binary Search Trees".
+It is probably not the most efficient form of splay trees, but it should
+be good enough to experiment with this idea of bitmaps-as-trees.
+For all functions below, the variable or function argument "t" is a node
+in the tree, and "e" is a temporary or new node in the tree.  The rest
+is sufficiently straigh-forward (and very well explained in the paper)
+that comment would only clutter things.  */
+static inline void
+bitmap_tree_link_left (bitmap_element * &t, bitmap_element * &l)
+{
+l->next = t;
+l = t;
+t = t->next;
+}
+static inline void
+bitmap_tree_link_right (bitmap_element * &t, bitmap_element * &r)
+{
+r->prev = t;
+r = t;
+t = t->prev;
+}
+static inline void
+bitmap_tree_rotate_left (bitmap_element * &t)
+{
+bitmap_element *e = t->next;
+t->next = t->next->prev;
+e->prev = t;
+t = e;
+}
+static inline void
+bitmap_tree_rotate_right (bitmap_element * &t)
+{
+bitmap_element *e = t->prev;
+t->prev = t->prev->next;
+e->next = t;
+t = e;
+}
+static bitmap_element *
+bitmap_tree_splay (bitmap head, bitmap_element *t, unsigned int indx)
+{
+bitmap_element N, *l, *r;
+if (t == NULL)
+return NULL;
+bitmap_usage *usage = NULL;
+if (GATHER_STATISTICS)
+usage = bitmap_mem_desc.get_descriptor_for_instance (head);
+N.prev = N.next = NULL;
+l = r = &N;
+while (indx != t->indx)
+{
+if (GATHER_STATISTICS && usage)
+	usage->m_search_iter++;
+if (indx < t->indx)
+	{
+	  if (t->prev != NULL && indx < t->prev->indx)
+	    bitmap_tree_rotate_right (t);
+	  if (t->prev == NULL)
+	    break;
+	  bitmap_tree_link_right (t, r);
+	}
+else if (indx > t->indx)
+	{
+	  if (t->next != NULL && indx > t->next->indx)
+	    bitmap_tree_rotate_left (t);
+	  if (t->next == NULL)
+	    break;
+	  bitmap_tree_link_left (t, l);
+	}
+}
+l->next = t->prev;
+r->prev = t->next;
+t->prev = N.next;
+t->next = N.prev;
+return t;
+}
+/* Link bitmap element E into the current bitmap splay tree.  */
+static inline void
+bitmap_tree_link_element (bitmap head, bitmap_element *e)
+{
+if (head->first == NULL)
+e->prev = e->next = NULL;
+else
+{
+bitmap_element *t = bitmap_tree_splay (head, head->first, e->indx);
+if (e->indx < t->indx)
+	{
+	  e->prev = t->prev;
+	  e->next = t;
+	  t->prev = NULL;
+	}
+else if (e->indx > t->indx)
+	{
+	  e->next = t->next;
+	  e->prev = t;
+	  t->next = NULL;
+	}
+else
+	gcc_unreachable ();
+}
+head->first = e;
+head->current = e;
+head->indx = e->indx;
+}
+/* Unlink bitmap element E from the current bitmap splay tree,
+and return it to the freelist.  */
+static void
+bitmap_tree_unlink_element (bitmap head, bitmap_element *e)
+{
+bitmap_element *t = bitmap_tree_splay (head, head->first, e->indx);
+gcc_checking_assert (t == e);
+if (e->prev == NULL)
+t = e->next;
+else
+{
+t = bitmap_tree_splay (head, e->prev, e->indx);
+t->next = e->next;
+}
+head->first = t;
+head->current = t;
+head->indx = (t != NULL) ? t->indx : 0;
+bitmap_elem_to_freelist (head, e);
+}
+/* Return the element for INDX, or NULL if the element doesn't exist.  */
+static inline bitmap_element *
+bitmap_tree_find_element (bitmap head, unsigned int indx)
+{
+if (head->current == NULL
+|| head->indx == indx)
+return head->current;
+/* Usage can be NULL due to allocated bitmaps for which we do not
+call initialize function.  */
+bitmap_usage *usage = NULL;
+if (GATHER_STATISTICS)
+usage = bitmap_mem_desc.get_descriptor_for_instance (head);
+/* This bitmap has more than one element, and we're going to look
+through the elements list.  Count that as a search.  */
+if (GATHER_STATISTICS && usage)
+usage->m_nsearches++;
+bitmap_element *element = bitmap_tree_splay (head, head->first, indx);
+gcc_checking_assert (element != NULL);
+head->first = element;
+head->current = element;
+head->indx = element->indx;
+if (element->indx != indx)
+element = 0;
+return element;
+}
+/* Converting bitmap views from linked-list to tree and vice versa.  */
+/* Splice element E and all elements with a larger index from
+bitmap HEAD, convert the spliced elements to the linked-list
+view, and return the head of the list (which should be E again),  */
+static bitmap_element *
+bitmap_tree_listify_from (bitmap head, bitmap_element *e)
+{
+bitmap_element *t, *erb;
+/* Detach the right branch from E (all elements with indx > E->indx),
+and splay E to the root.  */
+erb = e->next;
+e->next = NULL;
+t = bitmap_tree_splay (head, head->first, e->indx);
+gcc_checking_assert (t == e);
+/* Because E has no right branch, and we rotated it to the root,
+the left branch is the new root.  */
+t = e->prev;
+head->first = t;
+head->current = t;
+head->indx = (t != NULL) ? t->indx : 0;
+/* Detach the tree from E, and re-attach the right branch of E.  */
+e->prev = NULL;
+e->next = erb;
+/* The tree is now valid again.  Now we need to "un-tree" E.
+It is imperative that a non-recursive implementation is used
+for this, because splay trees have a worst case depth of O(N)
+for a tree with N nodes.  A recursive implementation could
+result in a stack overflow for a sufficiently large, unbalanced
+bitmap tree.  */
+auto_vec<bitmap_element *, 32> stack;
+auto_vec<bitmap_element *, 32> sorted_elements;
+bitmap_element *n = e;
+while (true)
+{
+while (n != NULL)
+	{
+	  stack.safe_push (n);
+	  n = n->prev;
+	}
+if (stack.is_empty ())
+	break;
+n = stack.pop ();
+sorted_elements.safe_push (n);
+n = n->next;
+}
+gcc_assert (sorted_elements[0] == e);
+bitmap_element *prev = NULL;
+unsigned ix;
+FOR_EACH_VEC_ELT (sorted_elements, ix, n)
+{
+if (prev != NULL)
+prev->next = n;
+n->prev = prev;
+n->next = NULL;
+prev = n;
+}
+return e;
+}
+/* Convert bitmap HEAD from splay-tree view to linked-list view.  */
+void
+bitmap_list_view (bitmap head)
+{
+bitmap_element *ptr;
+gcc_assert (head->tree_form);
+ptr = head->first;
+if (ptr)
+{
+while (ptr->prev)
+	bitmap_tree_rotate_right (ptr);
+head->first = ptr;
+head->first = bitmap_tree_listify_from (head, ptr);
+}
+head->tree_form = false;
+}
+/* Convert bitmap HEAD from linked-list view to splay-tree view.
+This is simply a matter of dropping the prev or next pointers
+and setting the tree_form flag.  The tree will balance itself
+if and when it is used.  */
+void
+bitmap_tree_view (bitmap head)
+{
+bitmap_element *ptr;
+gcc_assert (! head->tree_form);
+ptr = head->first;
+while (ptr)
+{
+ptr->prev = NULL;
+ptr = ptr->next;
+}
+head->tree_form = true;
+}
+/* Clear a bitmap by freeing all its elements.  */
+void
+bitmap_clear (bitmap head)
+{
+if (head->first == NULL)
+return;
+if (head->tree_form)
+{
+bitmap_element *e, *t;
+for (e = head->first; e->prev; e = e->prev)
+	/* Loop to find the element with the smallest index.  */ ;
+t = bitmap_tree_splay (head, head->first, e->indx);
+gcc_checking_assert (t == e);
+head->first = t;
+}
+bitmap_elt_clear_from (head, head->first);
+}
+/* Initialize a bitmap obstack.  If BIT_OBSTACK is NULL, initialize
+the default bitmap obstack.  */
+void
+bitmap_obstack_initialize (bitmap_obstack *bit_obstack)
+{
+if (!bit_obstack)
+{
+if (bitmap_default_obstack_depth++)
+	return;
+bit_obstack = &bitmap_default_obstack;
+}
+#if !defined(__GNUC__) || (__GNUC__ < 2)
+#define __alignof__(type) 0
+#endif
+bit_obstack->elements = NULL;
+bit_obstack->heads = NULL;
+obstack_specify_allocation (&bit_obstack->obstack, OBSTACK_CHUNK_SIZE,
+			      __alignof__ (bitmap_element),
+			      obstack_chunk_alloc,
+			      obstack_chunk_free);
+}
+/* Release the memory from a bitmap obstack.  If BIT_OBSTACK is NULL,
+release the default bitmap obstack.  */
+void
+bitmap_obstack_release (bitmap_obstack *bit_obstack)
+{
+if (!bit_obstack)
+{
+if (--bitmap_default_obstack_depth)
+	{
+	  gcc_assert (bitmap_default_obstack_depth > 0);
+	  return;
+	}
+bit_obstack = &bitmap_default_obstack;
+}
+bit_obstack->elements = NULL;
+bit_obstack->heads = NULL;
+obstack_free (&bit_obstack->obstack, NULL);
+}
+/* Create a new bitmap on an obstack.  If BIT_OBSTACK is NULL, create
+it on the default bitmap obstack.  */
+bitmap
+bitmap_alloc (bitmap_obstack *bit_obstack MEM_STAT_DECL)
+{
+bitmap map;
+if (!bit_obstack)
+bit_obstack = &bitmap_default_obstack;
+map = bit_obstack->heads;
+if (map)
+bit_obstack->heads = (struct bitmap_head *) map->first;
+else
+map = XOBNEW (&bit_obstack->obstack, bitmap_head);
+bitmap_initialize (map, bit_obstack PASS_MEM_STAT);
+if (GATHER_STATISTICS)
+register_overhead (map, sizeof (bitmap_head));
+return map;
+}
+/* Create a new GCd bitmap.  */
+bitmap
+bitmap_gc_alloc (ALONE_MEM_STAT_DECL)
+{
+bitmap map;
+map = ggc_alloc<bitmap_head> ();
+bitmap_initialize (map, NULL PASS_MEM_STAT);
+if (GATHER_STATISTICS)
+register_overhead (map, sizeof (bitmap_head));
+return map;
+}
+/* Release an obstack allocated bitmap.  */
+void
+bitmap_obstack_free (bitmap map)
+{
+if (map)
+{
+bitmap_clear (map);
+map->first = (bitmap_element *) map->obstack->heads;
+if (GATHER_STATISTICS)
+	register_overhead (map, -((int)sizeof (bitmap_head)));
+map->obstack->heads = map;
+}
+}
+/* Return nonzero if all bits in an element are zero.  */
+static inline int
+bitmap_element_zerop (const bitmap_element *element)
+{
+#if BITMAP_ELEMENT_WORDS == 2
+return (element->bits[0] | element->bits[1]) == 0;
+#else
+unsigned i;
+for (i = 0; i < BITMAP_ELEMENT_WORDS; i++)
+if (element->bits[i] != 0)
+return 0;
+return 1;
+#endif
+}
+/* Copy a bitmap to another bitmap.  */
+void
+bitmap_copy (bitmap to, const_bitmap from)
+{
+const bitmap_element *from_ptr;
+bitmap_element *to_ptr = 0;
+gcc_checking_assert (!to->tree_form && !from->tree_form);
+bitmap_clear (to);
+/* Copy elements in forward direction one at a time.  */
+for (from_ptr = from->first; from_ptr; from_ptr = from_ptr->next)
+{
+bitmap_element *to_elt = bitmap_element_allocate (to);
+to_elt->indx = from_ptr->indx;
+memcpy (to_elt->bits, from_ptr->bits, sizeof (to_elt->bits));
+/* Here we have a special case of bitmap_list_link_element,
+for the case where we know the links are being entered
+	 in sequence.  */
+if (to_ptr == 0)
+	{
+	  to->first = to->current = to_elt;
+	  to->indx = from_ptr->indx;
+	  to_elt->next = to_elt->prev = 0;
+	}
+else
+	{
+	  to_elt->prev = to_ptr;
+	  to_elt->next = 0;
+	  to_ptr->next = to_elt;
+	}
+to_ptr = to_elt;
+}
+}
+/* Move a bitmap to another bitmap.  */
+void
+bitmap_move (bitmap to, bitmap from)
+{
+gcc_assert (to->obstack == from->obstack);
+bitmap_clear (to);
+*to = *from;
+if (GATHER_STATISTICS)
+{
+size_t sz = 0;
+for (bitmap_element *e = to->first; e; e = e->next)
+	sz += sizeof (bitmap_element);
+register_overhead (to, sz);
+register_overhead (from, -sz);
+}
 }
 /* Clear a single bit in a bitmap.  Return true if the bit changed.  */
 bool
 bitmap_clear_bit (bitmap head, int bit)
 {
-bitmap_element *const ptr = bitmap_find_bit (head, bit);
+unsigned int indx = bit / BITMAP_ELEMENT_ALL_BITS;
+bitmap_element *ptr;
+if (!head->tree_form)
+ptr = bitmap_list_find_element (head, indx);
+else
+ptr = bitmap_tree_find_element (head, indx);
 if (ptr != 0)
 {
 unsigned bit_num  = bit % BITMAP_WORD_BITS;
 unsigned word_num = bit / BITMAP_WORD_BITS % BITMAP_ELEMENT_WORDS;
 BITMAP_WORD bit_val = ((BITMAP_WORD) 1) << bit_num;
 	{
 	  ptr->bits[word_num] &= ~bit_val;
 	  /* If we cleared the entire word, free up the element.  */
 	  if (!ptr->bits[word_num]
 	      && bitmap_element_zerop (ptr))
-	    bitmap_element_free (head, ptr);
+	    {
+	      if (!head->tree_form)
+		bitmap_list_unlink_element (head, ptr);
+	      else
+		bitmap_tree_unlink_element (head, ptr);
+	    }
 	}
 return res;
 }
 /* Set a single bit in a bitmap.  Return true if the bit changed.  */
 bool
 bitmap_set_bit (bitmap head, int bit)
 {
-bitmap_element *ptr = bitmap_find_bit (head, bit);
+unsigned indx = bit / BITMAP_ELEMENT_ALL_BITS;
+bitmap_element *ptr;
+if (!head->tree_form)
+ptr = bitmap_list_find_element (head, indx);
+else
+ptr = bitmap_tree_find_element (head, indx);
 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)
+if (ptr != 0)
-{
-ptr = bitmap_element_allocate (head);
-ptr->indx = bit / BITMAP_ELEMENT_ALL_BITS;
-ptr->bits[word_num] = bit_val;
-bitmap_element_link (head, ptr);
-return true;
-}
-else
 {
 bool res = (ptr->bits[word_num] & bit_val) == 0;
 if (res)
 	ptr->bits[word_num] |= bit_val;
 return res;
 }
+ptr = bitmap_element_allocate (head);
+ptr->indx = bit / BITMAP_ELEMENT_ALL_BITS;
+ptr->bits[word_num] = bit_val;
+if (!head->tree_form)
+bitmap_list_link_element (head, ptr);
+else
+bitmap_tree_link_element (head, ptr);
+return true;
 }
 /* Return whether a bit is set within a bitmap.  */
 int
 bitmap_bit_p (bitmap head, int bit)
 {
+unsigned int indx = bit / BITMAP_ELEMENT_ALL_BITS;
 bitmap_element *ptr;
 unsigned bit_num;
 unsigned word_num;
-ptr = bitmap_find_bit (head, bit);
+if (!head->tree_form)
+ptr = bitmap_list_find_element (head, indx);
+else
+ptr = bitmap_tree_find_element (head, indx);
 if (ptr == 0)
 return 0;
 bit_num = bit % BITMAP_WORD_BITS;
 word_num = bit / BITMAP_WORD_BITS % BITMAP_ELEMENT_WORDS;
 bitmap_count_bits (const_bitmap a)
 {
 unsigned long count = 0;
 const bitmap_element *elt;
+gcc_checking_assert (!a->tree_form);
 for (elt = a->first; elt; elt = elt->next)
 count += bitmap_count_bits_in_word (elt->bits);
 return count;
 }
 if (bitmap_empty_p (a))
 return false;
 elt = a->first;
 /* As there are no completely empty bitmap elements, a second one
 means we have more than one bit set.  */
-if (elt->next != NULL)
+if (elt->next != NULL
+&& (!a->tree_form || elt->prev != NULL))
 return false;
 for (ix = 0; ix != BITMAP_ELEMENT_WORDS; ix++)
 {
 #if GCC_VERSION >= 3400
 unsigned bit_no;
 BITMAP_WORD word;
 unsigned ix;
 gcc_checking_assert (elt);
+if (a->tree_form)
+while (elt->prev)
+elt = elt->prev;
 bit_no = elt->indx * BITMAP_ELEMENT_ALL_BITS;
 for (ix = 0; ix != BITMAP_ELEMENT_WORDS; ix++)
 {
 word = elt->bits[ix];
 if (word)
 bitmap must be non-empty.  */
 unsigned
 bitmap_last_set_bit (const_bitmap a)
 {
-const bitmap_element *elt = a->current ? a->current : a->first;
+const bitmap_element *elt;
 unsigned bit_no;
 BITMAP_WORD word;
 int ix;
+if (a->tree_form)
+elt = a->first;
+else
+elt = a->current ? a->current : a->first;
 gcc_checking_assert (elt);
 while (elt->next)
 elt = elt->next;
 bit_no = elt->indx * BITMAP_ELEMENT_ALL_BITS;
 for (ix = BITMAP_ELEMENT_WORDS - 1; ix >= 0; ix--)
 {
 word = elt->bits[ix];
 if (word)
 bitmap_element *dst_elt = dst->first;
 const bitmap_element *a_elt = a->first;
 const bitmap_element *b_elt = b->first;
 bitmap_element *dst_prev = NULL;
+gcc_checking_assert (!dst->tree_form && !a->tree_form && !b->tree_form);
 gcc_assert (dst != a && dst != b);
 if (a == b)
 {
 bitmap_copy (dst, a);
 	  /* Matching elts, generate A & B.  */
 	  unsigned ix;
 	  BITMAP_WORD ior = 0;
 	  if (!dst_elt)
-	    dst_elt = bitmap_elt_insert_after (dst, dst_prev, a_elt->indx);
+	    dst_elt = bitmap_list_insert_element_after (dst, dst_prev,
+							a_elt->indx);
 	  else
 	    dst_elt->indx = a_elt->indx;
 	  for (ix = 0; ix < BITMAP_ELEMENT_WORDS; ix++)
 	    {
 	      BITMAP_WORD r = a_elt->bits[ix] & b_elt->bits[ix];
 bitmap_element *a_elt = a->first;
 const bitmap_element *b_elt = b->first;
 bitmap_element *next;
 bool changed = false;
+gcc_checking_assert (!a->tree_form && !b->tree_form);
 if (a == b)
 return false;
 while (a_elt && b_elt)
 {
 if (a_elt->indx < b_elt->indx)
 	{
 	  next = a_elt->next;
-	  bitmap_element_free (a, a_elt);
+	  bitmap_list_unlink_element (a, a_elt);
 	  a_elt = next;
 	  changed = true;
 	}
 else if (b_elt->indx < a_elt->indx)
 	b_elt = b_elt->next;
 	      a_elt->bits[ix] = r;
 	      ior |= r;
 	    }
 	  next = a_elt->next;
 	  if (!ior)
-	    bitmap_element_free (a, a_elt);
+	    bitmap_list_unlink_element (a, a_elt);
 	  a_elt = next;
 	  b_elt = b_elt->next;
 	}
 }
 }
 else
 {
 changed = true;
 if (!dst_elt)
-	dst_elt = bitmap_elt_insert_after (dst, dst_prev, src_elt->indx);
+	dst_elt = bitmap_list_insert_element_after (dst, dst_prev,
+						    src_elt->indx);
 else
 	dst_elt->indx = src_elt->indx;
 memcpy (dst_elt->bits, src_elt->bits, sizeof (dst_elt->bits));
 }
 return changed;
 const bitmap_element *b_elt = b->first;
 bitmap_element *dst_prev = NULL;
 bitmap_element **dst_prev_pnext = &dst->first;
 bool changed = false;
+gcc_checking_assert (!dst->tree_form && !a->tree_form && !b->tree_form);
 gcc_assert (dst != a && dst != b);
 if (a == b)
 {
 changed = !bitmap_empty_p (dst);
 	  else
 	    {
 	      bool new_element;
 	      if (!dst_elt || dst_elt->indx > a_elt->indx)
 		{
-		  dst_elt = bitmap_elt_insert_after (dst, dst_prev, a_elt->indx);
+		  dst_elt = bitmap_list_insert_element_after (dst, dst_prev,
+							      a_elt->indx);
 		  new_element = true;
 		}
 	      else
 		{
 		  dst_elt->indx = a_elt->indx;
 	      if (ior)
 	        changed = true;
 	      else
 	        {
 	          changed |= !new_element;
-		  bitmap_element_free (dst, dst_elt);
+		  bitmap_list_unlink_element (dst, dst_elt);
 		  dst_elt = *dst_prev_pnext;
 		}
 	    }
 	  if (ior)
 {
 bitmap_element *a_elt = a->first;
 const bitmap_element *b_elt = b->first;
 bitmap_element *next;
 BITMAP_WORD changed = 0;
+gcc_checking_assert (!a->tree_form && !b->tree_form);
 if (a == b)
 {
 if (bitmap_empty_p (a))
 	return false;
 	      changed |= cleared;
 	      ior |= r;
 	    }
 	  next = a_elt->next;
 	  if (!ior)
-	    bitmap_element_free (a, a_elt);
+	    bitmap_list_unlink_element (a, a_elt);
 	  a_elt = next;
 	  b_elt = b_elt->next;
 	}
 }
 gcc_checking_assert (!a->current == !a->first
 {
 unsigned int first_index, end_bit_plus1, last_index;
 bitmap_element *elt, *elt_prev;
 unsigned int i;
+gcc_checking_assert (!head->tree_form);
 if (!count)
 return;
 if (count == 1)
 {
 }
 first_index = start / BITMAP_ELEMENT_ALL_BITS;
 end_bit_plus1 = start + count;
 last_index = (end_bit_plus1 - 1) / BITMAP_ELEMENT_ALL_BITS;
-elt = bitmap_find_bit (head, start);
+elt = bitmap_list_find_element (head, first_index);
-/* If bitmap_find_bit returns zero, the current is the closest block
+/* If bitmap_list_find_element returns zero, the current is the closest block
 to the result.  Otherwise, just use bitmap_element_allocate to
 ensure ELT is set; in the loop below, ELT == NULL means "insert
 at the end of the bitmap".  */
 if (!elt)
 {
 elt = bitmap_element_allocate (head);
 elt->indx = first_index;
-bitmap_element_link (head, elt);
+bitmap_list_link_element (head, elt);
 }
 gcc_checking_assert (elt->indx == first_index);
 elt_prev = elt->prev;
 for (i = first_index; i <= last_index; i++)
 unsigned int last_word_to_mod;
 BITMAP_WORD last_mask;
 unsigned int ix;
 if (!elt || elt->indx != i)
-	elt = bitmap_elt_insert_after (head, elt_prev, i);
+	elt = bitmap_list_insert_element_after (head, elt_prev, i);
 if (elt_start_bit <= start)
 	{
 	  /* The first bit to turn on is somewhere inside this
 	     elt.  */
 bitmap_clear_range (bitmap head, unsigned int start, unsigned int count)
 {
 unsigned int first_index, end_bit_plus1, last_index;
 bitmap_element *elt;
+gcc_checking_assert (!head->tree_form);
 if (!count)
 return;
 if (count == 1)
 {
 }
 first_index = start / BITMAP_ELEMENT_ALL_BITS;
 end_bit_plus1 = start + count;
 last_index = (end_bit_plus1 - 1) / BITMAP_ELEMENT_ALL_BITS;
-elt = bitmap_find_bit (head, start);
+elt = bitmap_list_find_element (head, first_index);
-/* If bitmap_find_bit returns zero, the current is the closest block
+/* If bitmap_list_find_element returns zero, the current is the closest block
 to the result.  If the current is less than first index, find the
 next one.  Otherwise, just set elt to be current.  */
 if (!elt)
 {
 if (head->current)
 unsigned elt_end_bit_plus1 = elt_start_bit + BITMAP_ELEMENT_ALL_BITS;
 if (elt_start_bit >= start && elt_end_bit_plus1 <= end_bit_plus1)
 	/* Get rid of the entire elt and go to the next one.  */
-	bitmap_element_free (head, elt);
+	bitmap_list_unlink_element (head, elt);
 else
 	{
 	  /* Going to have to knock out some bits in this elt.  */
 	  unsigned int first_word_to_mod;
 	  BITMAP_WORD first_mask;
 		clear = false;
 		break;
 	      }
 	  /* Check to see if there are any bits left.  */
 	  if (clear)
-	    bitmap_element_free (head, elt);
+	    bitmap_list_unlink_element (head, elt);
 	}
 elt = next_elt;
 }
 if (elt)
 bitmap_element *a_elt = a->first;
 const bitmap_element *b_elt = b->first;
 bitmap_element *a_prev = NULL;
 bitmap_element *next;
+gcc_checking_assert (!a->tree_form && !b->tree_form);
 gcc_assert (a != b);
 if (bitmap_empty_p (a))
 {
 bitmap_copy (a, b);
 if (!b_elt || (a_elt && a_elt->indx < b_elt->indx))
 	{
 	  /* A is before B.  Remove A */
 	  next = a_elt->next;
 	  a_prev = a_elt->prev;
-	  bitmap_element_free (a, a_elt);
+	  bitmap_list_unlink_element (a, a_elt);
 	  a_elt = next;
 	}
 else if (!a_elt || b_elt->indx < a_elt->indx)
 	{
 	  /* B is before A.  Copy B. */
-	  next = bitmap_elt_insert_after (a, a_prev, b_elt->indx);
+	  next = bitmap_list_insert_element_after (a, a_prev, b_elt->indx);
 	  memcpy (next->bits, b_elt->bits, sizeof (next->bits));
 	  a_prev = next;
 	  b_elt = b_elt->next;
 	}
 else
 	      a_elt->bits[ix] = r;
 	      ior |= r;
 	    }
 	  next = a_elt->next;
 	  if (!ior)
-	    bitmap_element_free (a, a_elt);
+	    bitmap_list_unlink_element (a, a_elt);
 	  else
 	    a_prev = a_elt;
 	  a_elt = next;
 	  b_elt = b_elt->next;
 	}
 	}
 else
 	{
 	  changed = true;
 	  if (!dst_elt)
-	    dst_elt = bitmap_elt_insert_after (dst, dst_prev, a_elt->indx);
+	    dst_elt = bitmap_list_insert_element_after (dst, dst_prev,
+							a_elt->indx);
 	  else
 	    dst_elt->indx = a_elt->indx;
 	  for (ix = 0; ix < BITMAP_ELEMENT_WORDS; ix++)
 	    {
 	      BITMAP_WORD r = a_elt->bits[ix] | b_elt->bits[ix];
 const bitmap_element *b_elt = b->first;
 bitmap_element *dst_prev = NULL;
 bitmap_element **dst_prev_pnext = &dst->first;
 bool changed = false;
+gcc_checking_assert (!dst->tree_form && !a->tree_form && !b->tree_form);
 gcc_assert (dst != a && dst != b);
 while (a_elt || b_elt)
 {
 changed = bitmap_elt_ior (dst, dst_elt, dst_prev, a_elt, b_elt, changed);
 const bitmap_element *b_elt = b->first;
 bitmap_element *a_prev = NULL;
 bitmap_element **a_prev_pnext = &a->first;
 bool changed = false;
+gcc_checking_assert (!a->tree_form && !b->tree_form);
 if (a == b)
 return false;
 while (b_elt)
 {
 bitmap_element *dst_elt = dst->first;
 const bitmap_element *a_elt = a->first;
 const bitmap_element *b_elt = b->first;
 bitmap_element *dst_prev = NULL;
+gcc_checking_assert (!dst->tree_form && !a->tree_form && !b->tree_form);
 gcc_assert (dst != a && dst != b);
 if (a == b)
 {
 bitmap_clear (dst);
 return;
 }
 	  /* Matching elts, generate A ^ B.  */
 	  unsigned ix;
 	  BITMAP_WORD ior = 0;
 	  if (!dst_elt)
-	    dst_elt = bitmap_elt_insert_after (dst, dst_prev, a_elt->indx);
+	    dst_elt = bitmap_list_insert_element_after (dst, dst_prev,
+							a_elt->indx);
 	  else
 	    dst_elt->indx = a_elt->indx;
 	  for (ix = 0; ix < BITMAP_ELEMENT_WORDS; ix++)
 	    {
 	      BITMAP_WORD r = a_elt->bits[ix] ^ b_elt->bits[ix];
 	      src = b_elt;
 	      b_elt = b_elt->next;
 	    }
 	  if (!dst_elt)
-	    dst_elt = bitmap_elt_insert_after (dst, dst_prev, src->indx);
+	    dst_elt = bitmap_list_insert_element_after (dst, dst_prev,
+							src->indx);
 	  else
 	    dst_elt->indx = src->indx;
 	  memcpy (dst_elt->bits, src->bits, sizeof (dst_elt->bits));
 	  dst_prev = dst_elt;
 	  dst_elt = dst_elt->next;
 {
 bitmap_element *a_elt = a->first;
 const bitmap_element *b_elt = b->first;
 bitmap_element *a_prev = NULL;
+gcc_checking_assert (!a->tree_form && !b->tree_form);
 if (a == b)
 {
 bitmap_clear (a);
 return;
 }
 while (b_elt)
 {
 if (!a_elt || b_elt->indx < a_elt->indx)
 	{
 	  /* Copy b_elt.  */
-	  bitmap_element *dst = bitmap_elt_insert_after (a, a_prev, b_elt->indx);
+	  bitmap_element *dst = bitmap_list_insert_element_after (a, a_prev,
+								  b_elt->indx);
 	  memcpy (dst->bits, b_elt->bits, sizeof (dst->bits));
 	  a_prev = dst;
 	  b_elt = b_elt->next;
 	}
 else if (a_elt->indx < b_elt->indx)
 	    }
 	  b_elt = b_elt->next;
 	  if (ior)
 	    a_prev = a_elt;
 	  else
-	    bitmap_element_free (a, a_elt);
+	    bitmap_list_unlink_element (a, a_elt);
 	  a_elt = next;
 	}
 }
 gcc_checking_assert (!a->current == !a->first);
 if (a->current)
 bitmap_equal_p (const_bitmap a, const_bitmap b)
 {
 const bitmap_element *a_elt;
 const bitmap_element *b_elt;
 unsigned ix;
+gcc_checking_assert (!a->tree_form && !b->tree_form);
 for (a_elt = a->first, b_elt = b->first;
 a_elt && b_elt;
 a_elt = a_elt->next, b_elt = b_elt->next)
 {
 {
 const bitmap_element *a_elt;
 const bitmap_element *b_elt;
 unsigned ix;
+gcc_checking_assert (!a->tree_form && !b->tree_form);
 for (a_elt = a->first, b_elt = b->first;
 a_elt && b_elt;)
 {
 if (a_elt->indx < b_elt->indx)
 	a_elt = a_elt->next;
 bitmap_intersect_compl_p (const_bitmap a, const_bitmap b)
 {
 const bitmap_element *a_elt;
 const bitmap_element *b_elt;
 unsigned ix;
+gcc_checking_assert (!a->tree_form && !b->tree_form);
 for (a_elt = a->first, b_elt = b->first;
 a_elt && b_elt;)
 {
 if (a_elt->indx < b_elt->indx)
 	return true;
 const bitmap_element *b_elt = b->first;
 const bitmap_element *kill_elt = kill->first;
 bitmap_element *dst_prev = NULL;
 bitmap_element **dst_prev_pnext = &dst->first;
+gcc_checking_assert (!dst->tree_form && !a->tree_form && !b->tree_form
+		       && !kill->tree_form);
 gcc_assert (dst != a && dst != b && dst != kill);
 /* Special cases.  We don't bother checking for bitmap_equal_p (b, kill).  */
 if (b == kill || bitmap_empty_p (b))
 {
 dst->indx = dst->current->indx;
 return changed;
 }
-/* A |= (FROM1 & ~FROM2).  Return true if A changes.  */
+/* A |= (B & ~C).  Return true if A changes.  */
 bool
-bitmap_ior_and_compl_into (bitmap a, const_bitmap from1, const_bitmap from2)
+bitmap_ior_and_compl_into (bitmap a, const_bitmap b, const_bitmap c)
 {
 bitmap_head tmp;
 bool changed;
+gcc_checking_assert (!a->tree_form && !b->tree_form && !c->tree_form);
 bitmap_initialize (&tmp, &bitmap_default_obstack);
-bitmap_and_compl (&tmp, from1, from2);
+bitmap_and_compl (&tmp, b, c);
 changed = bitmap_ior_into (a, &tmp);
 bitmap_clear (&tmp);
 return changed;
 }
 bitmap_element *a_prev = NULL;
 bitmap_element **a_prev_pnext = &a->first;
 bool changed = false;
 unsigned ix;
+gcc_checking_assert (!a->tree_form && !b->tree_form && !c->tree_form);
 if (b == c)
 return bitmap_ior_into (a, b);
 if (bitmap_empty_p (b) || bitmap_empty_p (c))
 return false;
 a->indx = a->current->indx;
 return changed;
 }
 /* Compute hash of bitmap (for purposes of hashing).  */
 hashval_t
 bitmap_hash (const_bitmap head)
 {
 const bitmap_element *ptr;
 BITMAP_WORD hash = 0;
 int ix;
+gcc_checking_assert (!head->tree_form);
 for (ptr = head->first; ptr; ptr = ptr->next)
 {
 hash ^= ptr->indx;
 for (ix = 0; ix != BITMAP_ELEMENT_WORDS; ix++)
 	hash ^= ptr->bits[ix];
 }
 return (hashval_t)hash;
 }
+/* Function to obtain a vector of bitmap elements in bit order from
+HEAD in tree view.  */
+static void
+bitmap_tree_to_vec (vec<bitmap_element *> &elts, const_bitmap head)
+{
+gcc_checking_assert (head->tree_form);
+auto_vec<bitmap_element *, 32> stack;
+bitmap_element *e = head->first;
+while (true)
+{
+while (e != NULL)
+	{
+	  stack.safe_push (e);
+	  e = e->prev;
+	}
+if (stack.is_empty ())
+	break;
+e = stack.pop ();
+elts.safe_push (e);
+e = e->next;
+}
+}
+/* Debugging function to print out the contents of a bitmap element.  */
+DEBUG_FUNCTION void
+debug_bitmap_elt_file (FILE *file, const bitmap_element *ptr)
+{
+unsigned int i, j, col = 26;
+fprintf (file, "\t" HOST_PTR_PRINTF " next = " HOST_PTR_PRINTF
+	   " prev = " HOST_PTR_PRINTF " indx = %u\n\t\tbits = {",
+	   (const void*) ptr, (const void*) ptr->next,
+	   (const void*) ptr->prev, ptr->indx);
+for (i = 0; i < BITMAP_ELEMENT_WORDS; i++)
+for (j = 0; j < BITMAP_WORD_BITS; j++)
+if ((ptr->bits[i] >> j) & 1)
+	{
+	  if (col > 70)
+	    {
+	      fprintf (file, "\n\t\t\t");
+	      col = 24;
+	    }
+	  fprintf (file, " %u", (ptr->indx * BITMAP_ELEMENT_ALL_BITS
+				 + i * BITMAP_WORD_BITS + j));
+	  col += 4;
+	}
+fprintf (file, " }\n");
+}
 /* Debugging function to print out the contents of a bitmap.  */
 DEBUG_FUNCTION void
 debug_bitmap_file (FILE *file, const_bitmap head)
 {
 fprintf (file, "\nfirst = " HOST_PTR_PRINTF
 	   " current = " HOST_PTR_PRINTF " indx = %u\n",
 	   (void *) head->first, (void *) head->current, head->indx);
-for (ptr = head->first; ptr; ptr = ptr->next)
+if (head->tree_form)
 {
-unsigned int i, j, col = 26;
+auto_vec<bitmap_element *, 32> elts;
+bitmap_tree_to_vec (elts, head);
-fprintf (file, "\t" HOST_PTR_PRINTF " next = " HOST_PTR_PRINTF
+for (unsigned i = 0; i < elts.length (); ++i)
-	       " prev = " HOST_PTR_PRINTF " indx = %u\n\t\tbits = {",
+	debug_bitmap_elt_file (file, elts[i]);
-	       (const void*) ptr, (const void*) ptr->next,
+}
-	       (const void*) ptr->prev, ptr->indx);
+else
+for (ptr = head->first; ptr; ptr = ptr->next)
-for (i = 0; i < BITMAP_ELEMENT_WORDS; i++)
+debug_bitmap_elt_file (file, ptr);
-	for (j = 0; j < BITMAP_WORD_BITS; j++)
-	  if ((ptr->bits[i] >> j) & 1)
-	    {
-	      if (col > 70)
-		{
-		  fprintf (file, "\n\t\t\t");
-		  col = 24;
-		}
-	      fprintf (file, " %u", (ptr->indx * BITMAP_ELEMENT_ALL_BITS
-				     + i * BITMAP_WORD_BITS + j));
-	      col += 4;
-	    }
-fprintf (file, " }\n");
-}
 }
 /* Function to be called from the debugger to print the contents
 of a bitmap.  */
 bitmap_print (FILE *file, const_bitmap head, const char *prefix,
 	      const char *suffix)
 {
 const char *comma = "";
 unsigned i;
-bitmap_iterator bi;
 fputs (prefix, file);
-EXECUTE_IF_SET_IN_BITMAP (head, 0, i, bi)
+if (head->tree_form)
 {
-fprintf (file, "%s%d", comma, i);
+auto_vec<bitmap_element *, 32> elts;
-comma = ", ";
+bitmap_tree_to_vec (elts, head);
+for (i = 0; i < elts.length (); ++i)
+	for (unsigned ix = 0; ix != BITMAP_ELEMENT_WORDS; ++ix)
+	  {
+	    BITMAP_WORD word = elts[i]->bits[ix];
+	    for (unsigned bit = 0; bit != BITMAP_WORD_BITS; ++bit)
+	      if (word & ((BITMAP_WORD)1 << bit))
+		{
+		  fprintf (file, "%s%d", comma,
+			   (bit + BITMAP_WORD_BITS * ix
+			    + elts[i]->indx * BITMAP_ELEMENT_ALL_BITS));
+		  comma = ", ";
+		}
+	  }
+}
+else
+{
+bitmap_iterator bi;
+EXECUTE_IF_SET_IN_BITMAP (head, 0, i, bi)
+	{
+	  fprintf (file, "%s%d", comma, i);
+	  comma = ", ";
+	}
 }
 fputs (suffix, file);
 }
 /* Output per-bitmap memory usage statistics.  */
 {
 if (ptr)
 debug (*ptr);
 else
 fprintf (stderr, "<nil>\n");
+}
+void
+bitmap_head::dump ()
+{
+debug (this);
 }
 #if CHECKING_P
 namespace selftest {

Mercurial > hg > CbC > CbC_gcc

comparison gcc/bitmap.c @ 131:84e7813d76e9