Enlist the FreeBSD-CURRENT users as testers of what is to become Gcc 3.1.0.

These bits are taken from the FSF anoncvs repo on 1-Feb-2002 08:20 PST.

1 files changed, 150 insertions, 110 deletions

diff --git a/contrib/gcc/reload.h b/contrib/gcc/reload.h
index 1998809..e832ed9 100644
--- a/contrib/gcc/reload.h
+++ b/contrib/gcc/reload.h
@@ -1,23 +1,23 @@
 /* Communication between reload.c and reload1.c.
-   Copyright (C) 1987, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000
-   Free Software Foundation, Inc.
+   Copyright (C) 1987, 1991, 1992, 1993, 1994, 1995, 1997, 1998,
+   1999, 2000, 2001 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC 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)
-any later version.
+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) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+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.  */
 
 
 /* If secondary reloads are the same for inputs and outputs, define those
@@ -44,35 +44,11 @@ Boston, MA 02111-1307, USA.  */
 #define MEMORY_MOVE_COST(MODE,CLASS,IN) 4
 #endif
 #endif
-extern int memory_move_secondary_cost PROTO ((enum machine_mode, enum reg_class, int));
-
-/* See reload.c and reload1.c for comments on these variables.  */
+extern int memory_move_secondary_cost PARAMS ((enum machine_mode, enum reg_class, int));
 
 /* Maximum number of reloads we can need.  */
 #define MAX_RELOADS (2 * MAX_RECOG_OPERANDS * (MAX_REGS_PER_ADDRESS + 1))
 
-extern rtx reload_in[MAX_RELOADS];
-extern rtx reload_out[MAX_RELOADS];
-extern rtx reload_in_reg[MAX_RELOADS];
-extern rtx reload_out_reg[MAX_RELOADS];
-extern enum reg_class reload_reg_class[MAX_RELOADS];
-extern enum machine_mode reload_inmode[MAX_RELOADS];
-extern enum machine_mode reload_outmode[MAX_RELOADS];
-extern char reload_optional[MAX_RELOADS];
-extern char reload_nongroup[MAX_RELOADS];
-extern int reload_inc[MAX_RELOADS];
-extern int reload_opnum[MAX_RELOADS];
-extern int reload_secondary_p[MAX_RELOADS];
-extern int reload_secondary_in_reload[MAX_RELOADS];
-extern int reload_secondary_out_reload[MAX_RELOADS];
-#ifdef MAX_INSN_CODE
-extern enum insn_code reload_secondary_in_icode[MAX_RELOADS];
-extern enum insn_code reload_secondary_out_icode[MAX_RELOADS];
-#endif
-extern int n_reloads;
-
-extern rtx reload_reg_rtx[MAX_RELOADS];
-
 /* Encode the usage of a reload.  The following codes are supported:
 
    RELOAD_FOR_INPUT		reload of an input operand
@@ -106,7 +82,87 @@ enum reload_type
   RELOAD_OTHER, RELOAD_FOR_OTHER_ADDRESS
 };
 
-extern enum reload_type reload_when_needed[MAX_RELOADS];
+#ifdef GCC_INSN_CODES_H
+/* Each reload is recorded with a structure like this.  */
+struct reload
+{
+  /* The value to reload from */
+  rtx in;
+  /* Where to store reload-reg afterward if nec (often the same as
+     reload_in)  */
+  rtx out;
+
+  /* The class of registers to reload into.  */
+  enum reg_class class;
+
+  /* The mode this operand should have when reloaded, on input.  */
+  enum machine_mode inmode;
+  /* The mode this operand should have when reloaded, on output.  */
+  enum machine_mode outmode;
+
+  /* The mode of the reload register.  */
+  enum machine_mode mode;
+
+  /* the largest number of registers this reload will require.  */
+  unsigned int nregs;
+
+  /* Positive amount to increment or decrement by if
+     reload_in is a PRE_DEC, PRE_INC, POST_DEC, POST_INC.
+     Ignored otherwise (don't assume it is zero).  */
+  int inc;
+  /* A reg for which reload_in is the equivalent.
+     If reload_in is a symbol_ref which came from
+     reg_equiv_constant, then this is the pseudo
+     which has that symbol_ref as equivalent.  */
+  rtx in_reg;
+  rtx out_reg;
+
+  /* Used in find_reload_regs to record the allocated register.  */
+  int regno;
+  /* This is the register to reload into.  If it is zero when `find_reloads'
+     returns, you must find a suitable register in the class specified by
+     reload_reg_class, and store here an rtx for that register with mode from
+     reload_inmode or reload_outmode.  */
+  rtx reg_rtx;
+  /* The operand number being reloaded.  This is used to group related reloads
+     and need not always be equal to the actual operand number in the insn,
+     though it current will be; for in-out operands, it is one of the two
+     operand numbers.  */
+  int opnum;
+
+  /* Gives the reload number of a secondary input reload, when needed;
+     otherwise -1.  */
+  int secondary_in_reload;
+  /* Gives the reload number of a secondary output reload, when needed;
+     otherwise -1.  */
+  int secondary_out_reload;
+  /* If a secondary input reload is required, gives the INSN_CODE that uses the
+     secondary reload as a scratch register, or CODE_FOR_nothing if the
+     secondary reload register is to be an intermediate register.  */
+  enum insn_code secondary_in_icode;
+  /* Likewise, for a secondary output reload.  */
+  enum insn_code secondary_out_icode;
+
+  /* Classifies reload as needed either for addressing an input reload,
+     addressing an output, for addressing a non-reloaded mem ref, or for
+     unspecified purposes (i.e., more than one of the above).  */
+  enum reload_type when_needed;
+  
+  /* Nonzero for an optional reload.  Optional reloads are ignored unless the
+     value is already sitting in a register.  */
+  unsigned int optional:1;
+  /* nonzero if this reload shouldn't be combined with another reload.  */
+  unsigned int nocombine:1;
+  /* Nonzero if this is a secondary register for one or more reloads.  */
+  unsigned int secondary_p:1;
+  /* Nonzero if this reload must use a register not already allocated to a
+     group.  */
+  unsigned int nongroup:1;
+};
+
+extern struct reload rld[MAX_RELOADS];
+extern int n_reloads;
+#endif
 
 extern rtx *reg_equiv_constant;
 extern rtx *reg_equiv_memory_loc;
@@ -127,7 +183,7 @@ extern int reload_first_uid;
 
 /* Nonzero if indirect addressing is supported when the innermost MEM is
    of the form (MEM (SYMBOL_REF sym)).  It is assumed that the level to
-   which these are valid is the same as spill_indirect_levels, above.   */
+   which these are valid is the same as spill_indirect_levels, above.  */
 
 extern char indirect_symref_ok;
 
@@ -136,14 +192,6 @@ extern char double_reg_address_ok;
 
 extern int num_not_at_initial_offset;
 
-#ifdef MAX_INSN_CODE
-/* These arrays record the insn_code of insns that may be needed to
-   perform input and output reloads of special objects.  They provide a
-   place to pass a scratch register.  */
-extern enum insn_code reload_in_optab[];
-extern enum insn_code reload_out_optab[];
-#endif
-
 struct needs
 {
   /* [0] is normal, [1] is nongroup.  */
@@ -169,32 +217,13 @@ struct insn_chain
   /* The rtx of the insn.  */
   rtx insn;
   /* Register life information: record all live hard registers, and all
-     live pseudos that have a hard register.
-     This information is recorded for the point immediately before the insn
-     (in live_before), and for the point within the insn at which all
-     outputs have just been written to (in live_after).  */
-  regset live_before;
-  regset live_after;
-
-  /* For each class, size of group of consecutive regs
-     that is needed for the reloads of this class.  */
-  char group_size[N_REG_CLASSES];
-  /* For each class, the machine mode which requires consecutive
-     groups of regs of that class.
-     If two different modes ever require groups of one class,
-     they must be the same size and equally restrictive for that class,
-     otherwise we can't handle the complexity.  */
-  enum machine_mode group_mode[N_REG_CLASSES];
-
-  /* Indicates if a register was counted against the need for
-     groups.  0 means it can count against max_nongroup instead.  */
-  HARD_REG_SET counted_for_groups;
-
-  /* Indicates if a register was counted against the need for
-     non-groups.  0 means it can become part of a new group.
-     During choose_reload_regs, 1 here means don't use this reg
-     as part of a group, even if it seems to be otherwise ok.  */
-  HARD_REG_SET counted_for_nongroups;
+     live pseudos that have a hard register.  */
+  regset_head live_throughout;
+  regset_head dead_or_set;
+
+  /* Copies of the global variables computed by find_reloads.  */
+  struct reload *rld;
+  int n_reloads;
 
   /* Indicates which registers have already been used for spills.  */
   HARD_REG_SET used_spill_regs;
@@ -218,9 +247,9 @@ struct insn_chain
 extern struct insn_chain *reload_insn_chain;
 
 /* Allocate a new insn_chain structure.  */
-extern struct insn_chain *new_insn_chain	PROTO((void));
+extern struct insn_chain *new_insn_chain	PARAMS ((void));
 
-extern void compute_use_by_pseudos		PROTO((HARD_REG_SET *, regset));
+extern void compute_use_by_pseudos		PARAMS ((HARD_REG_SET *, regset));
 #endif
 
 /* Functions from reload.c:  */
@@ -228,120 +257,131 @@ extern void compute_use_by_pseudos		PROTO((HARD_REG_SET *, regset));
 /* 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.  */
-extern rtx get_secondary_mem PROTO((rtx, enum machine_mode,
+extern rtx get_secondary_mem PARAMS ((rtx, enum machine_mode,
 				    int, enum reload_type));
 
 /* Clear any secondary memory locations we've made.  */
-extern void clear_secondary_mem PROTO((void));
+extern void clear_secondary_mem PARAMS ((void));
 
 /* Transfer all replacements that used to be in reload FROM to be in
    reload TO.  */
-extern void transfer_replacements PROTO((int, int));
+extern void transfer_replacements PARAMS ((int, int));
 
 /* IN_RTX is the value loaded by a reload that we now decided to inherit,
    or a subpart of it.  If we have any replacements registered for IN_RTX,
    chancel the reloads that were supposed to load them.
    Return non-zero if we chanceled any reloads.  */
-extern int remove_address_replacements PROTO((rtx in_rtx));
+extern int remove_address_replacements PARAMS ((rtx in_rtx));
 
 /* Like rtx_equal_p except that it allows a REG and a SUBREG to match
    if they are the same hard reg, and has special hacks for
    autoincrement and autodecrement.  */
-extern int operands_match_p PROTO((rtx, rtx));
+extern int operands_match_p PARAMS ((rtx, rtx));
 
-/* Return 1 if altering OP will not modify the value of CLOBBER. */
-extern int safe_from_earlyclobber PROTO((rtx, rtx));
+/* Return 1 if altering OP will not modify the value of CLOBBER.  */
+extern int safe_from_earlyclobber PARAMS ((rtx, rtx));
 
 /* Search the body of INSN for values that need reloading and record them
    with push_reload.  REPLACE nonzero means record also where the values occur
    so that subst_reloads can be used.  */
-extern int find_reloads PROTO((rtx, int, int, int, short *));
+extern int find_reloads PARAMS ((rtx, int, int, int, short *));
 
 /* Compute the sum of X and Y, making canonicalizations assumed in an
    address, namely: sum constant integers, surround the sum of two
    constants with a CONST, put the constant as the second operand, and
    group the constant on the outermost sum.  */
-extern rtx form_sum PROTO((rtx, rtx));
+extern rtx form_sum PARAMS ((rtx, rtx));
 
 /* Substitute into the current INSN the registers into which we have reloaded
    the things that need reloading.  */
-extern void subst_reloads PROTO((void));
+extern void subst_reloads PARAMS ((rtx));
 
 /* Make a copy of any replacements being done into X and move those copies
    to locations in Y, a copy of X.  We only look at the highest level of
    the RTL.  */
-extern void copy_replacements PROTO((rtx, rtx));
+extern void copy_replacements PARAMS ((rtx, rtx));
 
 /* Change any replacements being done to *X to be done to *Y */
-extern void move_replacements PROTO((rtx *x, rtx *y));
+extern void move_replacements PARAMS ((rtx *x, rtx *y));
 
 /* If LOC was scheduled to be replaced by something, return the replacement.
    Otherwise, return *LOC.  */
-extern rtx find_replacement PROTO((rtx *));
+extern rtx find_replacement PARAMS ((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 PROTO((int, int, rtx, rtx *));
+extern int refers_to_regno_for_reload_p PARAMS ((unsigned int, unsigned int,
+						 rtx, rtx *));
 
 /* Nonzero if modifying X will affect IN.  */
-extern int reg_overlap_mentioned_for_reload_p PROTO((rtx, rtx));
+extern int reg_overlap_mentioned_for_reload_p PARAMS ((rtx, rtx));
 
 /* Return nonzero if anything in X contains a MEM.  Look also for pseudo
    registers.  */
-extern int refers_to_mem_for_reload_p PROTO((rtx));
+extern int refers_to_mem_for_reload_p PARAMS ((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 PROTO((rtx, rtx, enum reg_class, int, short *,
+extern rtx find_equiv_reg PARAMS ((rtx, rtx, enum reg_class, int, short *,
 				 int, enum machine_mode));
 
 /* Return 1 if register REGNO is the subject of a clobber in insn INSN.  */
-extern int regno_clobbered_p PROTO((int, rtx, enum machine_mode, int));
+extern int regno_clobbered_p PARAMS ((unsigned int, rtx, enum machine_mode,
+				      int));
 
-/* Functions in reload1.c:  */
+/* Return 1 if X is an operand of an insn that is being earlyclobbered.  */
+extern int earlyclobber_operand_p PARAMS ((rtx));
 
-extern int reloads_conflict		PROTO ((int, int));
+/* Record one reload that needs to be performed.  */
+extern int push_reload PARAMS ((rtx, rtx, rtx *, rtx *, enum reg_class,
+				enum machine_mode, enum machine_mode,
+				int, int, int, enum reload_type));
+
+/* Functions in reload1.c:  */
 
-int count_occurrences            PROTO((rtx, rtx));
+extern void reload_cse_regs		PARAMS ((rtx));
+extern int reloads_conflict		PARAMS ((int, int));
 
 /* Initialize the reload pass once per compilation.  */
-extern void init_reload PROTO((void));
+extern void init_reload PARAMS ((void));
 
 /* The reload pass itself.  */
-extern int reload PROTO((rtx, int, FILE *));
+extern int reload PARAMS ((rtx, int));
 
 /* Mark the slots in regs_ever_live for the hard regs
    used by pseudo-reg number REGNO.  */
-extern void mark_home_live PROTO((int));
+extern void mark_home_live PARAMS ((int));
 
 /* Scan X and replace any eliminable registers (such as fp) with a
    replacement (such as sp), plus an offset.  */
-extern rtx eliminate_regs PROTO((rtx, enum machine_mode, rtx));
+extern rtx eliminate_regs PARAMS ((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 PROTO((rtx, rtx, int, enum reload_type));
+extern rtx gen_reload PARAMS ((rtx, rtx, int, enum reload_type));
 
 /* Deallocate the reload register used by reload number R.  */
-extern void deallocate_reload_reg PROTO((int r));
+extern void deallocate_reload_reg PARAMS ((int r));
 
 /* Functions in caller-save.c:  */
 
 /* Initialize for caller-save.  */
-extern void init_caller_save PROTO((void));
+extern void init_caller_save PARAMS ((void));
 
 /* Initialize save areas by showing that we haven't allocated any yet.  */
-extern void init_save_areas PROTO((void));
+extern void init_save_areas PARAMS ((void));
 
 /* Allocate save areas for any hard registers that might need saving.  */
-extern void setup_save_areas PROTO((void));
+extern void setup_save_areas PARAMS ((void));
 
 /* Find the places where hard regs are live across calls and save them.  */
-extern void save_call_clobbered_regs PROTO((void));
+extern void save_call_clobbered_regs PARAMS ((void));
 
 /* Replace (subreg (reg)) with the appropriate (reg) for any operands.  */
-extern void cleanup_subreg_operands PROTO ((rtx));
+extern void cleanup_subreg_operands PARAMS ((rtx));
 
-extern int earlyclobber_operand_p PROTO((rtx));
+/* Debugging support.  */
+extern void debug_reload_to_stream PARAMS ((FILE *));
+extern void debug_reload PARAMS ((void));