PR debug/43516

[pf3gnuchains/gcc-fork.git] / gcc / regmove.c

diff --git a/gcc/regmove.c b/gcc/regmove.c
index a411183..3e1bf40 100644 (file)
--- a/gcc/regmove.c
+++ b/gcc/regmove.c
@@ -27,10 +27,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "rtl.h" /* stdio.h must precede rtl.h for FFS.  */
+#include "rtl.h"
 #include "tm_p.h"
 #include "insn-config.h"
 #include "recog.h"
+#include "target.h"
 #include "output.h"
 #include "regs.h"
 #include "hard-reg-set.h"
@@ -44,6 +45,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "timevar.h"
 #include "tree-pass.h"
 #include "df.h"
+#include "ira.h"
 
 static int optimize_reg_copy_1 (rtx, rtx, rtx);
 static void optimize_reg_copy_2 (rtx, rtx, rtx);
@@ -184,7 +186,9 @@ try_auto_increment (rtx insn, rtx inc_insn, rtx inc_insn_set, rtx reg,
                   &SET_SRC (inc_insn_set),
                   XEXP (SET_SRC (inc_insn_set), 0), 1);
              validate_change (insn, &XEXP (use, 0),
-                              gen_rtx_fmt_e (inc_code, Pmode, reg), 1);
+                              gen_rtx_fmt_e (inc_code,
+                                             GET_MODE (XEXP (use, 0)), reg),
+                              1);
              if (apply_change_group ())
                {
                  /* If there is a REG_DEAD note on this insn, we must
@@ -236,7 +240,7 @@ optimize_reg_copy_1 (rtx insn, rtx dest, rtx src)
 
   /* We don't want to mess with hard regs if register classes are small.  */
   if (sregno == dregno
-      || (SMALL_REGISTER_CLASSES
+      || (targetm.small_register_classes_for_mode_p (GET_MODE (src))
          && (sregno < FIRST_PSEUDO_REGISTER
              || dregno < FIRST_PSEUDO_REGISTER))
       /* We don't see all updates to SP if they are in an auto-inc memory
@@ -303,7 +307,7 @@ optimize_reg_copy_1 (rtx insn, rtx dest, rtx src)
                  if (sregno < FIRST_PSEUDO_REGISTER
                      && reg_mentioned_p (dest, PATTERN (q)))
                    failed = 1;
-                 
+
                  /* Attempt to replace all uses.  */
                  else if (!validate_replace_rtx (src, dest, q))
                    failed = 1;
@@ -524,7 +528,7 @@ optimize_reg_copy_3 (rtx insn, rtx dest, rtx src)
   for (p = PREV_INSN (insn); p && ! reg_set_p (src_reg, p); p = PREV_INSN (p))
     if (INSN_P (p) && BLOCK_FOR_INSN (p) != bb)
       break;
-  
+
   if (! p || BLOCK_FOR_INSN (p) != bb)
     return;
 
@@ -602,8 +606,6 @@ copy_src_to_dest (rtx insn, rtx src, rtx dest)
   rtx *p_move_notes;
   int src_regno;
   int dest_regno;
-  int insn_uid;
-  int move_uid;
 
   /* A REG_LIVE_LENGTH of -1 indicates the register is equivalent to a constant
      or memory location and is used infrequently; a REG_LIVE_LENGTH of -2 is
@@ -659,9 +661,6 @@ copy_src_to_dest (rtx insn, rtx src, rtx dest)
       *p_move_notes = NULL_RTX;
       *p_insn_notes = NULL_RTX;
 
-      insn_uid = INSN_UID (insn);
-      move_uid = INSN_UID (move_insn);
-
       /* Update the various register tables.  */
       dest_regno = REGNO (dest);
       INC_REG_N_SETS (dest_regno, 1);
@@ -930,7 +929,7 @@ regmove_backward_pass (void)
   FOR_EACH_BB_REVERSE (bb)
     {
       /* ??? Use the safe iterator because fixup_match_2 can remove
-            insns via try_auto_increment.  */ 
+            insns via try_auto_increment.  */
       FOR_BB_INSNS_REVERSE_SAFE (bb, insn, prev)
        {
          struct match match;
@@ -1226,6 +1225,9 @@ regmove_optimize (void)
   df_note_add_problem ();
   df_analyze ();
 
+  if (flag_ira_loop_pressure)
+    ira_set_pseudo_classes (dump_file);
+
   regstat_init_n_sets_and_refs ();
   regstat_compute_ri ();
 
@@ -1248,6 +1250,8 @@ regmove_optimize (void)
     }
   regstat_free_n_sets_and_refs ();
   regstat_free_ri ();
+  if (flag_ira_loop_pressure)
+    free_reg_info ();
   return 0;
 }