haifa-sched.c (split_hard_reg_notes): Move to flow.c

        * haifa-sched.c (split_hard_reg_notes): Move to flow.c
        (new_insn_dead_notes): Likewise.
        (update_n_sets): Likewise.
        (update_flow_info): Move to flow.c, renamed to update_life_info;
        extend to handle multiple source insns.
        * flow.c: Include resource.h
        (unlink_insn_chain): New.
        (split_hard_reg_notes): New.
        (maybe_add_dead_note): New.
        (maybe_add_dead_note_use): New.
        (find_insn_with_note): New.
        (new_insn_dead_notes): New.
        (update_n_sets): New.
        (sets_reg_or_subreg_1, sets_reg_or_subreg): New.
        (maybe_remove_dead_notes): New.
        (update_life_info): New.
        (prepend_reg_notes): New.
        (replace_insns): New.
        * output.h (update_life_info): Declare.
        * recog.c (split_block_insns): Use update_life_info.
        * resource.c (find_free_register): Use reg_alloc_order, don't use
        fixed regs, make sure the mode is supported, don't use new regs.
        (reg_dead_p): New.
        * rtl.h (replace_insns): Declare.

Co-Authored-By: Richard Henderson <rth@cygnus.com>

From-SVN: r28828

gcc/ChangeLog

+Tue Aug 24 11:46:10 1999  Bob Manson <manson@cygnus.com>
+			  Richard Henderson  <rth@cygnus.com>
+
+	* haifa-sched.c (split_hard_reg_notes): Move to flow.c
+	(new_insn_dead_notes): Likewise.
+	(update_n_sets): Likewise.
+	(update_flow_info): Move to flow.c, renamed to update_life_info;
+	extend to handle multiple source insns.
+	* flow.c: Include resource.h
+	(unlink_insn_chain): New.
+	(split_hard_reg_notes): New.
+	(maybe_add_dead_note): New.
+	(maybe_add_dead_note_use): New.
+	(find_insn_with_note): New.
+	(new_insn_dead_notes): New.
+	(update_n_sets): New.
+	(sets_reg_or_subreg_1, sets_reg_or_subreg): New.
+	(maybe_remove_dead_notes): New.
+	(update_life_info): New.
+	(prepend_reg_notes): New.
+	(replace_insns): New.
+	* output.h (update_life_info): Declare.
+	* recog.c (split_block_insns): Use update_life_info.
+	* resource.c (find_free_register): Use reg_alloc_order, don't use
+	fixed regs, make sure the mode is supported, don't use new regs.
+	(reg_dead_p): New.
+	* rtl.h (replace_insns): Declare.
+
 Tue Aug 24 13:48:39 1999  Nathan Sidwell  <nathan@acm.org>
 
 	* expr.c (expand_expr): Cope with COND_EXPRs with one

gcc/output.h

@@ -132,6 +132,7 @@ extern void find_basic_blocks         PROTO((rtx, int, FILE *, int));
 extern void free_basic_block_vars     PROTO((int));
 extern void set_block_num             PROTO((rtx, int));
 extern void life_analysis             PROTO((rtx, int, FILE *, int));
+extern void update_life_info	        PROTO((rtx, rtx, rtx, rtx, rtx));
 #endif
 
 /* Functions in varasm.c.  */

gcc/recog.c

@@ -2669,7 +2669,7 @@ split_block_insns (b, do_split)
 	      /* try_split returns the NOTE that INSN became.  */
 	      first = NEXT_INSN (first);
 #ifdef INSN_SCHEDULING
-	      update_flow_info (notes, first, last, insn);
+	      update_life_info (notes, first, last, insn, insn);
 #endif
 	      PUT_CODE (insn, NOTE);
 	      NOTE_SOURCE_FILE (insn) = 0;

gcc/resource.c

@@ -1264,14 +1264,33 @@ find_free_register (current_insn, class_str, mode, reg_set)
 
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     {
-      int success = 1;
+      int regno;
+      int success;
+
+#ifdef REG_ALLOC_ORDER
+      regno = reg_alloc_order [i];
+#else
+      regno = i;
+#endif
 
-      if (! TEST_HARD_REG_BIT (reg_class_contents[class], i))
+      /* Don't allocate fixed registers.  */
+      if (fixed_regs[regno])
+	continue;
+      /* Make sure the register is of the right class.  */
+      if (! TEST_HARD_REG_BIT (reg_class_contents[class], regno))
+	continue;
+      /* And can support the mode we need.  */
+      if (! HARD_REGNO_MODE_OK (regno, mode))
 	continue;
-      for (j = HARD_REGNO_NREGS (i, mode) - 1; j >= 0; j--)
+      /* And that we don't create an extra save/restore.  */
+      if (! call_used_regs[regno] && ! regs_ever_live[regno])
+	continue;
+
+      success = 1;
+      for (j = HARD_REGNO_NREGS (regno, mode) - 1; j >= 0; j--)
 	{
-	  if (TEST_HARD_REG_BIT (*reg_set, i + j)
-	      || TEST_HARD_REG_BIT (used.regs, i + j))
+	  if (TEST_HARD_REG_BIT (*reg_set, regno + j)
+	      || TEST_HARD_REG_BIT (used.regs, regno + j))
 	    {
 	      success = 0;
 	      break;
@@ -1279,12 +1298,33 @@ find_free_register (current_insn, class_str, mode, reg_set)
 	}
       if (success)
 	{
-	  for (j = HARD_REGNO_NREGS (i, mode) - 1; j >= 0; j--)
+	  for (j = HARD_REGNO_NREGS (regno, mode) - 1; j >= 0; j--)
 	    {
-	      SET_HARD_REG_BIT (*reg_set, i + j);
+	      SET_HARD_REG_BIT (*reg_set, regno + j);
 	    }
-	  return gen_rtx_REG (mode, i);
+	  return gen_rtx_REG (mode, regno);
 	}
     }
   return NULL_RTX;
 }
+
+/* Return true if REG is dead at CURRENT_INSN.  */
+
+int
+reg_dead_p (current_insn, reg)
+     rtx current_insn, reg;
+{
+  struct resources used;
+  int regno, j;
+
+  mark_target_live_regs (get_insns (), current_insn, &used);
+  
+  regno = REGNO (reg);
+  for (j = HARD_REGNO_NREGS (regno, GET_MODE (reg)) - 1; j >= 0; j--)
+    {
+      if (TEST_HARD_REG_BIT (used.regs, regno + j))
+	return 0;
+    }
+
+  return 1;
+}

gcc/rtl.h

@@ -1412,6 +1412,7 @@ extern void recompute_reg_usage		PROTO ((rtx, int));
 extern void dump_flow_info		PROTO ((FILE *));
 #endif
 extern void free_bb_mem			PROTO ((void));
+extern void replace_insns               PROTO ((rtx, rtx, rtx, rtx));
 
 /* In expmed.c */
 extern void init_expmed			PROTO ((void));