2012-06-04 Richard Guenther <rguenther@suse.de>

[pf3gnuchains/gcc-fork.git] / gcc / mode-switching.c

diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 23269b8..7ea241c 100644 (file)
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -1,6 +1,6 @@
 /* CPU mode switching
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+   2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -22,11 +22,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
+#include "target.h"
 #include "rtl.h"
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "flags.h"
-#include "real.h"
 #include "insn-config.h"
 #include "recog.h"
 #include "basic-block.h"
@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 #include "timevar.h"
 #include "df.h"
+#include "emit-rtl.h"
 
 /* We want target macros for the mode switching code to be able to refer
    to instruction attribute values.  */
@@ -262,7 +263,7 @@ create_pre_exit (int n_entities, int *entity_map, const int *num_modes)
                      case USE:
                        /* Skip __builtin_apply pattern.  */
                        if (GET_CODE (XEXP (return_copy_pat, 0)) == REG
-                           && (FUNCTION_VALUE_REGNO_P
+                           && (targetm.calls.function_value_regno_p
                                (REGNO (XEXP (return_copy_pat, 0)))))
                          {
                            maybe_builtin_apply = 1;
@@ -359,7 +360,8 @@ create_pre_exit (int n_entities, int *entity_map, const int *num_modes)
                        && copy_start + copy_num <= ret_end)
                      nregs -= copy_num;
                    else if (!maybe_builtin_apply
-                            || !FUNCTION_VALUE_REGNO_P (copy_start))
+                            || !targetm.calls.function_value_regno_p
+                                (copy_start))
                      break;
                    last_insn = return_copy;
                  }
@@ -377,7 +379,7 @@ create_pre_exit (int n_entities, int *entity_map, const int *num_modes)
                last_insn = return_copy;
              }
            while (nregs);
-           
+
            /* If we didn't see a full return value copy, verify that there
               is a plausible reason for this.  If some, but not all of the
               return register is likely spilled, we can expect that there
@@ -385,7 +387,7 @@ create_pre_exit (int n_entities, int *entity_map, const int *num_modes)
            gcc_assert (!nregs
                        || forced_late_switch
                        || short_block
-                       || !(CLASS_LIKELY_SPILLED_P
+                       || !(targetm.class_likely_spilled_p
                             (REGNO_REG_CLASS (ret_start)))
                        || (nregs
                            != hard_regno_nregs[ret_start][GET_MODE (ret_reg)])
@@ -397,7 +399,7 @@ create_pre_exit (int n_entities, int *entity_map, const int *num_modes)
                           failures, so let it pass.  */
                        || (GET_MODE_CLASS (GET_MODE (ret_reg)) != MODE_INT
                            && nregs != 1));
-           
+
            if (INSN_P (last_insn))
              {
                before_return_copy
@@ -443,7 +445,7 @@ optimize_mode_switching (void)
   int i, j;
   int n_entities;
   int max_num_modes = 0;
-  bool emited = false;
+  bool emited ATTRIBUTE_UNUSED = false;
   basic_block post_entry ATTRIBUTE_UNUSED, pre_exit ATTRIBUTE_UNUSED;
 
   for (e = N_ENTITIES - 1, n_entities = 0; e >= 0; e--)
@@ -497,6 +499,7 @@ optimize_mode_switching (void)
        {
          struct seginfo *ptr;
          int last_mode = no_mode;
+         bool any_set_required = false;
          HARD_REG_SET live_now;
 
          REG_SET_TO_HARD_REG_SET (live_now, df_get_live_in (bb));
@@ -516,9 +519,7 @@ optimize_mode_switching (void)
              }
          }
 
-         for (insn = BB_HEAD (bb);
-              insn != NULL && insn != NEXT_INSN (BB_END (bb));
-              insn = NEXT_INSN (insn))
+         FOR_BB_INSNS (bb, insn)
            {
              if (INSN_P (insn))
                {
@@ -527,6 +528,7 @@ optimize_mode_switching (void)
 
                  if (mode != no_mode && mode != last_mode)
                    {
+                     any_set_required = true;
                      last_mode = mode;
                      ptr = new_seginfo (mode, insn, bb->index, live_now);
                      add_seginfo (info + bb->index, ptr);
@@ -548,8 +550,10 @@ optimize_mode_switching (void)
            }
 
          info[bb->index].computing = last_mode;
-         /* Check for blocks without ANY mode requirements.  */
-         if (last_mode == no_mode)
+         /* Check for blocks without ANY mode requirements.
+            N.B. because of MODE_AFTER, last_mode might still be different
+            from no_mode.  */
+         if (!any_set_required)
            {
              ptr = new_seginfo (no_mode, BB_END (bb), bb->index, live_now);
              add_seginfo (info + bb->index, ptr);
@@ -585,7 +589,7 @@ optimize_mode_switching (void)
   for (i = 0; i < max_num_modes; i++)
     {
       int current_mode[N_ENTITIES];
-      sbitmap *delete;
+      sbitmap *del;
       sbitmap *insert;
 
       /* Set the anticipatable and computing arrays.  */
@@ -612,7 +616,7 @@ optimize_mode_switching (void)
       FOR_EACH_BB (bb)
        sbitmap_not (kill[bb->index], transp[bb->index]);
       edge_list = pre_edge_lcm (n_entities, transp, comp, antic,
-                               kill, &insert, &delete);
+                               kill, &insert, &del);
 
       for (j = n_entities - 1; j >= 0; j--)
        {
@@ -663,7 +667,7 @@ optimize_mode_switching (void)
            }
 
          FOR_EACH_BB_REVERSE (bb)
-           if (TEST_BIT (delete[bb->index], j))
+           if (TEST_BIT (del[bb->index], j))
              {
                make_preds_opaque (bb, j);
                /* Cancel the 'deleted' mode set.  */
@@ -671,7 +675,7 @@ optimize_mode_switching (void)
              }
        }
 
-      sbitmap_vector_free (delete);
+      sbitmap_vector_free (del);
       sbitmap_vector_free (insert);
       clear_aux_for_edges ();
       free_edge_list (edge_list);
@@ -760,7 +764,7 @@ struct rtl_opt_pass pass_mode_switching =
 {
  {
   RTL_PASS,
-  "mode-sw",                            /* name */
+  "mode_sw",                            /* name */
   gate_mode_switching,                  /* gate */
   rest_of_handle_mode_switching,        /* execute */
   NULL,                                 /* sub */
@@ -772,6 +776,6 @@ struct rtl_opt_pass pass_mode_switching =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };