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, 65 insertions, 23 deletions

diff --git a/contrib/gcc/integrate.h b/contrib/gcc/integrate.h
index 0382559..9ddefef 100644
--- a/contrib/gcc/integrate.h
+++ b/contrib/gcc/integrate.h
@@ -1,22 +1,22 @@
 /* Function integration definitions for GNU C-Compiler
-   Copyright (C) 1990, 1995, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1995, 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.  */
 
 #include "varray.h"
 
@@ -36,15 +36,21 @@ struct inline_remap
 {
   /* True if we are doing function integration, false otherwise.
      Used to control whether RTX_UNCHANGING bits are copied by
-     copy_rtx_and_substitute. */
+     copy_rtx_and_substitute.  */
   int integrating;
   /* Definition of function be inlined.  */
   union tree_node *fndecl;
   /* Place to put insns needed at start of function.  */
   rtx insns_at_start;
+  /* Mapping from old BLOCKs to new BLOCKs.  */
+  varray_type block_map;
   /* Mapping from old registers to new registers.
      It is allocated and deallocated in `expand_inline_function' */
   rtx *reg_map;
+#if defined (LEAF_REGISTERS) && defined (LEAF_REG_REMAP)
+  /* Mapping from old leaf registers to new leaf registers.  */
+  rtx leaf_reg_map[FIRST_PSEUDO_REGISTER][NUM_MACHINE_MODES];
+#endif
   /* Mapping from old code-labels to new code-labels.
      The first element of this map is label_map[min_labelno].  */
   rtx *label_map;
@@ -91,9 +97,12 @@ struct inline_remap
   /* Likewise, this is the copied constraints vector.  */
   rtvec copy_asm_constraints_vector;
 
+  /* Target of a return insn, if needed and inlining.  */
+  rtx local_return_label;
+
   /* Indications for regs being pointers and their alignment.  */
-  char *regno_pointer_flag;
-  char *regno_pointer_align;
+  unsigned char *regno_pointer_align;
+  rtx *x_regno_reg_rtx;
 
   /* The next few fields are used for subst_constants to record the SETs
      that it saw.  */
@@ -110,18 +119,51 @@ struct inline_remap
   /* Record the last thing assigned to cc0.  */
   rtx last_cc0_value;
 #endif
+  /* Note mode of COMPARE if the mode would be otherwise lost (comparing of
+     two VOIDmode constants.  */
+  rtx compare_src;
+  enum machine_mode compare_mode;
 };
 
 /* Return a copy of an rtx (as needed), substituting pseudo-register,
    labels, and frame-pointer offsets as necessary.  */
-extern rtx copy_rtx_and_substitute PROTO((rtx, struct inline_remap *));
-
-extern void try_constants PROTO((rtx, struct inline_remap *));
-
-extern void mark_stores PROTO((rtx, rtx));
+extern rtx copy_rtx_and_substitute PARAMS ((rtx, struct inline_remap *, int));
+
+/* Return a pseudo that corresponds to the value in the specified hard
+   reg as of the start of the function (for inlined functions, the
+   value at the start of the parent function).  */
+extern rtx get_hard_reg_initial_val		PARAMS ((enum machine_mode, int));
+/* Likewise, but for a different than the current function, or
+   arbitrary expression.  */
+extern rtx get_func_hard_reg_initial_val	PARAMS ((struct function *, rtx));
+/* Likewise, but iff someone else has caused it to become allocated.  */
+extern rtx has_func_hard_reg_initial_val	PARAMS ((struct function *, rtx));
+/* Likewise, but for common cases.  */
+extern rtx has_hard_reg_initial_val		PARAMS ((enum machine_mode, int));
+/* If a pseudo represents an initial hard reg (or expression), return
+   it, else return NULL_RTX.  */
+extern rtx get_hard_reg_initial_reg		PARAMS ((struct function *, rtx));
+/* This is for GC.  */
+extern void mark_hard_reg_initial_vals		PARAMS ((struct function *));
+/* Called from rest_of_compilation.  */
+extern void emit_initial_value_sets		PARAMS ((void));
+extern void allocate_initial_values		PARAMS ((rtx *));
+
+/* Copy a declaration when one function is substituted inline into
+   another.  */
+extern union tree_node *copy_decl_for_inlining PARAMS ((union tree_node *,
+						      union tree_node *,
+						      union tree_node *));
+
+/* Check whether there's any attribute in a function declaration that
+   makes the function uninlinable.  Returns false if it finds any,
+   true otherwise.  */
+extern bool function_attribute_inlinable_p PARAMS ((union tree_node *));
+
+extern void try_constants PARAMS ((rtx, struct inline_remap *));
 
 /* Return the label indicated.  */
-extern rtx get_label_from_map PROTO((struct inline_remap *, int));
+extern rtx get_label_from_map PARAMS ((struct inline_remap *, int));
 
 /* Set the label indicated.  */
 #define set_label_in_map(MAP, I, X) ((MAP)->label_map[I] = (X))
@@ -134,7 +176,7 @@ extern varray_type global_const_equiv_varray;
 
 #define MAYBE_EXTEND_CONST_EQUIV_VARRAY(MAP,MAX)			\
   {									\
-    if ((MAX) >= VARRAY_SIZE ((MAP)->const_equiv_varray))		\
+    if ((size_t)(MAX) >= VARRAY_SIZE ((MAP)->const_equiv_varray))	\
       {									\
         int is_global = (global_const_equiv_varray			\
 			 == (MAP)->const_equiv_varray);			\