* config.gcc (powerpc-*-linux*): Merge variants.

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

diff --git a/gcc/regrename.c b/gcc/regrename.c
index 8042f6b..c678a09 100644 (file)
--- a/gcc/regrename.c
+++ b/gcc/regrename.c
@@ -1,12 +1,12 @@
 /* Register renaming for the GNU compiler.
 /* Register renaming for the GNU compiler.

-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

    Free Software Foundation, Inc.
 
    This file is part of GCC.
 
    GCC is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    Free Software Foundation, Inc.
 
    This file is part of GCC.
 
    GCC is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GCC is distributed in the hope that it will be useful, but WITHOUT
    any later version.
 
    GCC is distributed in the hope that it will be useful, but WITHOUT


@@ -15,9 +15,8 @@
    License for more details.
 
    You should have received a copy of the GNU General Public License
    License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */

 
 #include "config.h"
 #include "system.h"
 
 #include "config.h"
 #include "system.h"


@@ -39,6 +38,7 @@
 #include "obstack.h"
 #include "timevar.h"
 #include "tree-pass.h"
 #include "obstack.h"
 #include "timevar.h"
 #include "tree-pass.h"

+#include "df.h"

 
 struct du_chain
 {
 
 struct du_chain
 {


@@ -88,54 +88,42 @@ static void scan_rtx (rtx, rtx *, enum reg_class, enum scan_actions,
                      enum op_type, int);
 static struct du_chain *build_def_use (basic_block);
 static void dump_def_use_chain (struct du_chain *);
                      enum op_type, int);
 static struct du_chain *build_def_use (basic_block);
 static void dump_def_use_chain (struct du_chain *);

-static void note_sets (rtx, rtx, void *);
-static void clear_dead_regs (HARD_REG_SET *, enum machine_mode, rtx);
+static void note_sets (rtx, const_rtx, void *);
+static void clear_dead_regs (HARD_REG_SET *, enum reg_note, rtx);

 static void merge_overlapping_regs (basic_block, HARD_REG_SET *,
                                    struct du_chain *);
 
 static void merge_overlapping_regs (basic_block, HARD_REG_SET *,
                                    struct du_chain *);
 

-/* Called through note_stores from update_life.  Find sets of registers, and
+/* Called through note_stores.  Find sets of registers, and

    record them in *DATA (which is actually a HARD_REG_SET *).  */
 
 static void
    record them in *DATA (which is actually a HARD_REG_SET *).  */
 
 static void

-note_sets (rtx x, rtx set ATTRIBUTE_UNUSED, void *data)
+note_sets (rtx x, const_rtx set ATTRIBUTE_UNUSED, void *data)

 {
   HARD_REG_SET *pset = (HARD_REG_SET *) data;
 {
   HARD_REG_SET *pset = (HARD_REG_SET *) data;

-  unsigned int regno;
-  int nregs;

 
   if (GET_CODE (x) == SUBREG)
     x = SUBREG_REG (x);
   if (!REG_P (x))
     return;
 
   if (GET_CODE (x) == SUBREG)
     x = SUBREG_REG (x);
   if (!REG_P (x))
     return;

-  regno = REGNO (x);
-  nregs = hard_regno_nregs[regno][GET_MODE (x)];
-

   /* There must not be pseudos at this point.  */
   /* There must not be pseudos at this point.  */

-  gcc_assert (regno + nregs <= FIRST_PSEUDO_REGISTER);
-
-  while (nregs-- > 0)
-    SET_HARD_REG_BIT (*pset, regno + nregs);
+  gcc_assert (HARD_REGISTER_P (x));
+  add_to_hard_reg_set (pset, GET_MODE (x), REGNO (x));

 }
 
 /* Clear all registers from *PSET for which a note of kind KIND can be found
    in the list NOTES.  */
 
 static void
 }
 
 /* Clear all registers from *PSET for which a note of kind KIND can be found
    in the list NOTES.  */
 
 static void

-clear_dead_regs (HARD_REG_SET *pset, enum machine_mode kind, rtx notes)
+clear_dead_regs (HARD_REG_SET *pset, enum reg_note kind, rtx notes)

 {
   rtx note;
   for (note = notes; note; note = XEXP (note, 1))
     if (REG_NOTE_KIND (note) == kind && REG_P (XEXP (note, 0)))
       {
        rtx reg = XEXP (note, 0);
 {
   rtx note;
   for (note = notes; note; note = XEXP (note, 1))
     if (REG_NOTE_KIND (note) == kind && REG_P (XEXP (note, 0)))
       {
        rtx reg = XEXP (note, 0);

-       unsigned int regno = REGNO (reg);
-       int nregs = hard_regno_nregs[regno][GET_MODE (reg)];
-

        /* There must not be pseudos at this point.  */
        /* There must not be pseudos at this point.  */

-       gcc_assert (regno + nregs <= FIRST_PSEUDO_REGISTER);
-
-       while (nregs-- > 0)
-         CLEAR_HARD_REG_BIT (*pset, regno + nregs);
+       gcc_assert (HARD_REGISTER_P (reg));
+       remove_from_hard_reg_set (pset, GET_MODE (reg), REGNO (reg));

       }
 }
 
       }
 }
 


@@ -149,8 +137,15 @@ merge_overlapping_regs (basic_block b, HARD_REG_SET *pset,
   struct du_chain *t = chain;
   rtx insn;
   HARD_REG_SET live;
   struct du_chain *t = chain;
   rtx insn;
   HARD_REG_SET live;

+  df_ref *def_rec;

 
 

-  REG_SET_TO_HARD_REG_SET (live, b->il.rtl->global_live_at_start);
+  REG_SET_TO_HARD_REG_SET (live, df_get_live_in (b));
+  for (def_rec = df_get_artificial_defs (b->index); *def_rec; def_rec++)
+    {
+      df_ref def = *def_rec;
+      if (DF_REF_FLAGS (def) & DF_REF_AT_TOP)
+       SET_HARD_REG_BIT (live, DF_REF_REGNO (def));
+    }

   insn = BB_HEAD (b);
   while (t)
     {
   insn = BB_HEAD (b);
   while (t)
     {


@@ -193,10 +188,15 @@ regrename_optimize (void)
   basic_block bb;
   char *first_obj;
 
   basic_block bb;
   char *first_obj;
 

+  df_set_flags (DF_LR_RUN_DCE);
+  df_note_add_problem ();
+  df_analyze ();
+  df_set_flags (DF_DEFER_INSN_RESCAN);
+

   memset (tick, 0, sizeof tick);
 
   gcc_obstack_init (&rename_obstack);
   memset (tick, 0, sizeof tick);
 
   gcc_obstack_init (&rename_obstack);

-  first_obj = obstack_alloc (&rename_obstack, 0);
+  first_obj = XOBNEWVAR (&rename_obstack, char, 0);

 
   FOR_EACH_BB (bb)
     {
 
   FOR_EACH_BB (bb)
     {


@@ -218,14 +218,9 @@ regrename_optimize (void)
       /* Don't clobber traceback for noreturn functions.  */
       if (frame_pointer_needed)
        {
       /* Don't clobber traceback for noreturn functions.  */
       if (frame_pointer_needed)
        {

-         int i;
-
-         for (i = hard_regno_nregs[FRAME_POINTER_REGNUM][Pmode]; i--;)
-           SET_HARD_REG_BIT (unavailable, FRAME_POINTER_REGNUM + i);
-
+         add_to_hard_reg_set (&unavailable, Pmode, FRAME_POINTER_REGNUM);

 #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM
 #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM

-         for (i = hard_regno_nregs[HARD_FRAME_POINTER_REGNUM][Pmode]; i--;)
-           SET_HARD_REG_BIT (unavailable, HARD_FRAME_POINTER_REGNUM + i);
+         add_to_hard_reg_set (&unavailable, Pmode, HARD_FRAME_POINTER_REGNUM);

 #endif
        }
 
 #endif
        }
 


@@ -234,13 +229,13 @@ regrename_optimize (void)
        {
          int new_reg, best_new_reg;
          int n_uses;
        {
          int new_reg, best_new_reg;
          int n_uses;

-         struct du_chain *this = all_chains;
+         struct du_chain *this_du = all_chains;

          struct du_chain *tmp, *last;
          HARD_REG_SET this_unavailable;
          struct du_chain *tmp, *last;
          HARD_REG_SET this_unavailable;

-         int reg = REGNO (*this->loc);
+         int reg = REGNO (*this_du->loc);

          int i;
 
          int i;
 

-         all_chains = this->next_chain;
+         all_chains = this_du->next_chain;

 
          best_new_reg = reg;
 
 
          best_new_reg = reg;
 


@@ -268,7 +263,7 @@ regrename_optimize (void)
             count number of uses, and narrow the set of registers we can
             use for renaming.  */
          n_uses = 0;
             count number of uses, and narrow the set of registers we can
             use for renaming.  */
          n_uses = 0;

-         for (last = this; last->next_use; last = last->next_use)
+         for (last = this_du; last->next_use; last = last->next_use)

            {
              n_uses++;
              IOR_COMPL_HARD_REG_SET (this_unavailable,
            {
              n_uses++;
              IOR_COMPL_HARD_REG_SET (this_unavailable,


@@ -280,23 +275,23 @@ regrename_optimize (void)
          IOR_COMPL_HARD_REG_SET (this_unavailable,
                                  reg_class_contents[last->cl]);
 
          IOR_COMPL_HARD_REG_SET (this_unavailable,
                                  reg_class_contents[last->cl]);
 

-         if (this->need_caller_save_reg)
+         if (this_du->need_caller_save_reg)

            IOR_HARD_REG_SET (this_unavailable, call_used_reg_set);
 
            IOR_HARD_REG_SET (this_unavailable, call_used_reg_set);
 

-         merge_overlapping_regs (bb, &this_unavailable, this);
+         merge_overlapping_regs (bb, &this_unavailable, this_du);

 
          /* Now potential_regs is a reasonable approximation, let's
             have a closer look at each register still in there.  */
          for (new_reg = 0; new_reg < FIRST_PSEUDO_REGISTER; new_reg++)
            {
 
          /* Now potential_regs is a reasonable approximation, let's
             have a closer look at each register still in there.  */
          for (new_reg = 0; new_reg < FIRST_PSEUDO_REGISTER; new_reg++)
            {

-             int nregs = hard_regno_nregs[new_reg][GET_MODE (*this->loc)];
+             int nregs = hard_regno_nregs[new_reg][GET_MODE (*this_du->loc)];

 
              for (i = nregs - 1; i >= 0; --i)
                if (TEST_HARD_REG_BIT (this_unavailable, new_reg + i)
                    || fixed_regs[new_reg + i]
                    || global_regs[new_reg + i]
                    /* Can't use regs which aren't saved by the prologue.  */
 
              for (i = nregs - 1; i >= 0; --i)
                if (TEST_HARD_REG_BIT (this_unavailable, new_reg + i)
                    || fixed_regs[new_reg + i]
                    || global_regs[new_reg + i]
                    /* Can't use regs which aren't saved by the prologue.  */

-                   || (! regs_ever_live[new_reg + i]
+                   || (! df_regs_ever_live_p (new_reg + i)

                        && ! call_used_regs[new_reg + i])
 #ifdef LEAF_REGISTERS
                    /* We can't use a non-leaf register if we're in a
                        && ! call_used_regs[new_reg + i])
 #ifdef LEAF_REGISTERS
                    /* We can't use a non-leaf register if we're in a


@@ -314,7 +309,7 @@ regrename_optimize (void)
 
              /* See whether it accepts all modes that occur in
                 definition and uses.  */
 
              /* See whether it accepts all modes that occur in
                 definition and uses.  */

-             for (tmp = this; tmp; tmp = tmp->next_use)
+             for (tmp = this_du; tmp; tmp = tmp->next_use)

                if (! HARD_REGNO_MODE_OK (new_reg, GET_MODE (*tmp->loc))
                    || (tmp->need_caller_save_reg
                        && ! (HARD_REGNO_CALL_PART_CLOBBERED
                if (! HARD_REGNO_MODE_OK (new_reg, GET_MODE (*tmp->loc))
                    || (tmp->need_caller_save_reg
                        && ! (HARD_REGNO_CALL_PART_CLOBBERED


@@ -345,12 +340,12 @@ regrename_optimize (void)
              continue;
            }
 
              continue;
            }
 

-         do_replace (this, best_new_reg);
-         tick[best_new_reg] = ++this_tick;
-         regs_ever_live[best_new_reg] = 1;
-

          if (dump_file)
            fprintf (dump_file, ", renamed as %s\n", reg_names[best_new_reg]);
          if (dump_file)
            fprintf (dump_file, ", renamed as %s\n", reg_names[best_new_reg]);

+
+         do_replace (this_du, best_new_reg);
+         tick[best_new_reg] = ++this_tick;
+         df_set_regs_ever_live (best_new_reg, true);

        }
 
       obstack_free (&rename_obstack, first_obj);
        }
 
       obstack_free (&rename_obstack, first_obj);


@@ -360,10 +355,6 @@ regrename_optimize (void)
 
   if (dump_file)
     fputc ('\n', dump_file);
 
   if (dump_file)
     fputc ('\n', dump_file);

-
-  count_or_remove_death_notes (NULL, 1);
-  update_life_info (NULL, UPDATE_LIFE_LOCAL,
-                   PROP_DEATH_NOTES);

 }
 
 static void
 }
 
 static void


@@ -373,11 +364,14 @@ do_replace (struct du_chain *chain, int reg)
     {
       unsigned int regno = ORIGINAL_REGNO (*chain->loc);
       struct reg_attrs * attr = REG_ATTRS (*chain->loc);
     {
       unsigned int regno = ORIGINAL_REGNO (*chain->loc);
       struct reg_attrs * attr = REG_ATTRS (*chain->loc);

+      int reg_ptr = REG_POINTER (*chain->loc);

 
       *chain->loc = gen_raw_REG (GET_MODE (*chain->loc), reg);
       if (regno >= FIRST_PSEUDO_REGISTER)
        ORIGINAL_REGNO (*chain->loc) = regno;
       REG_ATTRS (*chain->loc) = attr;
 
       *chain->loc = gen_raw_REG (GET_MODE (*chain->loc), reg);
       if (regno >= FIRST_PSEUDO_REGISTER)
        ORIGINAL_REGNO (*chain->loc) = regno;
       REG_ATTRS (*chain->loc) = attr;

+      REG_POINTER (*chain->loc) = reg_ptr;
+      df_insn_rescan (chain->insn);

       chain = chain->next_use;
     }
 }
       chain = chain->next_use;
     }
 }


@@ -400,16 +394,15 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class cl,
     {
       if (type == OP_OUT)
        {
     {
       if (type == OP_OUT)
        {

-         struct du_chain *this
-           = obstack_alloc (&rename_obstack, sizeof (struct du_chain));
-         this->next_use = 0;
-         this->next_chain = open_chains;
-         this->loc = loc;
-         this->insn = insn;
-         this->cl = cl;
-         this->need_caller_save_reg = 0;
-         this->earlyclobber = earlyclobber;
-         open_chains = this;
+         struct du_chain *this_du = XOBNEW (&rename_obstack, struct du_chain);
+         this_du->next_use = 0;
+         this_du->next_chain = open_chains;
+         this_du->loc = loc;
+         this_du->insn = insn;
+         this_du->cl = cl;
+         this_du->need_caller_save_reg = 0;
+         this_du->earlyclobber = earlyclobber;
+         open_chains = this_du;

        }
       return;
     }
        }
       return;
     }


@@ -419,7 +412,7 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class cl,
 
   for (p = &open_chains; *p;)
     {
 
   for (p = &open_chains; *p;)
     {

-      struct du_chain *this = *p;
+      struct du_chain *this_du = *p;

 
       /* Check if the chain has been terminated if it has then skip to
         the next chain.
 
       /* Check if the chain has been terminated if it has then skip to
         the next chain.


@@ -428,18 +421,18 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class cl,
         the chain in Step 3, but are trying to hide in-out operands
         from terminate_write in Step 5.  */
 
         the chain in Step 3, but are trying to hide in-out operands
         from terminate_write in Step 5.  */
 

-      if (*this->loc == cc0_rtx)
-       p = &this->next_chain;
+      if (*this_du->loc == cc0_rtx)
+       p = &this_du->next_chain;

       else
        {
       else
        {

-         int regno = REGNO (*this->loc);
-         int nregs = hard_regno_nregs[regno][GET_MODE (*this->loc)];
+         int regno = REGNO (*this_du->loc);
+         int nregs = hard_regno_nregs[regno][GET_MODE (*this_du->loc)];

          int exact_match = (regno == this_regno && nregs == this_nregs);
 
          if (regno + nregs <= this_regno
              || this_regno + this_nregs <= regno)
            {
          int exact_match = (regno == this_regno && nregs == this_nregs);
 
          if (regno + nregs <= this_regno
              || this_regno + this_nregs <= regno)
            {

-             p = &this->next_chain;
+             p = &this_du->next_chain;

              continue;
            }
 
              continue;
            }
 


@@ -453,23 +446,23 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class cl,
                 be replaced with, terminate the chain.  */
              if (cl != NO_REGS)
                {
                 be replaced with, terminate the chain.  */
              if (cl != NO_REGS)
                {

-                 this = obstack_alloc (&rename_obstack, sizeof (struct du_chain));
-                 this->next_use = 0;
-                 this->next_chain = (*p)->next_chain;
-                 this->loc = loc;
-                 this->insn = insn;
-                 this->cl = cl;
-                 this->need_caller_save_reg = 0;
+                 this_du = XOBNEW (&rename_obstack, struct du_chain);
+                 this_du->next_use = 0;
+                 this_du->next_chain = (*p)->next_chain;
+                 this_du->loc = loc;
+                 this_du->insn = insn;
+                 this_du->cl = cl;
+                 this_du->need_caller_save_reg = 0;

                  while (*p)
                    p = &(*p)->next_use;
                  while (*p)
                    p = &(*p)->next_use;

-                 *p = this;
+                 *p = this_du;

                  return;
                }
            }
 
          if (action != terminate_overlapping_read || ! exact_match)
            {
                  return;
                }
            }
 
          if (action != terminate_overlapping_read || ! exact_match)
            {

-             struct du_chain *next = this->next_chain;
+             struct du_chain *next = this_du->next_chain;

 
              /* Whether the terminated chain can be used for renaming
                 depends on the action and this being an exact match.
 
              /* Whether the terminated chain can be used for renaming
                 depends on the action and this being an exact match.


@@ -478,12 +471,12 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class cl,
              if ((action == terminate_dead || action == terminate_write)
                  && exact_match)
                {
              if ((action == terminate_dead || action == terminate_write)
                  && exact_match)
                {

-                 this->next_chain = closed_chains;
-                 closed_chains = this;
+                 this_du->next_chain = closed_chains;
+                 closed_chains = this_du;

                  if (dump_file)
                    fprintf (dump_file,
                             "Closing chain %s at insn %d (%s)\n",
                  if (dump_file)
                    fprintf (dump_file,
                             "Closing chain %s at insn %d (%s)\n",

-                            reg_names[REGNO (*this->loc)], INSN_UID (insn),
+                            reg_names[REGNO (*this_du->loc)], INSN_UID (insn),

                             scan_actions_name[(int) action]);
                }
              else
                             scan_actions_name[(int) action]);
                }
              else


@@ -491,13 +484,13 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class cl,
                  if (dump_file)
                    fprintf (dump_file,
                             "Discarding chain %s at insn %d (%s)\n",
                  if (dump_file)
                    fprintf (dump_file,
                             "Discarding chain %s at insn %d (%s)\n",

-                            reg_names[REGNO (*this->loc)], INSN_UID (insn),
+                            reg_names[REGNO (*this_du->loc)], INSN_UID (insn),

                             scan_actions_name[(int) action]);
                }
              *p = next;
            }
          else
                             scan_actions_name[(int) action]);
                }
              *p = next;
            }
          else

-           p = &this->next_chain;
+           p = &this_du->next_chain;

        }
     }
 }
        }
     }
 }


@@ -574,20 +567,19 @@ scan_rtx_address (rtx insn, rtx *loc, enum reg_class cl,
            int index_op;
            unsigned regno0 = REGNO (op0), regno1 = REGNO (op1);
 
            int index_op;
            unsigned regno0 = REGNO (op0), regno1 = REGNO (op1);
 

-           if (REGNO_OK_FOR_INDEX_P (regno0)
-               && regno_ok_for_base_p (regno1, mode, PLUS, REG))
+           if (REGNO_OK_FOR_INDEX_P (regno1)
+               && regno_ok_for_base_p (regno0, mode, PLUS, REG))
+             index_op = 1;
+           else if (REGNO_OK_FOR_INDEX_P (regno0)
+                    && regno_ok_for_base_p (regno1, mode, PLUS, REG))

              index_op = 0;
              index_op = 0;

-           else if (REGNO_OK_FOR_INDEX_P (regno1)
-                    && regno_ok_for_base_p (regno0, mode, PLUS, REG))
+           else if (regno_ok_for_base_p (regno0, mode, PLUS, REG)
+                    || REGNO_OK_FOR_INDEX_P (regno1))

              index_op = 1;
            else if (regno_ok_for_base_p (regno1, mode, PLUS, REG))
              index_op = 0;
              index_op = 1;
            else if (regno_ok_for_base_p (regno1, mode, PLUS, REG))
              index_op = 0;

-           else if (regno_ok_for_base_p (regno0, mode, PLUS, REG))
-             index_op = 1;
-           else if (REGNO_OK_FOR_INDEX_P (regno1))
-             index_op = 1;

            else
            else

-             index_op = 0;
+             index_op = 1;

 
            locI = &XEXP (x, index_op);
            locB = &XEXP (x, !index_op);
 
            locI = &XEXP (x, index_op);
            locB = &XEXP (x, !index_op);


@@ -668,6 +660,7 @@ scan_rtx (rtx insn, rtx *loc, enum reg_class cl,
     case CONST:
     case CONST_INT:
     case CONST_DOUBLE:
     case CONST:
     case CONST_INT:
     case CONST_DOUBLE:

+    case CONST_FIXED:

     case CONST_VECTOR:
     case SYMBOL_REF:
     case LABEL_REF:
     case CONST_VECTOR:
     case SYMBOL_REF:
     case LABEL_REF:


@@ -820,16 +813,8 @@ build_def_use (basic_block bb)
            }
          for (i = 0; i < recog_data.n_dups; i++)
            {
            }
          for (i = 0; i < recog_data.n_dups; i++)
            {

-             int dup_num = recog_data.dup_num[i];
-

              old_dups[i] = *recog_data.dup_loc[i];
              *recog_data.dup_loc[i] = cc0_rtx;
              old_dups[i] = *recog_data.dup_loc[i];
              *recog_data.dup_loc[i] = cc0_rtx;

-
-             /* For match_dup of match_operator or match_parallel, share
-                them, so that we don't miss changes in the dup.  */
-             if (icode >= 0
-                 && insn_data[icode].operand[dup_num].eliminable == 0)
-               old_dups[i] = recog_data.operand[dup_num];

            }
 
          scan_rtx (insn, &PATTERN (insn), NO_REGS, terminate_all_read,
            }
 
          scan_rtx (insn, &PATTERN (insn), NO_REGS, terminate_all_read,


@@ -839,6 +824,8 @@ build_def_use (basic_block bb)
            *recog_data.dup_loc[i] = old_dups[i];
          for (i = 0; i < n_ops; i++)
            *recog_data.operand_loc[i] = old_operands[i];
            *recog_data.dup_loc[i] = old_dups[i];
          for (i = 0; i < n_ops; i++)
            *recog_data.operand_loc[i] = old_operands[i];

+         if (recog_data.n_dups)
+           df_insn_rescan (insn);

 
          /* Step 2B: Can't rename function call argument registers.  */
          if (CALL_P (insn) && CALL_INSN_FUNCTION_USAGE (insn))
 
          /* Step 2B: Can't rename function call argument registers.  */
          if (CALL_P (insn) && CALL_INSN_FUNCTION_USAGE (insn))


@@ -998,15 +985,15 @@ dump_def_use_chain (struct du_chain *chains)
 {
   while (chains)
     {
 {
   while (chains)
     {

-      struct du_chain *this = chains;
-      int r = REGNO (*this->loc);
-      int nregs = hard_regno_nregs[r][GET_MODE (*this->loc)];
+      struct du_chain *this_du = chains;
+      int r = REGNO (*this_du->loc);
+      int nregs = hard_regno_nregs[r][GET_MODE (*this_du->loc)];

       fprintf (dump_file, "Register %s (%d):", reg_names[r], nregs);
       fprintf (dump_file, "Register %s (%d):", reg_names[r], nregs);

-      while (this)
+      while (this_du)

        {
        {

-         fprintf (dump_file, " %d [%s]", INSN_UID (this->insn),
-                  reg_class_names[this->cl]);
-         this = this->next_use;
+         fprintf (dump_file, " %d [%s]", INSN_UID (this_du->insn),
+                  reg_class_names[this_du->cl]);
+         this_du = this_du->next_use;

        }
       fprintf (dump_file, "\n");
       chains = chains->next_chain;
        }
       fprintf (dump_file, "\n");
       chains = chains->next_chain;


@@ -1043,8 +1030,8 @@ static void kill_value_regno (unsigned, unsigned, struct value_data *);
 static void kill_value (rtx, struct value_data *);
 static void set_value_regno (unsigned, enum machine_mode, struct value_data *);
 static void init_value_data (struct value_data *);
 static void kill_value (rtx, struct value_data *);
 static void set_value_regno (unsigned, enum machine_mode, struct value_data *);
 static void init_value_data (struct value_data *);

-static void kill_clobbered_value (rtx, rtx, void *);
-static void kill_set_value (rtx, rtx, void *);
+static void kill_clobbered_value (rtx, const_rtx, void *);
+static void kill_set_value (rtx, const_rtx, void *);

 static int kill_autoinc_value (rtx *, void *);
 static void copy_value (rtx, rtx, struct value_data *);
 static bool mode_change_ok (enum machine_mode, enum machine_mode,
 static int kill_autoinc_value (rtx *, void *);
 static void copy_value (rtx, rtx, struct value_data *);
 static bool mode_change_ok (enum machine_mode, enum machine_mode,


@@ -1184,9 +1171,9 @@ init_value_data (struct value_data *vd)
 /* Called through note_stores.  If X is clobbered, kill its value.  */
 
 static void
 /* Called through note_stores.  If X is clobbered, kill its value.  */
 
 static void

-kill_clobbered_value (rtx x, rtx set, void *data)
+kill_clobbered_value (rtx x, const_rtx set, void *data)

 {
 {

-  struct value_data *vd = data;
+  struct value_data *const vd = (struct value_data *) data;

   if (GET_CODE (set) == CLOBBER)
     kill_value (x, vd);
 }
   if (GET_CODE (set) == CLOBBER)
     kill_value (x, vd);
 }


@@ -1195,9 +1182,9 @@ kill_clobbered_value (rtx x, rtx set, void *data)
    current value and install it as the root of its own value list.  */
 
 static void
    current value and install it as the root of its own value list.  */
 
 static void

-kill_set_value (rtx x, rtx set, void *data)
+kill_set_value (rtx x, const_rtx set, void *data)

 {
 {

-  struct value_data *vd = data;
+  struct value_data *const vd = (struct value_data *) data;

   if (GET_CODE (set) != CLOBBER)
     {
       kill_value (x, vd);
   if (GET_CODE (set) != CLOBBER)
     {
       kill_value (x, vd);


@@ -1214,7 +1201,7 @@ static int
 kill_autoinc_value (rtx *px, void *data)
 {
   rtx x = *px;
 kill_autoinc_value (rtx *px, void *data)
 {
   rtx x = *px;

-  struct value_data *vd = data;
+  struct value_data *const vd = (struct value_data *) data;

 
   if (GET_RTX_CLASS (GET_CODE (x)) == RTX_AUTOINC)
     {
 
   if (GET_RTX_CLASS (GET_CODE (x)) == RTX_AUTOINC)
     {


@@ -1336,6 +1323,10 @@ maybe_mode_change (enum machine_mode orig_mode, enum machine_mode copy_mode,
                   enum machine_mode new_mode, unsigned int regno,
                   unsigned int copy_regno ATTRIBUTE_UNUSED)
 {
                   enum machine_mode new_mode, unsigned int regno,
                   unsigned int copy_regno ATTRIBUTE_UNUSED)
 {

+  if (GET_MODE_SIZE (copy_mode) < GET_MODE_SIZE (orig_mode)
+      && GET_MODE_SIZE (copy_mode) < GET_MODE_SIZE (new_mode))
+    return NULL_RTX;
+

   if (orig_mode == new_mode)
     return gen_rtx_raw_REG (new_mode, regno);
   else if (mode_change_ok (orig_mode, new_mode, regno))
   if (orig_mode == new_mode)
     return gen_rtx_raw_REG (new_mode, regno);
   else if (mode_change_ok (orig_mode, new_mode, regno))


@@ -1387,19 +1378,18 @@ find_oldest_value_reg (enum reg_class cl, rtx reg, struct value_data *vd)
   for (i = vd->e[regno].oldest_regno; i != regno; i = vd->e[i].next_regno)
     {
       enum machine_mode oldmode = vd->e[i].mode;
   for (i = vd->e[regno].oldest_regno; i != regno; i = vd->e[i].next_regno)
     {
       enum machine_mode oldmode = vd->e[i].mode;

-      rtx new;
-      unsigned int last;
+      rtx new_rtx;

 
 

-      for (last = i; last < i + hard_regno_nregs[i][mode]; last++)
-       if (!TEST_HARD_REG_BIT (reg_class_contents[cl], last))
-         return NULL_RTX;
+      if (!in_hard_reg_set_p (reg_class_contents[cl], mode, i))
+       return NULL_RTX;

 
 

-      new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno);
-      if (new)
+      new_rtx = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno);
+      if (new_rtx)

        {
        {

-         ORIGINAL_REGNO (new) = ORIGINAL_REGNO (reg);
-         REG_ATTRS (new) = REG_ATTRS (reg);
-         return new;
+         ORIGINAL_REGNO (new_rtx) = ORIGINAL_REGNO (reg);
+         REG_ATTRS (new_rtx) = REG_ATTRS (reg);
+         REG_POINTER (new_rtx) = REG_POINTER (reg);
+         return new_rtx;

        }
     }
 
        }
     }
 


@@ -1413,14 +1403,14 @@ static bool
 replace_oldest_value_reg (rtx *loc, enum reg_class cl, rtx insn,
                          struct value_data *vd)
 {
 replace_oldest_value_reg (rtx *loc, enum reg_class cl, rtx insn,
                          struct value_data *vd)
 {

-  rtx new = find_oldest_value_reg (cl, *loc, vd);
-  if (new)
+  rtx new_rtx = find_oldest_value_reg (cl, *loc, vd);
+  if (new_rtx)

     {
       if (dump_file)
        fprintf (dump_file, "insn %u: replaced reg %u with %u\n",
     {
       if (dump_file)
        fprintf (dump_file, "insn %u: replaced reg %u with %u\n",

-                INSN_UID (insn), REGNO (*loc), REGNO (new));
+                INSN_UID (insn), REGNO (*loc), REGNO (new_rtx));

 
 

-      validate_change (insn, loc, new, 1);
+      validate_change (insn, loc, new_rtx, 1);

       return true;
     }
   return false;
       return true;
     }
   return false;


@@ -1453,7 +1443,7 @@ replace_oldest_value_addr (rtx *loc, enum reg_class cl,
        rtx op1 = orig_op1;
        rtx *locI = NULL;
        rtx *locB = NULL;
        rtx op1 = orig_op1;
        rtx *locI = NULL;
        rtx *locB = NULL;

-       enum rtx_code index_code;
+       enum rtx_code index_code = SCRATCH;

 
        if (GET_CODE (op0) == SUBREG)
          {
 
        if (GET_CODE (op0) == SUBREG)
          {


@@ -1498,20 +1488,19 @@ replace_oldest_value_addr (rtx *loc, enum reg_class cl,
            int index_op;
            unsigned regno0 = REGNO (op0), regno1 = REGNO (op1);
 
            int index_op;
            unsigned regno0 = REGNO (op0), regno1 = REGNO (op1);
 

-           if (REGNO_OK_FOR_INDEX_P (regno0)
-               && regno_ok_for_base_p (regno1, mode, PLUS, REG))
+           if (REGNO_OK_FOR_INDEX_P (regno1)
+               && regno_ok_for_base_p (regno0, mode, PLUS, REG))
+             index_op = 1;
+           else if (REGNO_OK_FOR_INDEX_P (regno0)
+                    && regno_ok_for_base_p (regno1, mode, PLUS, REG))

              index_op = 0;
              index_op = 0;

-           else if (REGNO_OK_FOR_INDEX_P (regno1)
-                    && regno_ok_for_base_p (regno0, mode, PLUS, REG))
+           else if (regno_ok_for_base_p (regno0, mode, PLUS, REG)
+                    || REGNO_OK_FOR_INDEX_P (regno1))

              index_op = 1;
            else if (regno_ok_for_base_p (regno1, mode, PLUS, REG))
              index_op = 0;
              index_op = 1;
            else if (regno_ok_for_base_p (regno1, mode, PLUS, REG))
              index_op = 0;

-           else if (regno_ok_for_base_p (regno0, mode, PLUS, REG))
-             index_op = 1;
-           else if (REGNO_OK_FOR_INDEX_P (regno1))
-             index_op = 1;

            else
            else

-             index_op = 0;
+             index_op = 1;

 
            locI = &XEXP (x, index_op);
            locB = &XEXP (x, !index_op);
 
            locI = &XEXP (x, index_op);
            locB = &XEXP (x, !index_op);


@@ -1659,7 +1648,7 @@ copyprop_hardreg_forward_1 (basic_block bb, struct value_data *vd)
          unsigned int regno = REGNO (src);
          enum machine_mode mode = GET_MODE (src);
          unsigned int i;
          unsigned int regno = REGNO (src);
          enum machine_mode mode = GET_MODE (src);
          unsigned int i;

-         rtx new;
+         rtx new_rtx;

 
          /* If we are accessing SRC in some mode other that what we
             set it in, make sure that the replacement is valid.  */
 
          /* If we are accessing SRC in some mode other that what we
             set it in, make sure that the replacement is valid.  */


@@ -1674,13 +1663,13 @@ copyprop_hardreg_forward_1 (basic_block bb, struct value_data *vd)
             register in the same class.  */
          if (REG_P (SET_DEST (set)))
            {
             register in the same class.  */
          if (REG_P (SET_DEST (set)))
            {

-             new = find_oldest_value_reg (REGNO_REG_CLASS (regno), src, vd);
-             if (new && validate_change (insn, &SET_SRC (set), new, 0))
+             new_rtx = find_oldest_value_reg (REGNO_REG_CLASS (regno), src, vd);
+             if (new_rtx && validate_change (insn, &SET_SRC (set), new_rtx, 0))

                {
                  if (dump_file)
                    fprintf (dump_file,
                             "insn %u: replaced reg %u with %u\n",
                {
                  if (dump_file)
                    fprintf (dump_file,
                             "insn %u: replaced reg %u with %u\n",

-                            INSN_UID (insn), regno, REGNO (new));
+                            INSN_UID (insn), regno, REGNO (new_rtx));

                  changed = true;
                  goto did_replacement;
                }
                  changed = true;
                  goto did_replacement;
                }


@@ -1690,18 +1679,19 @@ copyprop_hardreg_forward_1 (basic_block bb, struct value_data *vd)
          for (i = vd->e[regno].oldest_regno; i != regno;
               i = vd->e[i].next_regno)
            {
          for (i = vd->e[regno].oldest_regno; i != regno;
               i = vd->e[i].next_regno)
            {

-             new = maybe_mode_change (vd->e[i].mode, vd->e[regno].mode,
+             new_rtx = maybe_mode_change (vd->e[i].mode, vd->e[regno].mode,

                                       mode, i, regno);
                                       mode, i, regno);

-             if (new != NULL_RTX)
+             if (new_rtx != NULL_RTX)

                {
                {

-                 if (validate_change (insn, &SET_SRC (set), new, 0))
+                 if (validate_change (insn, &SET_SRC (set), new_rtx, 0))

                    {
                    {

-                     ORIGINAL_REGNO (new) = ORIGINAL_REGNO (src);
-                     REG_ATTRS (new) = REG_ATTRS (src);
+                     ORIGINAL_REGNO (new_rtx) = ORIGINAL_REGNO (src);
+                     REG_ATTRS (new_rtx) = REG_ATTRS (src);
+                     REG_POINTER (new_rtx) = REG_POINTER (src);

                      if (dump_file)
                        fprintf (dump_file,
                                 "insn %u: replaced reg %u with %u\n",
                      if (dump_file)
                        fprintf (dump_file,
                                 "insn %u: replaced reg %u with %u\n",

-                                INSN_UID (insn), regno, REGNO (new));
+                                INSN_UID (insn), regno, REGNO (new_rtx));

                      changed = true;
                      goto did_replacement;
                    }
                      changed = true;
                      goto did_replacement;
                    }


@@ -1754,13 +1744,13 @@ copyprop_hardreg_forward_1 (basic_block bb, struct value_data *vd)
          if (replaced[i])
            {
              int j;
          if (replaced[i])
            {
              int j;

-             rtx new;
+             rtx new_rtx;

 
 

-             new = *recog_data.operand_loc[i];
-             recog_data.operand[i] = new;
+             new_rtx = *recog_data.operand_loc[i];
+             recog_data.operand[i] = new_rtx;

              for (j = 0; j < recog_data.n_dups; j++)
                if (recog_data.dup_num[j] == i)
              for (j = 0; j < recog_data.n_dups; j++)
                if (recog_data.dup_num[j] == i)

-                 validate_change (insn, recog_data.dup_loc[j], new, 1);
+                 validate_unshare_change (insn, recog_data.dup_loc[j], new_rtx, 1);

 
              any_replacements = true;
            }
 
              any_replacements = true;
            }


@@ -1813,12 +1803,9 @@ static void
 copyprop_hardreg_forward (void)
 {
   struct value_data *all_vd;
 copyprop_hardreg_forward (void)
 {
   struct value_data *all_vd;

-  bool need_refresh;

   basic_block bb;
   sbitmap visited;
 
   basic_block bb;
   sbitmap visited;
 

-  need_refresh = false;
-

   all_vd = XNEWVEC (struct value_data, last_basic_block);
 
   visited = sbitmap_alloc (last_basic_block);
   all_vd = XNEWVEC (struct value_data, last_basic_block);
 
   visited = sbitmap_alloc (last_basic_block);


@@ -1839,27 +1826,10 @@ copyprop_hardreg_forward (void)
       else
        init_value_data (all_vd + bb->index);
 
       else
        init_value_data (all_vd + bb->index);
 

-      if (copyprop_hardreg_forward_1 (bb, all_vd + bb->index))
-       need_refresh = true;
+      copyprop_hardreg_forward_1 (bb, all_vd + bb->index);

     }
 
   sbitmap_free (visited);  
     }
 
   sbitmap_free (visited);  

-
-  if (need_refresh)
-    {
-      if (dump_file)
-       fputs ("\n\n", dump_file);
-
-      /* ??? Irritatingly, delete_noop_moves does not take a set of blocks
-        to scan, so we have to do a life update with no initial set of
-        blocks Just In Case.  */
-      delete_noop_moves ();
-      update_life_info (NULL, UPDATE_LIFE_GLOBAL_RM_NOTES,
-                       PROP_DEATH_NOTES
-                       | PROP_SCAN_DEAD_CODE
-                       | PROP_KILL_DEAD_CODE);
-    }
-

   free (all_vd);
 }
 
   free (all_vd);
 }
 


@@ -1970,7 +1940,7 @@ validate_value_data (struct value_data *vd)
 static bool
 gate_handle_regrename (void)
 {
 static bool
 gate_handle_regrename (void)
 {

-  return (optimize > 0 && (flag_rename_registers || flag_cprop_registers));
+  return (optimize > 0 && (flag_rename_registers));

 }
 
 
 }
 
 


@@ -1978,15 +1948,14 @@ gate_handle_regrename (void)
 static unsigned int
 rest_of_handle_regrename (void)
 {
 static unsigned int
 rest_of_handle_regrename (void)
 {

-  if (flag_rename_registers)
-    regrename_optimize ();
-  if (flag_cprop_registers)
-    copyprop_hardreg_forward ();
+  regrename_optimize ();

   return 0;
 }
 
   return 0;
 }
 

-struct tree_opt_pass pass_regrename =
+struct rtl_opt_pass pass_regrename =

 {
 {

+ {
+  RTL_PASS,

   "rnreg",                              /* name */
   gate_handle_regrename,                /* gate */
   rest_of_handle_regrename,             /* execute */
   "rnreg",                              /* name */
   gate_handle_regrename,                /* gate */
   rest_of_handle_regrename,             /* execute */


@@ -1998,7 +1967,41 @@ struct tree_opt_pass pass_regrename =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */

-  TODO_dump_func,                       /* todo_flags_finish */
-  'n'                                   /* letter */
+  TODO_df_finish | TODO_verify_rtl_sharing |
+  TODO_dump_func                        /* todo_flags_finish */
+ }

 };
 
 };
 

+static bool
+gate_handle_cprop (void)
+{
+  return (optimize > 0 && (flag_cprop_registers));
+}
+
+
+/* Run the regrename and cprop passes.  */
+static unsigned int
+rest_of_handle_cprop (void)
+{
+  copyprop_hardreg_forward ();
+  return 0;
+}
+
+struct rtl_opt_pass pass_cprop_hardreg =
+{
+ {
+  RTL_PASS,
+  "cprop_hardreg",                      /* name */
+  gate_handle_cprop,                    /* gate */
+  rest_of_handle_cprop,                 /* execute */
+  NULL,                                 /* sub */
+  NULL,                                 /* next */
+  0,                                    /* static_pass_number */
+  TV_RENAME_REGISTERS,                  /* tv_id */
+  0,                                    /* properties_required */
+  0,                                    /* properties_provided */
+  0,                                    /* properties_destroyed */
+  0,                                    /* todo_flags_start */
+  TODO_dump_func | TODO_verify_rtl_sharing /* todo_flags_finish */
+ }
+};