Change all calls to eliminate_regs.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@13705 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index ed33ae7..ea5923d 100644 (file)
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -1,5 +1,5 @@
 /* Save and restore call-clobbered registers which are live across a call.
-   Copyright (C) 1989, 1992, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -335,7 +335,7 @@ setup_save_areas (pchanged)
     for (j = 1; j <= MOVE_MAX / UNITS_PER_WORD; j++)
       if (regno_save_mem[i][j] != 0)
        ok &= strict_memory_address_p (GET_MODE (regno_save_mem[i][j]),
-                                      XEXP (eliminate_regs (regno_save_mem[i][j], 0, NULL_RTX), 0));
+                                      XEXP (eliminate_regs (regno_save_mem[i][j], 0, NULL_RTX, 1), 0));
 
   return ok;
 }

diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index c8964ab..51058db 100644 (file)
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -1,5 +1,5 @@
 /* Output dbx-format symbol table information from GNU compiler.
-   Copyright (C) 1987, 88, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1987, 88, 92-96, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -1859,7 +1859,7 @@ dbxout_symbol (decl, local)
          /* else it is something we handle like a normal variable.  */
        }
 
-      DECL_RTL (decl) = eliminate_regs (DECL_RTL (decl), 0, NULL_RTX);
+      DECL_RTL (decl) = eliminate_regs (DECL_RTL (decl), 0, NULL_RTX, 0);
 #ifdef LEAF_REG_REMAP
       if (leaf_function)
        leaf_renumber_regs_insn (DECL_RTL (decl));
@@ -2171,8 +2171,8 @@ dbxout_parms (parms)
        /* Perform any necessary register eliminations on the parameter's rtl,
           so that the debugging output will be accurate.  */
        DECL_INCOMING_RTL (parms)
-         = eliminate_regs (DECL_INCOMING_RTL (parms), 0, NULL_RTX);
-       DECL_RTL (parms) = eliminate_regs (DECL_RTL (parms), 0, NULL_RTX);
+         = eliminate_regs (DECL_INCOMING_RTL (parms), 0, NULL_RTX, 0);
+       DECL_RTL (parms) = eliminate_regs (DECL_RTL (parms), 0, NULL_RTX, 0);
 #ifdef LEAF_REG_REMAP
        if (leaf_function)
          {

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 1f108df..89df539 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -1,5 +1,5 @@
 /* Output Dwarf2 format symbol table information from the GNU C compiler.
-   Copyright (C) 1992, 1993, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
    Contributed by Gary Funck (gary@intrepid.com).  Derived from the
    DWARF 1 implementation written by Ron Guilmette (rfg@monkeys.com).
    Extensively modified by Jason Merrill (jason@cygnus.com).
@@ -5708,7 +5708,7 @@ add_location_attribute (die, rtl)
       && (GET_CODE (rtl) != MEM
          || !is_pseudo_reg (XEXP (rtl, 0))))
     {
-      loc_descr = loc_descriptor (eliminate_regs (rtl, 0, NULL_RTX));
+      loc_descr = loc_descriptor (eliminate_regs (rtl, 0, NULL_RTX, 0));
     }
 
 #ifdef MIPS_DEBUGGING_INFO
@@ -6115,7 +6115,7 @@ add_bound_info (subrange_die, bound_attr, bound)
       if (!optimize)
        {
          bound_loc = mem_loc_descriptor
-           (eliminate_regs (SAVE_EXPR_RTL (bound), 0, NULL_RTX));
+           (eliminate_regs (SAVE_EXPR_RTL (bound), 0, NULL_RTX, 0));
          add_AT_loc (subrange_die, bound_attr, bound_loc);
        }
       /* else leave out the attribute.  */

diff --git a/gcc/dwarfout.c b/gcc/dwarfout.c
index ed20189..f91cccb 100644 (file)
--- a/gcc/dwarfout.c
+++ b/gcc/dwarfout.c
@@ -1860,7 +1860,7 @@ output_bound_representation (bound, dim_num, u_or_l)
 
            if (TREE_CODE (bound) == SAVE_EXPR)
              output_loc_descriptor
-               (eliminate_regs (SAVE_EXPR_RTL (bound), 0, NULL_RTX));
+               (eliminate_regs (SAVE_EXPR_RTL (bound), 0, NULL_RTX, 0));
          }
 
        ASM_OUTPUT_LABEL (asm_out_file, end_label);
@@ -2130,7 +2130,7 @@ location_attribute (rtl)
 
   if (! is_pseudo_reg (rtl)
       && (GET_CODE (rtl) != MEM || ! is_pseudo_reg (XEXP (rtl, 0))))
-    output_loc_descriptor (eliminate_regs (rtl, 0, NULL_RTX));
+    output_loc_descriptor (eliminate_regs (rtl, 0, NULL_RTX, 0));
 
   ASM_OUTPUT_LABEL (asm_out_file, end_label);
 }

diff --git a/gcc/reload.c b/gcc/reload.c
index b0fd66b..40ab588 100644 (file)
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -673,7 +673,7 @@ get_secondary_mem (x, mode, opnum, type)
   /* Get a version of the address doing any eliminations needed.  If that
      didn't give us a new MEM, make a new one if it isn't valid.  */
 
-  loc = eliminate_regs (secondary_memlocs[(int) mode], VOIDmode, NULL_RTX);
+  loc = eliminate_regs (secondary_memlocs[(int) mode], VOIDmode, NULL_RTX, 0);
   mem_valid = strict_memory_address_p (mode, XEXP (loc, 0));
 
   if (! mem_valid && loc == secondary_memlocs[(int) mode])
@@ -2604,7 +2604,7 @@ find_reloads (insn, replace, ind_levels, live_known, reload_reg_p)
              /* We must rerun eliminate_regs, in case the elimination
                 offsets have changed.  */
              rtx address = XEXP (eliminate_regs (reg_equiv_memory_loc[regno],
-                                                 0, NULL_RTX),
+                                                 0, NULL_RTX, 0),
                                  0);
 
              if (rtx_varies_p (address))
@@ -4057,7 +4057,7 @@ find_reloads_toplev (x, opnum, type, ind_levels, is_set_dest)
          /* We must rerun eliminate_regs, in case the elimination
             offsets have changed.  */
          rtx addr = XEXP (eliminate_regs (reg_equiv_memory_loc[regno], 0,
-                                          NULL_RTX),
+                                          NULL_RTX, 0),
                           0);
 
          if (rtx_varies_p (addr))
@@ -4141,7 +4141,7 @@ find_reloads_toplev (x, opnum, type, ind_levels, is_set_dest)
          /* We must rerun eliminate_regs, in case the elimination
             offsets have changed.  */
          rtx addr = XEXP (eliminate_regs (reg_equiv_memory_loc[regno], 0,
-                                          NULL_RTX),
+                                          NULL_RTX, 0),
                           0);
          if (BYTES_BIG_ENDIAN)
            {
@@ -4181,7 +4181,7 @@ make_memloc (ad, regno)
   register int i;
   /* We must rerun eliminate_regs, in case the elimination
      offsets have changed.  */
-  rtx tem = XEXP (eliminate_regs (reg_equiv_memory_loc[regno], 0, NULL_RTX),
+  rtx tem = XEXP (eliminate_regs (reg_equiv_memory_loc[regno], 0, NULL_RTX, 0),
                  0);
 
 #if 0 /* We cannot safely reuse a memloc made here;

diff --git a/gcc/sdbout.c b/gcc/sdbout.c
index 788061c..12924c0 100644 (file)
--- a/gcc/sdbout.c
+++ b/gcc/sdbout.c
@@ -1,5 +1,5 @@
 /* Output sdb-format symbol table information from GNU compiler.
-   Copyright (C) 1988, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1988, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -787,7 +787,7 @@ sdbout_symbol (decl, local)
       if (DECL_RTL (decl) == 0)
        return;
 
-      DECL_RTL (decl) = eliminate_regs (DECL_RTL (decl), 0, NULL_RTX);
+      DECL_RTL (decl) = eliminate_regs (DECL_RTL (decl), 0, NULL_RTX, 0);
 #ifdef LEAF_REG_REMAP
       if (leaf_function)
        leaf_renumber_regs_insn (DECL_RTL (decl));
@@ -1287,8 +1287,8 @@ sdbout_parms (parms)
        /* Perform any necessary register eliminations on the parameter's rtl,
           so that the debugging output will be accurate.  */
        DECL_INCOMING_RTL (parms) =
-         eliminate_regs (DECL_INCOMING_RTL (parms), 0, NULL_RTX);
-       DECL_RTL (parms) = eliminate_regs (DECL_RTL (parms), 0, NULL_RTX);
+         eliminate_regs (DECL_INCOMING_RTL (parms), 0, NULL_RTX, 0);
+       DECL_RTL (parms) = eliminate_regs (DECL_RTL (parms), 0, NULL_RTX, 0);
 
        if (PARM_PASSED_IN_MEMORY (parms))
          {