Revert "Basic block renumbering removal", and two followup patches.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53537 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 17 insertions, 18 deletions

diff --git a/gcc/global.c b/gcc/global.c
index c3edf1af22c..0d9618c27b7 100644
--- a/gcc/global.c
+++ b/gcc/global.c
@@ -583,7 +583,7 @@ global_alloc (file)
 
 #if 0 /* We need to eliminate regs even if there is no rtl code,
 	 for the sake of debugging information.  */
-  if (num_basic_blocks > 0)
+  if (n_basic_blocks > 0)
 #endif
     {
       build_insn_chain (get_insns ());
@@ -636,8 +636,7 @@ allocno_compare (v1p, v2p)
 static void
 global_conflicts ()
 {
-  int i;
-  basic_block b;
+  int b, i;
   rtx insn;
   int *block_start_allocnos;
 
@@ -646,7 +645,7 @@ global_conflicts ()
 
   block_start_allocnos = (int *) xmalloc (max_allocno * sizeof (int));
 
-  FOR_ALL_BB (b)
+  for (b = 0; b < n_basic_blocks; b++)
     {
       memset ((char *) allocnos_live, 0, allocno_row_words * sizeof (INT_TYPE));
 
@@ -665,7 +664,7 @@ global_conflicts ()
 	 are explicitly marked in basic_block_live_at_start.  */
 
       {
-	regset old = b->global_live_at_start;
+	regset old = BASIC_BLOCK (b)->global_live_at_start;
 	int ax = 0;
 
 	REG_SET_TO_HARD_REG_SET (hard_regs_live, old);
@@ -714,7 +713,7 @@ global_conflicts ()
 	     that is reached by an abnormal edge.  */
 
 	  edge e;
-	  for (e = b->pred; e ; e = e->pred_next)
+	  for (e = BASIC_BLOCK (b)->pred; e ; e = e->pred_next)
 	    if (e->flags & EDGE_ABNORMAL)
 	      break;
 	  if (e != NULL)
@@ -724,7 +723,7 @@ global_conflicts ()
 #endif
       }
 
-      insn = b->head;
+      insn = BLOCK_HEAD (b);
 
       /* Scan the code of this basic block, noting which allocnos
 	 and hard regs are born or die.  When one is born,
@@ -824,7 +823,7 @@ global_conflicts ()
 		}
 	    }
 
-	  if (insn == b->end)
+	  if (insn == BLOCK_END (b))
 	    break;
 	  insn = NEXT_INSN (insn);
 	}
@@ -1709,11 +1708,11 @@ void
 mark_elimination (from, to)
      int from, to;
 {
-  basic_block bb;
+  int i;
 
-  FOR_ALL_BB (bb)
+  for (i = 0; i < n_basic_blocks; i++)
     {
-      regset r = bb->global_live_at_start; 
+      regset r = BASIC_BLOCK (i)->global_live_at_start; 
       if (REGNO_REG_SET_P (r, from))
 	{
 	  CLEAR_REGNO_REG_SET (r, from);
@@ -1795,7 +1794,7 @@ build_insn_chain (first)
 {
   struct insn_chain **p = &reload_insn_chain;
   struct insn_chain *prev = 0;
-  basic_block b = ENTRY_BLOCK_PTR->next_bb;
+  int b = 0;
   regset_head live_relevant_regs_head;
 
   live_relevant_regs = INITIALIZE_REG_SET (live_relevant_regs_head);
@@ -1804,14 +1803,14 @@ build_insn_chain (first)
     {
       struct insn_chain *c;
 
-      if (first == b->head)
+      if (first == BLOCK_HEAD (b))
 	{
 	  int i;
 
 	  CLEAR_REG_SET (live_relevant_regs);
 
 	  EXECUTE_IF_SET_IN_BITMAP
-	    (b->global_live_at_start, 0, i,
+	    (BASIC_BLOCK (b)->global_live_at_start, 0, i,
 	     {
 	       if (i < FIRST_PSEUDO_REGISTER
 		   ? ! TEST_HARD_REG_BIT (eliminable_regset, i)
@@ -1828,7 +1827,7 @@ build_insn_chain (first)
 	  *p = c;
 	  p = &c->next;
 	  c->insn = first;
-	  c->block = b->sindex;
+	  c->block = b;
 
 	  if (INSN_P (first))
 	    {
@@ -1866,8 +1865,8 @@ build_insn_chain (first)
 	    }
 	}
 
-      if (first == b->end)
-	b = b->next_bb;
+      if (first == BLOCK_END (b))
+	b++;
 
       /* Stop after we pass the end of the last basic block.  Verify that
 	 no real insns are after the end of the last basic block.
@@ -1875,7 +1874,7 @@ build_insn_chain (first)
 	 We may want to reorganize the loop somewhat since this test should
 	 always be the right exit test.  Allow an ADDR_VEC or ADDR_DIF_VEC if
 	 the previous real insn is a JUMP_INSN.  */
-      if (b == EXIT_BLOCK_PTR)
+      if (b == n_basic_blocks)
 	{
 	  for (first = NEXT_INSN (first) ; first; first = NEXT_INSN (first))
 	    if (INSN_P (first)