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 fa119d0..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, 2008,
-   2009 Free Software Foundation, Inc.
+   2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -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.  */
@@ -386,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)])
@@ -444,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--)
@@ -498,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));
@@ -517,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))
                {
@@ -528,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);
@@ -549,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);
@@ -773,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 */
  }
 };