GCC 4.2.0 release.

1 files changed, 20 insertions, 38 deletions

diff --git a/contrib/gcc/reload.h b/contrib/gcc/reload.h
index 9a5e33c..6de5e84 100644
--- a/contrib/gcc/reload.h
+++ b/contrib/gcc/reload.h
@@ -1,6 +1,6 @@
 /* Communication between reload.c and reload1.c.
    Copyright (C) 1987, 1991, 1992, 1993, 1994, 1995, 1997, 1998,
-   1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -16,8 +16,8 @@ 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, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 
 /* If secondary reloads are the same for inputs and outputs, define those
@@ -30,19 +30,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   SECONDARY_RELOAD_CLASS (CLASS, MODE, X)
 #endif
 
-/* If either macro is defined, show that we need secondary reloads.  */
-#if defined(SECONDARY_INPUT_RELOAD_CLASS) || defined(SECONDARY_OUTPUT_RELOAD_CLASS)
-#define HAVE_SECONDARY_RELOADS
-#endif
-
 /* If MEMORY_MOVE_COST isn't defined, give it a default here.  */
 #ifndef MEMORY_MOVE_COST
-#ifdef HAVE_SECONDARY_RELOADS
 #define MEMORY_MOVE_COST(MODE,CLASS,IN) \
   (4 + memory_move_secondary_cost ((MODE), (CLASS), (IN)))
-#else
-#define MEMORY_MOVE_COST(MODE,CLASS,IN) 4
-#endif
 #endif
 extern int memory_move_secondary_cost (enum machine_mode, enum reg_class, int);
 
@@ -164,10 +155,20 @@ extern struct reload rld[MAX_RELOADS];
 extern int n_reloads;
 #endif
 
+extern GTY (()) VEC(rtx,gc) *reg_equiv_memory_loc_vec;
 extern rtx *reg_equiv_constant;
+extern rtx *reg_equiv_invariant;
 extern rtx *reg_equiv_memory_loc;
 extern rtx *reg_equiv_address;
 extern rtx *reg_equiv_mem;
+extern rtx *reg_equiv_alt_mem_list;
+
+/* Element N is the list of insns that initialized reg N from its equivalent
+   constant or memory slot.  */
+extern GTY((length("reg_equiv_init_size"))) rtx *reg_equiv_init;
+
+/* The size of the previous array, for GC purposes.  */
+extern GTY(()) int reg_equiv_init_size;
 
 /* All the "earlyclobber" operands of the current insn
    are recorded here.  */
@@ -192,13 +193,6 @@ extern char double_reg_address_ok;
 
 extern int num_not_at_initial_offset;
 
-struct needs
-{
-  /* [0] is normal, [1] is nongroup.  */
-  short regs[2][N_REG_CLASSES];
-  short groups[N_REG_CLASSES];
-};
-
 #if defined SET_HARD_REG_BIT && defined CLEAR_REG_SET
 /* This structure describes instructions which are relevant for reload.
    Apart from all regular insns, this also includes CODE_LABELs, since they
@@ -228,9 +222,6 @@ struct insn_chain
   /* Indicates which registers have already been used for spills.  */
   HARD_REG_SET used_spill_regs;
 
-  /* Describe the needs for reload registers of this insn.  */
-  struct needs need;
-
   /* Nonzero if find_reloads said the insn requires reloading.  */
   unsigned int need_reload:1;
   /* Nonzero if find_reloads needs to be run during reload_as_needed to
@@ -254,6 +245,13 @@ extern void compute_use_by_pseudos (HARD_REG_SET *, regset);
 
 /* Functions from reload.c:  */
 
+extern enum reg_class secondary_reload_class (bool, enum reg_class,
+					      enum machine_mode, rtx);
+
+#ifdef GCC_INSN_CODES_H
+extern enum reg_class scratch_reload_class (enum insn_code);
+#endif
+
 /* Return a memory location that will be used to copy X in mode MODE.
    If we haven't already made a location for this mode in this insn,
    call find_reloads_address on the location being returned.  */
@@ -307,19 +305,9 @@ extern void move_replacements (rtx *x, rtx *y);
    Otherwise, return *LOC.  */
 extern rtx find_replacement (rtx *);
 
-/* Return nonzero if register in range [REGNO, ENDREGNO)
-   appears either explicitly or implicitly in X
-   other than being stored into.  */
-extern int refers_to_regno_for_reload_p (unsigned int, unsigned int,
-					 rtx, rtx *);
-
 /* Nonzero if modifying X will affect IN.  */
 extern int reg_overlap_mentioned_for_reload_p (rtx, rtx);
 
-/* Return nonzero if anything in X contains a MEM.  Look also for pseudo
-   registers.  */
-extern int refers_to_mem_for_reload_p (rtx);
-
 /* Check the insns before INSN to see if there is a suitable register
    containing the same value as GOAL.  */
 extern rtx find_equiv_reg (rtx, rtx, enum reg_class, int, short *,
@@ -340,7 +328,6 @@ extern int push_reload (rtx, rtx, rtx *, rtx *, enum reg_class,
 extern void reload_cse_regs (rtx);
 
 /* Functions in reload1.c:  */
-extern int reloads_conflict (int, int);
 
 /* Initialize the reload pass once per compilation.  */
 extern void init_reload (void);
@@ -356,11 +343,6 @@ extern void mark_home_live (int);
    replacement (such as sp), plus an offset.  */
 extern rtx eliminate_regs (rtx, enum machine_mode, rtx);
 
-/* Emit code to perform a reload from IN (which may be a reload register) to
-   OUT (which may also be a reload register).  IN or OUT is from operand
-   OPNUM with reload type TYPE.  */
-extern rtx gen_reload (rtx, rtx, int, enum reload_type);
-
 /* Deallocate the reload register used by reload number R.  */
 extern void deallocate_reload_reg (int r);