/* Procedure integration for GNU CC.
- Copyright (C) 1988, 91, 93-98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1988, 1991, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Michael Tiemann (tiemann@cygnus.com)
This file is part of GNU CC.
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-
#include "config.h"
#include "system.h"
#include "rtl.h"
#include "tree.h"
+#include "tm_p.h"
#include "regs.h"
#include "flags.h"
+#include "debug.h"
#include "insn-config.h"
-#include "insn-flags.h"
#include "expr.h"
#include "output.h"
#include "recog.h"
#include "function.h"
#include "toplev.h"
#include "intl.h"
+#include "loop.h"
+#include "params.h"
+#include "ggc.h"
#include "obstack.h"
#define obstack_chunk_alloc xmalloc
? (1 + (3 * list_length (DECL_ARGUMENTS (DECL))) / 2) \
: (8 * (8 + list_length (DECL_ARGUMENTS (DECL)))))
#endif
+
+/* Decide whether a function with a target specific attribute
+ attached can be inlined. By default we disallow this. */
+#ifndef FUNCTION_ATTRIBUTE_INLINABLE_P
+#define FUNCTION_ATTRIBUTE_INLINABLE_P(FNDECL) 0
+#endif
\f
-static rtvec initialize_for_inline PROTO((tree));
-static void adjust_copied_decl_tree PROTO((tree));
-static void note_modified_parmregs PROTO((rtx, rtx));
-static void integrate_parm_decls PROTO((tree, struct inline_remap *,
- rtvec));
-static void integrate_decl_tree PROTO((tree, int,
- struct inline_remap *));
-static void subst_constants PROTO((rtx *, rtx,
- struct inline_remap *));
-static void set_block_origin_self PROTO((tree));
-static void set_decl_origin_self PROTO((tree));
-static void set_block_abstract_flags PROTO((tree, int));
-static void process_reg_param PROTO((struct inline_remap *, rtx,
- rtx));
-
-
-void set_decl_abstract_flags PROTO((tree, int));
-static tree copy_and_set_decl_abstract_origin PROTO((tree));
-
-/* The maximum number of instructions accepted for inlining a
- function. Increasing values mean more agressive inlining.
- This affects currently only functions explicitly marked as
- inline (or methods defined within the class definition for C++).
- The default value of 10000 is arbitrary but high to match the
- previously unlimited gcc capabilities. */
-
-int inline_max_insns = 10000;
+
+/* Private type used by {get/has}_func_hard_reg_initial_val. */
+typedef struct initial_value_pair {
+ rtx hard_reg;
+ rtx pseudo;
+} initial_value_pair;
+typedef struct initial_value_struct {
+ int num_entries;
+ int max_entries;
+ initial_value_pair *entries;
+} initial_value_struct;
+
+static void setup_initial_hard_reg_value_integration PARAMS ((struct function *, struct inline_remap *));
+
+static rtvec initialize_for_inline PARAMS ((tree));
+static void note_modified_parmregs PARAMS ((rtx, rtx, void *));
+static void integrate_parm_decls PARAMS ((tree, struct inline_remap *,
+ rtvec));
+static tree integrate_decl_tree PARAMS ((tree,
+ struct inline_remap *));
+static void subst_constants PARAMS ((rtx *, rtx,
+ struct inline_remap *, int));
+static void set_block_origin_self PARAMS ((tree));
+static void set_block_abstract_flags PARAMS ((tree, int));
+static void process_reg_param PARAMS ((struct inline_remap *, rtx,
+ rtx));
+void set_decl_abstract_flags PARAMS ((tree, int));
+static void mark_stores PARAMS ((rtx, rtx, void *));
+static void save_parm_insns PARAMS ((rtx, rtx));
+static void copy_insn_list PARAMS ((rtx, struct inline_remap *,
+ rtx));
+static void copy_insn_notes PARAMS ((rtx, struct inline_remap *,
+ int));
+static int compare_blocks PARAMS ((const PTR, const PTR));
+static int find_block PARAMS ((const PTR, const PTR));
/* Used by copy_rtx_and_substitute; this indicates whether the function is
called for the purpose of inlining or some other purpose (i.e. loop
rtx x = map->label_map[i];
if (x == NULL_RTX)
- x = map->label_map[i] = gen_label_rtx();
+ x = map->label_map[i] = gen_label_rtx ();
return x;
}
tree last = tree_last (TYPE_ARG_TYPES (TREE_TYPE (fndecl)));
/* For functions marked as inline increase the maximum size to
- inline_max_insns (-finline-limit-<n>). For regular functions
+ MAX_INLINE_INSNS (-finline-limit-<n>). For regular functions
use the limit given by INTEGRATE_THRESHOLD. */
int max_insns = (DECL_INLINE (fndecl))
- ? (inline_max_insns
+ ? (MAX_INLINE_INSNS
+ 8 * list_length (DECL_ARGUMENTS (fndecl)))
: INTEGRATE_THRESHOLD (fndecl);
register int ninsns = 0;
register tree parms;
- rtx result;
+
+ if (DECL_UNINLINABLE (fndecl))
+ return N_("function cannot be inline");
/* No inlines with varargs. */
if ((last && TREE_VALUE (last) != void_type_node)
if (current_function_calls_alloca)
return N_("function using alloca cannot be inline");
+ if (current_function_calls_setjmp)
+ return N_("function using setjmp cannot be inline");
+
+ if (current_function_calls_eh_return)
+ return N_("function uses __builtin_eh_return");
+
if (current_function_contains_functions)
return N_("function with nested functions cannot be inline");
if (forced_labels)
- return "function with label addresses used in initializers cannot inline";
+ return
+ N_("function with label addresses used in initializers cannot inline");
if (current_function_cannot_inline)
return current_function_cannot_inline;
return N_("inline functions not supported for this return value type");
/* We can't inline functions that return structures of varying size. */
- if (int_size_in_bytes (TREE_TYPE (TREE_TYPE (fndecl))) < 0)
+ if (TREE_CODE (TREE_TYPE (TREE_TYPE (fndecl))) != VOID_TYPE
+ && int_size_in_bytes (TREE_TYPE (TREE_TYPE (fndecl))) < 0)
return N_("function with varying-size return value cannot be inline");
/* Cannot inline a function with a varying size argument or one that
{
if (int_size_in_bytes (TREE_TYPE (parms)) < 0)
return N_("function with varying-size parameter cannot be inline");
- else if (TYPE_TRANSPARENT_UNION (TREE_TYPE (parms)))
+ else if (TREE_CODE (TREE_TYPE (parms)) == UNION_TYPE
+ && TYPE_TRANSPARENT_UNION (TREE_TYPE (parms)))
return N_("function with transparent unit parameter cannot be inline");
}
for (ninsns = 0, insn = get_first_nonparm_insn ();
insn && ninsns < max_insns;
insn = NEXT_INSN (insn))
- if (GET_RTX_CLASS (GET_CODE (insn)) == 'i')
+ if (INSN_P (insn))
ninsns++;
if (ninsns >= max_insns)
if (current_function_has_nonlocal_goto)
return N_("function with nonlocal goto cannot be inline");
- /* This is a hack, until the inliner is taught about eh regions at
- the start of the function. */
- for (insn = get_insns ();
- insn
- && ! (GET_CODE (insn) == NOTE
- && NOTE_LINE_NUMBER (insn) == NOTE_INSN_FUNCTION_BEG);
- insn = NEXT_INSN (insn))
+ /* We can't inline functions that return a PARALLEL rtx. */
+ if (DECL_RTL_SET_P (DECL_RESULT (fndecl)))
{
- if (insn && GET_CODE (insn) == NOTE
- && NOTE_LINE_NUMBER (insn) == NOTE_INSN_EH_REGION_BEG)
- return N_("function with complex parameters cannot be inline");
+ rtx result = DECL_RTL (DECL_RESULT (fndecl));
+ if (GET_CODE (result) == PARALLEL)
+ return N_("inline functions not supported for this return value type");
}
- /* We can't inline functions that return a PARALLEL rtx. */
- result = DECL_RTL (DECL_RESULT (fndecl));
- if (result && GET_CODE (result) == PARALLEL)
- return N_("inline functions not supported for this return value type");
+ /* If the function has a target specific attribute attached to it,
+ then we assume that we should not inline it. This can be overriden
+ by the target if it defines FUNCTION_ATTRIBUTE_INLINABLE_P. */
+ if (DECL_MACHINE_ATTRIBUTES (fndecl)
+ && ! FUNCTION_ATTRIBUTE_INLINABLE_P (fndecl))
+ return N_("function with target specific attribute(s) cannot be inlined");
- return 0;
+ return NULL;
}
\f
/* Map pseudo reg number into the PARM_DECL for the parm living in the reg.
/* In save_for_inline, nonzero if past the parm-initialization insns. */
static int in_nonparm_insns;
\f
-/* Subroutine for `save_for_inline_nocopy'. Performs initialization
+/* Subroutine for `save_for_inline'. Performs initialization
needed to save FNDECL's insns and info for future inline expansion. */
static rtvec
tree parms;
/* Clear out PARMDECL_MAP. It was allocated in the caller's frame. */
- bzero ((char *) parmdecl_map, max_parm_reg * sizeof (tree));
+ memset ((char *) parmdecl_map, 0, max_parm_reg * sizeof (tree));
arg_vector = rtvec_alloc (list_length (DECL_ARGUMENTS (fndecl)));
for (parms = DECL_ARGUMENTS (fndecl), i = 0;
return arg_vector;
}
-/* Adjust the BLOCK_END_NOTE pointers in a given copied DECL tree so that
- they all point to the new (copied) rtxs. */
+/* Copy NODE (which must be a DECL, but not a PARM_DECL). The DECL
+ originally was in the FROM_FN, but now it will be in the
+ TO_FN. */
-static void
-adjust_copied_decl_tree (block)
- register tree block;
+tree
+copy_decl_for_inlining (decl, from_fn, to_fn)
+ tree decl;
+ tree from_fn;
+ tree to_fn;
{
- register tree subblock;
- register rtx original_end;
+ tree copy;
- original_end = BLOCK_END_NOTE (block);
- if (original_end)
+ /* Copy the declaration. */
+ if (TREE_CODE (decl) == PARM_DECL || TREE_CODE (decl) == RESULT_DECL)
+ {
+ /* For a parameter, we must make an equivalent VAR_DECL, not a
+ new PARM_DECL. */
+ copy = build_decl (VAR_DECL, DECL_NAME (decl), TREE_TYPE (decl));
+ TREE_ADDRESSABLE (copy) = TREE_ADDRESSABLE (decl);
+ TREE_READONLY (copy) = TREE_READONLY (decl);
+ TREE_THIS_VOLATILE (copy) = TREE_THIS_VOLATILE (decl);
+ }
+ else
{
- BLOCK_END_NOTE (block) = (rtx) NOTE_SOURCE_FILE (original_end);
- NOTE_SOURCE_FILE (original_end) = 0;
+ copy = copy_node (decl);
+ if (DECL_LANG_SPECIFIC (copy))
+ copy_lang_decl (copy);
+
+ /* TREE_ADDRESSABLE isn't used to indicate that a label's
+ address has been taken; it's for internal bookkeeping in
+ expand_goto_internal. */
+ if (TREE_CODE (copy) == LABEL_DECL)
+ TREE_ADDRESSABLE (copy) = 0;
}
- /* Process all subblocks. */
- for (subblock = BLOCK_SUBBLOCKS (block);
- subblock;
- subblock = TREE_CHAIN (subblock))
- adjust_copied_decl_tree (subblock);
-}
+ /* Set the DECL_ABSTRACT_ORIGIN so the debugging routines know what
+ declaration inspired this copy. */
+ DECL_ABSTRACT_ORIGIN (copy) = DECL_ORIGIN (decl);
-/* Copy NODE (as with copy_node). NODE must be a DECL. Set the
- DECL_ABSTRACT_ORIGIN for the new accordinly. */
+ /* The new variable/label has no RTL, yet. */
+ SET_DECL_RTL (copy, NULL_RTX);
-static tree
-copy_and_set_decl_abstract_origin (node)
- tree node;
-{
- tree copy = copy_node (node);
- if (DECL_ABSTRACT_ORIGIN (copy) != NULL_TREE)
- /* That means that NODE already had a DECL_ABSTRACT_ORIGIN. (This
- situation occurs if we inline a function which itself made
- calls to inline functions.) Since DECL_ABSTRACT_ORIGIN is the
- most distant ancestor, we don't have to do anything here. */
+ /* These args would always appear unused, if not for this. */
+ TREE_USED (copy) = 1;
+
+ /* Set the context for the new declaration. */
+ if (!DECL_CONTEXT (decl))
+ /* Globals stay global. */
+ ;
+ else if (DECL_CONTEXT (decl) != from_fn)
+ /* Things that weren't in the scope of the function we're inlining
+ from aren't in the scope we're inlining too, either. */
+ ;
+ else if (TREE_STATIC (decl))
+ /* Function-scoped static variables should say in the original
+ function. */
;
else
- /* The most distant ancestor must be NODE. */
- DECL_ABSTRACT_ORIGIN (copy) = node;
+ /* Ordinary automatic local variables are now in the scope of the
+ new function. */
+ DECL_CONTEXT (copy) = to_fn;
return copy;
}
functions at the end of compilation. */
void
-save_for_inline_nocopy (fndecl)
+save_for_inline (fndecl)
tree fndecl;
{
rtx insn;
for the parms, prior to elimination of virtual registers.
These values are needed for substituting parms properly. */
- parmdecl_map = (tree *) alloca (max_parm_reg * sizeof (tree));
+ parmdecl_map = (tree *) xmalloc (max_parm_reg * sizeof (tree));
/* Make and emit a return-label if we have not already done so. */
argvec = initialize_for_inline (fndecl);
+ /* Delete basic block notes created by early run of find_basic_block.
+ The notes would be later used by find_basic_blocks to reuse the memory
+ for basic_block structures on already freed obstack. */
+ for (insn = get_insns (); insn ; insn = NEXT_INSN (insn))
+ if (GET_CODE (insn) == NOTE && NOTE_LINE_NUMBER (insn) == NOTE_INSN_BASIC_BLOCK)
+ delete_insn (insn);
+
/* If there are insns that copy parms from the stack into pseudo registers,
those insns are not copied. `expand_inline_function' must
emit the correct code to handle such things. */
perform constant folding when its incoming value is constant).
Otherwise, we have to copy its value into a new register and track
the new register's life. */
+ in_nonparm_insns = 0;
+ save_parm_insns (insn, first_nonparm_insn);
+
+ cfun->inl_max_label_num = max_label_num ();
+ cfun->inl_last_parm_insn = cfun->x_last_parm_insn;
+ cfun->original_arg_vector = argvec;
+ cfun->original_decl_initial = DECL_INITIAL (fndecl);
+ cfun->no_debugging_symbols = (write_symbols == NO_DEBUG);
+ DECL_SAVED_INSNS (fndecl) = cfun;
+
+ /* Clean up. */
+ free (parmdecl_map);
+}
+
+/* Scan the chain of insns to see what happens to our PARM_DECLs. If a
+ PARM_DECL is used but never modified, we can substitute its rtl directly
+ when expanding inline (and perform constant folding when its incoming
+ value is constant). Otherwise, we have to copy its value into a new
+ register and track the new register's life. */
+
+static void
+save_parm_insns (insn, first_nonparm_insn)
+ rtx insn;
+ rtx first_nonparm_insn;
+{
+ if (insn == NULL_RTX)
+ return;
for (insn = NEXT_INSN (insn); insn; insn = NEXT_INSN (insn))
{
if (insn == first_nonparm_insn)
in_nonparm_insns = 1;
- if (GET_RTX_CLASS (GET_CODE (insn)) == 'i')
- /* Record what interesting things happen to our parameters. */
- note_stores (PATTERN (insn), note_modified_parmregs);
- }
-
- /* We have now allocated all that needs to be allocated permanently
- on the rtx obstack. Set our high-water mark, so that we
- can free the rest of this when the time comes. */
-
- preserve_data ();
+ if (INSN_P (insn))
+ {
+ /* Record what interesting things happen to our parameters. */
+ note_stores (PATTERN (insn), note_modified_parmregs, NULL);
+
+ /* If this is a CALL_PLACEHOLDER insn then we need to look into the
+ three attached sequences: normal call, sibling call and tail
+ recursion. */
+ if (GET_CODE (insn) == CALL_INSN
+ && GET_CODE (PATTERN (insn)) == CALL_PLACEHOLDER)
+ {
+ int i;
- current_function->inl_max_label_num = max_label_num ();
- current_function->inl_last_parm_insn = current_function->x_last_parm_insn;
- current_function->original_arg_vector = argvec;
- current_function->original_decl_initial = DECL_INITIAL (fndecl);
- DECL_SAVED_INSNS (fndecl) = current_function;
+ for (i = 0; i < 3; i++)
+ save_parm_insns (XEXP (PATTERN (insn), i),
+ first_nonparm_insn);
+ }
+ }
+ }
}
\f
/* Note whether a parameter is modified or not. */
static void
-note_modified_parmregs (reg, x)
+note_modified_parmregs (reg, x, data)
rtx reg;
rtx x ATTRIBUTE_UNUSED;
+ void *data ATTRIBUTE_UNUSED;
{
if (GET_CODE (reg) == REG && in_nonparm_insns
&& REGNO (reg) < max_parm_reg
map->reg_map[REGNO (loc)] = copy;
}
-/* Used by duplicate_eh_handlers to map labels for the exception table */
-static struct inline_remap *eif_eh_map;
+/* Compare two BLOCKs for qsort. The key we sort on is the
+ BLOCK_ABSTRACT_ORIGIN of the blocks. */
-static rtx
-expand_inline_function_eh_labelmap (label)
- rtx label;
+static int
+compare_blocks (v1, v2)
+ const PTR v1;
+ const PTR v2;
{
- int index = CODE_LABEL_NUMBER (label);
- return get_label_from_map (eif_eh_map, index);
+ tree b1 = *((const tree *) v1);
+ tree b2 = *((const tree *) v2);
+
+ return ((char *) BLOCK_ABSTRACT_ORIGIN (b1)
+ - (char *) BLOCK_ABSTRACT_ORIGIN (b2));
+}
+
+/* Compare two BLOCKs for bsearch. The first pointer corresponds to
+ an original block; the second to a remapped equivalent. */
+
+static int
+find_block (v1, v2)
+ const PTR v1;
+ const PTR v2;
+{
+ const union tree_node *b1 = (const union tree_node *) v1;
+ tree b2 = *((const tree *) v2);
+
+ return ((const char *) b1 - (char *) BLOCK_ABSTRACT_ORIGIN (b2));
}
/* Integrate the procedure defined by FNDECL. Note that this function
: parm_insns);
tree *arg_trees;
rtx *arg_vals;
- rtx insn;
int max_regno;
register int i;
int min_labelno = inl_f->emit->x_first_label_num;
int max_labelno = inl_f->inl_max_label_num;
int nargs;
- rtx local_return_label = 0;
rtx loc;
rtx stack_save = 0;
rtx temp;
rtvec arg_vector = (rtvec) inl_f->original_arg_vector;
rtx static_chain_value = 0;
int inl_max_uid;
+ int eh_region_offset;
/* The pointer used to track the true location of the memory used
for MAP->LABEL_MAP. */
if (max_regno < FIRST_PSEUDO_REGISTER)
abort ();
+ /* Pull out the decl for the function definition; fndecl may be a
+ local declaration, which would break DECL_ABSTRACT_ORIGIN. */
+ fndecl = inl_f->decl;
+
nargs = list_length (DECL_ARGUMENTS (fndecl));
+ if (cfun->preferred_stack_boundary < inl_f->preferred_stack_boundary)
+ cfun->preferred_stack_boundary = inl_f->preferred_stack_boundary;
+
/* Check that the parms type match and that sufficient arguments were
passed. Since the appropriate conversions or default promotions have
already been applied, the machine modes should match exactly. */
arg = TREE_VALUE (actual);
mode = TYPE_MODE (DECL_ARG_TYPE (formal));
- if (mode != TYPE_MODE (TREE_TYPE (arg))
+ if (arg == error_mark_node
+ || mode != TYPE_MODE (TREE_TYPE (arg))
/* If they are block mode, the types should match exactly.
They don't match exactly if TREE_TYPE (FORMAL) == ERROR_MARK_NODE,
which could happen if the parameter has incomplete type. */
expand_expr (TREE_VALUE (actual), const0_rtx,
TYPE_MODE (TREE_TYPE (TREE_VALUE (actual))), 0);
- /* Make a binding contour to keep inline cleanups called at
- outer function-scope level from looking like they are shadowing
- parameter declarations. */
- pushlevel (0);
-
/* Expand the function arguments. Do this first so that any
new registers get created before we allocate the maps. */
- arg_vals = (rtx *) alloca (nargs * sizeof (rtx));
- arg_trees = (tree *) alloca (nargs * sizeof (tree));
+ arg_vals = (rtx *) xmalloc (nargs * sizeof (rtx));
+ arg_trees = (tree *) xmalloc (nargs * sizeof (tree));
for (formal = DECL_ARGUMENTS (fndecl), actual = parms, i = 0;
formal;
if (GET_CODE (loc) == MEM && GET_CODE (XEXP (loc, 0)) == REG
&& REGNO (XEXP (loc, 0)) > LAST_VIRTUAL_REGISTER)
{
- rtx stack_slot
- = assign_stack_temp (TYPE_MODE (TREE_TYPE (arg)),
- int_size_in_bytes (TREE_TYPE (arg)), 1);
- MEM_SET_IN_STRUCT_P (stack_slot,
- AGGREGATE_TYPE_P (TREE_TYPE (arg)));
+ rtx stack_slot = assign_temp (TREE_TYPE (arg), 1, 1, 1);
store_expr (arg, stack_slot, 0);
-
arg_vals[i] = XEXP (stack_slot, 0);
invisiref = 1;
}
else if (GET_CODE (loc) != MEM)
{
if (GET_MODE (loc) != TYPE_MODE (TREE_TYPE (arg)))
- /* The mode if LOC and ARG can differ if LOC was a variable
- that had its mode promoted via PROMOTED_MODE. */
- arg_vals[i] = convert_modes (GET_MODE (loc),
- TYPE_MODE (TREE_TYPE (arg)),
- expand_expr (arg, NULL_RTX, mode,
- EXPAND_SUM),
- TREE_UNSIGNED (TREE_TYPE (formal)));
+ {
+ int unsignedp = TREE_UNSIGNED (TREE_TYPE (formal));
+ enum machine_mode pmode = TYPE_MODE (TREE_TYPE (formal));
+
+ pmode = promote_mode (TREE_TYPE (formal), pmode,
+ &unsignedp, 0);
+
+ if (GET_MODE (loc) != pmode)
+ abort ();
+
+ /* The mode if LOC and ARG can differ if LOC was a variable
+ that had its mode promoted via PROMOTED_MODE. */
+ arg_vals[i] = convert_modes (pmode,
+ TYPE_MODE (TREE_TYPE (arg)),
+ expand_expr (arg, NULL_RTX, mode,
+ EXPAND_SUM),
+ unsignedp);
+ }
else
arg_vals[i] = expand_expr (arg, NULL_RTX, mode, EXPAND_SUM);
}
if (arg_vals[i] != 0 && GET_CODE (arg_vals[i]) == REG
&& POINTER_TYPE_P (TREE_TYPE (formal)))
mark_reg_pointer (arg_vals[i],
- (TYPE_ALIGN (TREE_TYPE (TREE_TYPE (formal)))
- / BITS_PER_UNIT));
+ TYPE_ALIGN (TREE_TYPE (TREE_TYPE (formal))));
}
-
+
/* Allocate the structures we use to remap things. */
- map = (struct inline_remap *) alloca (sizeof (struct inline_remap));
+ map = (struct inline_remap *) xcalloc (1, sizeof (struct inline_remap));
map->fndecl = fndecl;
- map->reg_map = (rtx *) alloca (max_regno * sizeof (rtx));
- bzero ((char *) map->reg_map, max_regno * sizeof (rtx));
+ VARRAY_TREE_INIT (map->block_map, 10, "block_map");
+ map->reg_map = (rtx *) xcalloc (max_regno, sizeof (rtx));
/* We used to use alloca here, but the size of what it would try to
allocate would occasionally cause it to exceed the stack limit and
real_label_map
= (rtx *) xmalloc ((max_labelno) * sizeof (rtx));
map->label_map = real_label_map;
+ map->local_return_label = NULL_RTX;
inl_max_uid = (inl_f->emit->x_cur_insn_uid + 1);
- map->insn_map = (rtx *) alloca (inl_max_uid * sizeof (rtx));
- bzero ((char *) map->insn_map, inl_max_uid * sizeof (rtx));
+ map->insn_map = (rtx *) xcalloc (inl_max_uid, sizeof (rtx));
map->min_insnno = 0;
map->max_insnno = inl_max_uid;
map->integrating = 1;
+ map->compare_src = NULL_RTX;
+ map->compare_mode = VOIDmode;
/* const_equiv_varray maps pseudos in our routine to constants, so
it needs to be large enough for all our pseudos. This is the
insn that can be used as an insertion point. */
map->insns_at_start = get_last_insn ();
if (map->insns_at_start == 0)
- map->insns_at_start = emit_note (NULL_PTR, NOTE_INSN_DELETED);
+ map->insns_at_start = emit_note (NULL, NOTE_INSN_DELETED);
- map->regno_pointer_flag = inl_f->emit->regno_pointer_flag;
map->regno_pointer_align = inl_f->emit->regno_pointer_align;
+ map->x_regno_reg_rtx = inl_f->emit->x_regno_reg_rtx;
/* Update the outgoing argument size to allow for those in the inlined
function. */
}
else if (GET_CODE (loc) == MEM)
{
- /* This is the case of a parameter that lives in memory.
- It will live in the block we allocate in the called routine's
+ /* This is the case of a parameter that lives in memory. It
+ will live in the block we allocate in the called routine's
frame that simulates the incoming argument area. Do nothing
- now; we will call store_expr later. */
- ;
+ with the parameter now; we will call store_expr later. In
+ this case, however, we must ensure that the virtual stack and
+ incoming arg rtx values are expanded now so that we can be
+ sure we have enough slots in the const equiv map since the
+ store_expr call can easily blow the size estimate. */
+ if (DECL_SAVED_INSNS (fndecl)->args_size != 0)
+ copy_rtx_and_substitute (virtual_incoming_args_rtx, map, 0);
}
else if (GET_CODE (loc) == REG)
process_reg_param (map, loc, copy);
/* Compute the address in the area we reserved and store the
value there. */
- temp = copy_rtx_and_substitute (loc, map);
- subst_constants (&temp, NULL_RTX, map);
+ temp = copy_rtx_and_substitute (loc, map, 1);
+ subst_constants (&temp, NULL_RTX, map, 1);
apply_change_group ();
if (! memory_address_p (GET_MODE (temp), XEXP (temp, 0)))
temp = change_address (temp, VOIDmode, XEXP (temp, 0));
REG_FUNCTION_RETURN_VALUE_P. */
map->inline_target = 0;
- loc = DECL_RTL (DECL_RESULT (fndecl));
+ loc = (DECL_RTL_SET_P (DECL_RESULT (fndecl))
+ ? DECL_RTL (DECL_RESULT (fndecl)) : NULL_RTX);
if (TYPE_MODE (type) == VOIDmode)
/* There is no return value to worry about. */
{
if (GET_CODE (XEXP (loc, 0)) == ADDRESSOF)
{
- temp = copy_rtx_and_substitute (loc, map);
- subst_constants (&temp, NULL_RTX, map);
+ temp = copy_rtx_and_substitute (loc, map, 1);
+ subst_constants (&temp, NULL_RTX, map, 1);
apply_change_group ();
target = temp;
}
if (! structure_value_addr
|| ! aggregate_value_p (DECL_RESULT (fndecl)))
abort ();
-
+
/* Pass the function the address in which to return a structure
value. Note that a constructor can cause someone to call us
with STRUCTURE_VALUE_ADDR, but the initialization takes place
{
temp = force_operand (structure_value_addr, NULL_RTX);
temp = force_reg (Pmode, temp);
+ /* A virtual register might be invalid in an insn, because
+ it can cause trouble in reload. Since we don't have access
+ to the expanders at map translation time, make sure we have
+ a proper register now.
+ If a virtual register is actually valid, cse or combine
+ can put it into the mapped insns. */
+ if (REGNO (temp) >= FIRST_VIRTUAL_REGISTER
+ && REGNO (temp) <= LAST_VIRTUAL_REGISTER)
+ temp = copy_to_mode_reg (Pmode, temp);
map->reg_map[REGNO (XEXP (loc, 0))] = temp;
if (CONSTANT_P (structure_value_addr)
}
else
{
- temp = copy_rtx_and_substitute (loc, map);
- subst_constants (&temp, NULL_RTX, map);
+ temp = copy_rtx_and_substitute (loc, map, 1);
+ subst_constants (&temp, NULL_RTX, map, 0);
apply_change_group ();
emit_move_insn (temp, structure_value_addr);
}
{
/* Don't make BLKmode registers. If this looks like
a BLKmode object being returned in a register, get
- the mode from that, otherwise abort. */
+ the mode from that, otherwise abort. */
if (departing_mode == BLKmode)
{
if (REG == GET_CODE (DECL_RTL (DECL_RESULT (fndecl))))
arriving_mode = departing_mode;
}
else
- abort();
+ abort ();
}
-
- target = gen_reg_rtx (departing_mode);
+
+ target = gen_reg_rtx (departing_mode);
}
/* If function's value was promoted before return,
else
map->reg_map[REGNO (loc)] = reg_to_map;
}
+ else if (GET_CODE (loc) == CONCAT)
+ {
+ enum machine_mode departing_mode = TYPE_MODE (type);
+ enum machine_mode arriving_mode
+ = GET_MODE (DECL_RTL (DECL_RESULT (fndecl)));
+
+ if (departing_mode != arriving_mode)
+ abort ();
+ if (GET_CODE (XEXP (loc, 0)) != REG
+ || GET_CODE (XEXP (loc, 1)) != REG)
+ abort ();
+
+ /* Don't use MEMs as direct targets because on some machines
+ substituting a MEM for a REG makes invalid insns.
+ Let the combiner substitute the MEM if that is valid. */
+ if (target == 0 || GET_CODE (target) != REG
+ || GET_MODE (target) != departing_mode)
+ target = gen_reg_rtx (departing_mode);
+
+ if (GET_CODE (target) != CONCAT)
+ abort ();
+
+ map->reg_map[REGNO (XEXP (loc, 0))] = XEXP (target, 0);
+ map->reg_map[REGNO (XEXP (loc, 1))] = XEXP (target, 1);
+ }
else
abort ();
- /* Make a fresh binding contour that we can easily remove. Do this after
- expanding our arguments so cleanups are properly scoped. */
- pushlevel (0);
- expand_start_bindings (0);
+ /* Remap the exception handler data pointer from one to the other. */
+ temp = get_exception_pointer (inl_f);
+ if (temp)
+ map->reg_map[REGNO (temp)] = get_exception_pointer (cfun);
/* Initialize label_map. get_label_from_map will actually make
the labels. */
- bzero ((char *) &map->label_map [min_labelno],
+ memset ((char *) &map->label_map[min_labelno], 0,
(max_labelno - min_labelno) * sizeof (rtx));
+ /* Make copies of the decls of the symbols in the inline function, so that
+ the copies of the variables get declared in the current function. Set
+ up things so that lookup_static_chain knows that to interpret registers
+ in SAVE_EXPRs for TYPE_SIZEs as local. */
+ inline_function_decl = fndecl;
+ integrate_parm_decls (DECL_ARGUMENTS (fndecl), map, arg_vector);
+ block = integrate_decl_tree (inl_f->original_decl_initial, map);
+ BLOCK_ABSTRACT_ORIGIN (block) = DECL_ORIGIN (fndecl);
+ inline_function_decl = 0;
+
+ /* Make a fresh binding contour that we can easily remove. Do this after
+ expanding our arguments so cleanups are properly scoped. */
+ expand_start_bindings_and_block (0, block);
+
+ /* Sort the block-map so that it will be easy to find remapped
+ blocks later. */
+ qsort (&VARRAY_TREE (map->block_map, 0),
+ map->block_map->elements_used,
+ sizeof (tree),
+ compare_blocks);
+
/* Perform postincrements before actually calling the function. */
emit_queue ();
if (inl_f->calls_alloca)
emit_stack_save (SAVE_BLOCK, &stack_save, NULL_RTX);
- /* Now copy the insns one by one. Do this in two passes, first the insns and
- then their REG_NOTES, just like save_for_inline. */
+ /* Map pseudos used for initial hard reg values. */
+ setup_initial_hard_reg_value_integration (inl_f, map);
+
+ /* Now copy the insns one by one. */
+ copy_insn_list (insns, map, static_chain_value);
+
+ /* Duplicate the EH regions. This will create an offset from the
+ region numbers in the function we're inlining to the region
+ numbers in the calling function. This must wait until after
+ copy_insn_list, as we need the insn map to be complete. */
+ eh_region_offset = duplicate_eh_regions (inl_f, map);
+
+ /* Now copy the REG_NOTES for those insns. */
+ copy_insn_notes (insns, map, eh_region_offset);
+
+ /* If the insn sequence required one, emit the return label. */
+ if (map->local_return_label)
+ emit_label (map->local_return_label);
+
+ /* Restore the stack pointer if we saved it above. */
+ if (inl_f->calls_alloca)
+ emit_stack_restore (SAVE_BLOCK, stack_save, NULL_RTX);
+
+ if (! cfun->x_whole_function_mode_p)
+ /* In statement-at-a-time mode, we just tell the front-end to add
+ this block to the list of blocks at this binding level. We
+ can't do it the way it's done for function-at-a-time mode the
+ superblocks have not been created yet. */
+ insert_block (block);
+ else
+ {
+ BLOCK_CHAIN (block)
+ = BLOCK_CHAIN (DECL_INITIAL (current_function_decl));
+ BLOCK_CHAIN (DECL_INITIAL (current_function_decl)) = block;
+ }
+
+ /* End the scope containing the copied formal parameter variables
+ and copied LABEL_DECLs. We pass NULL_TREE for the variables list
+ here so that expand_end_bindings will not check for unused
+ variables. That's already been checked for when the inlined
+ function was defined. */
+ expand_end_bindings (NULL_TREE, 1, 1);
+
+ /* Must mark the line number note after inlined functions as a repeat, so
+ that the test coverage code can avoid counting the call twice. This
+ just tells the code to ignore the immediately following line note, since
+ there already exists a copy of this note before the expanded inline call.
+ This line number note is still needed for debugging though, so we can't
+ delete it. */
+ if (flag_test_coverage)
+ emit_note (0, NOTE_INSN_REPEATED_LINE_NUMBER);
+
+ emit_line_note (input_filename, lineno);
+
+ /* If the function returns a BLKmode object in a register, copy it
+ out of the temp register into a BLKmode memory object. */
+ if (target
+ && TYPE_MODE (TREE_TYPE (TREE_TYPE (fndecl))) == BLKmode
+ && ! aggregate_value_p (TREE_TYPE (TREE_TYPE (fndecl))))
+ target = copy_blkmode_from_reg (0, target, TREE_TYPE (TREE_TYPE (fndecl)));
+
+ if (structure_value_addr)
+ {
+ target = gen_rtx_MEM (TYPE_MODE (type),
+ memory_address (TYPE_MODE (type),
+ structure_value_addr));
+ set_mem_attributes (target, type, 1);
+ }
+
+ /* Make sure we free the things we explicitly allocated with xmalloc. */
+ if (real_label_map)
+ free (real_label_map);
+ VARRAY_FREE (map->const_equiv_varray);
+ free (map->reg_map);
+ VARRAY_FREE (map->block_map);
+ free (map->insn_map);
+ free (map);
+ free (arg_vals);
+ free (arg_trees);
+
+ inlining = inlining_previous;
+
+ return target;
+}
+
+/* Make copies of each insn in the given list using the mapping
+ computed in expand_inline_function. This function may call itself for
+ insns containing sequences.
+
+ Copying is done in two passes, first the insns and then their REG_NOTES.
+
+ If static_chain_value is non-zero, it represents the context-pointer
+ register for the function. */
+
+static void
+copy_insn_list (insns, map, static_chain_value)
+ rtx insns;
+ struct inline_remap *map;
+ rtx static_chain_value;
+{
+ register int i;
+ rtx insn;
+ rtx temp;
+#ifdef HAVE_cc0
+ rtx cc0_insn = 0;
+#endif
+
+ /* Copy the insns one by one. Do this in two passes, first the insns and
+ then their REG_NOTES. */
/* This loop is very similar to the loop in copy_loop_body in unroll.c. */
inline_target. */
break;
- /* If the inline fn needs eh context, make sure that
- the current fn has one. */
- if (GET_CODE (pattern) == USE
- && find_reg_note (insn, REG_EH_CONTEXT, 0) != 0)
- get_eh_context ();
-
/* Ignore setting a function value that we don't want to use. */
if (map->inline_target == 0
&& set != 0
/* If we must not delete the source,
load it into a new temporary. */
- copy = emit_insn (copy_rtx_and_substitute (pattern, map));
+ copy = emit_insn (copy_rtx_and_substitute (pattern, map, 0));
new_set = single_set (copy);
if (new_set == 0)
has a note on it, keep the insn. */
else if (rtx_equal_p (SET_DEST (set), SET_SRC (set))
&& REG_NOTES (insn) != 0)
- copy = emit_insn (copy_rtx_and_substitute (pattern, map));
+ copy = emit_insn (copy_rtx_and_substitute (pattern, map, 0));
else
break;
}
+ /* Similarly if an ignored return value is clobbered. */
+ else if (map->inline_target == 0
+ && GET_CODE (pattern) == CLOBBER
+ && GET_CODE (XEXP (pattern, 0)) == REG
+ && REG_FUNCTION_VALUE_P (XEXP (pattern, 0)))
+ break;
+
/* If this is setting the static chain rtx, omit it. */
else if (static_chain_value != 0
&& set != 0
&& rtx_equal_p (SET_SRC (set),
static_chain_incoming_rtx))
{
- rtx newdest = copy_rtx_and_substitute (SET_DEST (set), map);
+ rtx newdest = copy_rtx_and_substitute (SET_DEST (set), map, 1);
copy = emit_move_insn (newdest, static_chain_value);
static_chain_value = 0;
}
+
+ /* If this is setting the virtual stack vars register, this must
+ be the code at the handler for a builtin longjmp. The value
+ saved in the setjmp buffer will be the address of the frame
+ we've made for this inlined instance within our frame. But we
+ know the offset of that value so we can use it to reconstruct
+ our virtual stack vars register from that value. If we are
+ copying it from the stack pointer, leave it unchanged. */
+ else if (set != 0
+ && rtx_equal_p (SET_DEST (set), virtual_stack_vars_rtx))
+ {
+ HOST_WIDE_INT offset;
+ temp = map->reg_map[REGNO (SET_DEST (set))];
+ temp = VARRAY_CONST_EQUIV (map->const_equiv_varray,
+ REGNO (temp)).rtx;
+
+ if (rtx_equal_p (temp, virtual_stack_vars_rtx))
+ offset = 0;
+ else if (GET_CODE (temp) == PLUS
+ && rtx_equal_p (XEXP (temp, 0), virtual_stack_vars_rtx)
+ && GET_CODE (XEXP (temp, 1)) == CONST_INT)
+ offset = INTVAL (XEXP (temp, 1));
+ else
+ abort ();
+
+ if (rtx_equal_p (SET_SRC (set), stack_pointer_rtx))
+ temp = SET_SRC (set);
+ else
+ temp = force_operand (plus_constant (SET_SRC (set),
+ - offset),
+ NULL_RTX);
+
+ copy = emit_move_insn (virtual_stack_vars_rtx, temp);
+ }
+
else
- copy = emit_insn (copy_rtx_and_substitute (pattern, map));
+ copy = emit_insn (copy_rtx_and_substitute (pattern, map, 0));
/* REG_NOTES will be copied later. */
#ifdef HAVE_cc0
break;
case JUMP_INSN:
- if (GET_CODE (PATTERN (insn)) == RETURN
- || (GET_CODE (PATTERN (insn)) == PARALLEL
- && GET_CODE (XVECEXP (PATTERN (insn), 0, 0)) == RETURN))
+ if (map->integrating && returnjump_p (insn))
{
- if (local_return_label == 0)
- local_return_label = gen_label_rtx ();
- pattern = gen_jump (local_return_label);
+ if (map->local_return_label == 0)
+ map->local_return_label = gen_label_rtx ();
+ pattern = gen_jump (map->local_return_label);
}
else
- pattern = copy_rtx_and_substitute (PATTERN (insn), map);
+ pattern = copy_rtx_and_substitute (PATTERN (insn), map, 0);
copy = emit_jump_insn (pattern);
/* If this used to be a conditional jump insn but whose branch
direction is now know, we must do something special. */
- if (condjump_p (insn) && ! simplejump_p (insn) && map->last_pc_value)
+ if (any_condjump_p (insn) && onlyjump_p (insn) && map->last_pc_value)
{
#ifdef HAVE_cc0
/* If the previous insn set cc0 for us, delete it. */
break;
case CALL_INSN:
- pattern = copy_rtx_and_substitute (PATTERN (insn), map);
+ /* If this is a CALL_PLACEHOLDER insn then we need to copy the
+ three attached sequences: normal call, sibling call and tail
+ recursion. */
+ if (GET_CODE (PATTERN (insn)) == CALL_PLACEHOLDER)
+ {
+ rtx sequence[3];
+ rtx tail_label;
+
+ for (i = 0; i < 3; i++)
+ {
+ rtx seq;
+
+ sequence[i] = NULL_RTX;
+ seq = XEXP (PATTERN (insn), i);
+ if (seq)
+ {
+ start_sequence ();
+ copy_insn_list (seq, map, static_chain_value);
+ sequence[i] = get_insns ();
+ end_sequence ();
+ }
+ }
+
+ /* Find the new tail recursion label.
+ It will already be substituted into sequence[2]. */
+ tail_label = copy_rtx_and_substitute (XEXP (PATTERN (insn), 3),
+ map, 0);
+
+ copy = emit_call_insn (gen_rtx_CALL_PLACEHOLDER (VOIDmode,
+ sequence[0],
+ sequence[1],
+ sequence[2],
+ tail_label));
+ break;
+ }
+
+ pattern = copy_rtx_and_substitute (PATTERN (insn), map, 0);
copy = emit_call_insn (pattern);
+ SIBLING_CALL_P (copy) = SIBLING_CALL_P (insn);
+ CONST_CALL_P (copy) = CONST_CALL_P (insn);
+
/* Because the USAGE information potentially contains objects other
than hard registers, we need to copy it. */
+
CALL_INSN_FUNCTION_USAGE (copy)
- = copy_rtx_and_substitute (CALL_INSN_FUNCTION_USAGE (insn), map);
+ = copy_rtx_and_substitute (CALL_INSN_FUNCTION_USAGE (insn),
+ map, 0);
#ifdef HAVE_cc0
if (cc0_insn)
break;
case NOTE:
- /* It is important to discard function-end and function-beg notes,
- so we have only one of each in the current function.
- Also, NOTE_INSN_DELETED notes aren't useful (save_for_inline
- deleted these in the copy used for continuing compilation,
- not the copy used for inlining). */
+ if (NOTE_LINE_NUMBER (insn) == NOTE_INSN_DELETED_LABEL)
+ {
+ copy = emit_label (get_label_from_map (map,
+ CODE_LABEL_NUMBER (insn)));
+ map->const_age++;
+ break;
+ }
+
+ /* NOTE_INSN_FUNCTION_END and NOTE_INSN_FUNCTION_BEG are
+ discarded because it is important to have only one of
+ each in the current function.
+
+ NOTE_INSN_DELETED notes aren't useful. */
+
if (NOTE_LINE_NUMBER (insn) != NOTE_INSN_FUNCTION_END
&& NOTE_LINE_NUMBER (insn) != NOTE_INSN_FUNCTION_BEG
&& NOTE_LINE_NUMBER (insn) != NOTE_INSN_DELETED)
copy = emit_note (NOTE_SOURCE_FILE (insn),
NOTE_LINE_NUMBER (insn));
if (copy
- && (NOTE_LINE_NUMBER (copy) == NOTE_INSN_EH_REGION_BEG
- || NOTE_LINE_NUMBER (copy) == NOTE_INSN_EH_REGION_END))
+ && (NOTE_LINE_NUMBER (copy) == NOTE_INSN_BLOCK_BEG
+ || NOTE_LINE_NUMBER (copy) == NOTE_INSN_BLOCK_END)
+ && NOTE_BLOCK (insn))
{
- rtx label
- = get_label_from_map (map, NOTE_BLOCK_NUMBER (copy));
-
- /* we have to duplicate the handlers for the original */
- if (NOTE_LINE_NUMBER (copy) == NOTE_INSN_EH_REGION_BEG)
- {
- /* We need to duplicate the handlers for the EH region
- and we need to indicate where the label map is */
- eif_eh_map = map;
- duplicate_eh_handlers (NOTE_BLOCK_NUMBER (copy),
- CODE_LABEL_NUMBER (label),
- expand_inline_function_eh_labelmap);
- }
-
- /* We have to forward these both to match the new exception
- region. */
- NOTE_BLOCK_NUMBER (copy) = CODE_LABEL_NUMBER (label);
+ tree *mapped_block_p;
+
+ mapped_block_p
+ = (tree *) bsearch (NOTE_BLOCK (insn),
+ &VARRAY_TREE (map->block_map, 0),
+ map->block_map->elements_used,
+ sizeof (tree),
+ find_block);
+
+ if (!mapped_block_p)
+ abort ();
+ else
+ NOTE_BLOCK (copy) = *mapped_block_p;
}
+ else if (copy
+ && NOTE_LINE_NUMBER (copy) == NOTE_INSN_EXPECTED_VALUE)
+ NOTE_EXPECTED_VALUE (copy)
+ = copy_rtx_and_substitute (NOTE_EXPECTED_VALUE (insn),
+ map, 0);
}
else
copy = 0;
default:
abort ();
- break;
}
if (copy)
map->insn_map[INSN_UID (insn)] = copy;
}
+}
- /* Now copy the REG_NOTES. Increment const_age, so that only constants
- from parameters can be substituted in. These are the only ones that
- are valid across the entire function. */
- map->const_age++;
- for (insn = insns; insn; insn = NEXT_INSN (insn))
- if (GET_RTX_CLASS (GET_CODE (insn)) == 'i'
- && map->insn_map[INSN_UID (insn)]
- && REG_NOTES (insn))
- {
- rtx tem = copy_rtx_and_substitute (REG_NOTES (insn), map);
- /* We must also do subst_constants, in case one of our parameters
- has const type and constant value. */
- subst_constants (&tem, NULL_RTX, map);
- apply_change_group ();
- REG_NOTES (map->insn_map[INSN_UID (insn)]) = tem;
- }
-
- if (local_return_label)
- emit_label (local_return_label);
+/* Copy the REG_NOTES. Increment const_age, so that only constants
+ from parameters can be substituted in. These are the only ones
+ that are valid across the entire function. */
- /* Restore the stack pointer if we saved it above. */
- if (inl_f->calls_alloca)
- emit_stack_restore (SAVE_BLOCK, stack_save, NULL_RTX);
+static void
+copy_insn_notes (insns, map, eh_region_offset)
+ rtx insns;
+ struct inline_remap *map;
+ int eh_region_offset;
+{
+ rtx insn, new_insn;
- /* Make copies of the decls of the symbols in the inline function, so that
- the copies of the variables get declared in the current function. Set
- up things so that lookup_static_chain knows that to interpret registers
- in SAVE_EXPRs for TYPE_SIZEs as local. */
+ map->const_age++;
+ for (insn = insns; insn; insn = NEXT_INSN (insn))
+ {
+ if (! INSN_P (insn))
+ continue;
- inline_function_decl = fndecl;
- integrate_parm_decls (DECL_ARGUMENTS (fndecl), map, arg_vector);
- integrate_decl_tree (inl_f->original_decl_initial, 0, map);
- inline_function_decl = 0;
+ new_insn = map->insn_map[INSN_UID (insn)];
+ if (! new_insn)
+ continue;
- /* End the scope containing the copied formal parameter variables
- and copied LABEL_DECLs. */
+ if (REG_NOTES (insn))
+ {
+ rtx next, note = copy_rtx_and_substitute (REG_NOTES (insn), map, 0);
- expand_end_bindings (getdecls (), 1, 1);
- block = poplevel (1, 1, 0);
- BLOCK_ABSTRACT_ORIGIN (block) = (DECL_ABSTRACT_ORIGIN (fndecl) == NULL
- ? fndecl : DECL_ABSTRACT_ORIGIN (fndecl));
- poplevel (0, 0, 0);
+ /* We must also do subst_constants, in case one of our parameters
+ has const type and constant value. */
+ subst_constants (¬e, NULL_RTX, map, 0);
+ apply_change_group ();
+ REG_NOTES (new_insn) = note;
- /* Must mark the line number note after inlined functions as a repeat, so
- that the test coverage code can avoid counting the call twice. This
- just tells the code to ignore the immediately following line note, since
- there already exists a copy of this note before the expanded inline call.
- This line number note is still needed for debugging though, so we can't
- delete it. */
- if (flag_test_coverage)
- emit_note (0, NOTE_REPEATED_LINE_NUMBER);
+ /* Delete any REG_LABEL notes from the chain. Remap any
+ REG_EH_REGION notes. */
+ for (; note; note = next)
+ {
+ next = XEXP (note, 1);
+ if (REG_NOTE_KIND (note) == REG_LABEL)
+ remove_note (new_insn, note);
+ else if (REG_NOTE_KIND (note) == REG_EH_REGION)
+ XEXP (note, 0) = GEN_INT (INTVAL (XEXP (note, 0))
+ + eh_region_offset);
+ }
+ }
- emit_line_note (input_filename, lineno);
+ if (GET_CODE (insn) == CALL_INSN
+ && GET_CODE (PATTERN (insn)) == CALL_PLACEHOLDER)
+ {
+ int i;
+ for (i = 0; i < 3; i++)
+ copy_insn_notes (XEXP (PATTERN (insn), i), map, eh_region_offset);
+ }
- /* If the function returns a BLKmode object in a register, copy it
- out of the temp register into a BLKmode memory object. */
- if (TYPE_MODE (TREE_TYPE (TREE_TYPE (fndecl))) == BLKmode
- && ! aggregate_value_p (TREE_TYPE (TREE_TYPE (fndecl))))
- target = copy_blkmode_from_reg (0, target, TREE_TYPE (TREE_TYPE (fndecl)));
-
- if (structure_value_addr)
- {
- target = gen_rtx_MEM (TYPE_MODE (type),
- memory_address (TYPE_MODE (type),
- structure_value_addr));
- MEM_SET_IN_STRUCT_P (target, 1);
+ if (GET_CODE (insn) == JUMP_INSN
+ && GET_CODE (PATTERN (insn)) == RESX)
+ XINT (PATTERN (new_insn), 0) += eh_region_offset;
}
-
- /* Make sure we free the things we explicitly allocated with xmalloc. */
- if (real_label_map)
- free (real_label_map);
- if (map)
- VARRAY_FREE (map->const_equiv_varray);
- inlining = inlining_previous;
-
- return target;
}
\f
/* Given a chain of PARM_DECLs, ARGS, copy each decl into a VAR_DECL,
for (tail = args, i = 0; tail; tail = TREE_CHAIN (tail), i++)
{
- register tree decl = build_decl (VAR_DECL, DECL_NAME (tail),
- TREE_TYPE (tail));
+ tree decl = copy_decl_for_inlining (tail, map->fndecl,
+ current_function_decl);
rtx new_decl_rtl
- = copy_rtx_and_substitute (RTVEC_ELT (arg_vector, i), map);
+ = copy_rtx_and_substitute (RTVEC_ELT (arg_vector, i), map, 1);
- DECL_ARG_TYPE (decl) = DECL_ARG_TYPE (tail);
/* We really should be setting DECL_INCOMING_RTL to something reasonable
here, but that's going to require some more work. */
/* DECL_INCOMING_RTL (decl) = ?; */
- /* These args would always appear unused, if not for this. */
- TREE_USED (decl) = 1;
- /* Prevent warning for shadowing with these. */
- DECL_ABSTRACT_ORIGIN (decl) = DECL_ORIGIN (tail);
- pushdecl (decl);
/* Fully instantiate the address with the equivalent form so that the
debugging information contains the actual register, instead of the
virtual register. Do this by not passing an insn to
subst_constants. */
- subst_constants (&new_decl_rtl, NULL_RTX, map);
+ subst_constants (&new_decl_rtl, NULL_RTX, map, 1);
apply_change_group ();
- DECL_RTL (decl) = new_decl_rtl;
+ SET_DECL_RTL (decl, new_decl_rtl);
}
}
/* Given a BLOCK node LET, push decls and levels so as to construct in the
current function a tree of contexts isomorphic to the one that is given.
- LEVEL indicates how far down into the BLOCK tree is the node we are
- currently traversing. It is always zero except for recursive calls.
-
MAP, if nonzero, is a pointer to an inline_remap map which indicates how
registers used in the DECL_RTL field should be remapped. If it is zero,
no mapping is necessary. */
-static void
-integrate_decl_tree (let, level, map)
+static tree
+integrate_decl_tree (let, map)
tree let;
- int level;
struct inline_remap *map;
{
- tree t, node;
+ tree t;
+ tree new_block;
+ tree *next;
+
+ new_block = make_node (BLOCK);
+ VARRAY_PUSH_TREE (map->block_map, new_block);
+ next = &BLOCK_VARS (new_block);
- if (level > 0)
- pushlevel (0);
-
for (t = BLOCK_VARS (let); t; t = TREE_CHAIN (t))
{
tree d;
- push_obstacks_nochange ();
- saveable_allocation ();
- d = copy_and_set_decl_abstract_origin (t);
- pop_obstacks ();
+ d = copy_decl_for_inlining (t, map->fndecl, current_function_decl);
- if (DECL_RTL (t) != 0)
+ if (DECL_RTL_SET_P (t))
{
- DECL_RTL (d) = copy_rtx_and_substitute (DECL_RTL (t), map);
+ rtx r;
+
+ SET_DECL_RTL (d, copy_rtx_and_substitute (DECL_RTL (t), map, 1));
+
/* Fully instantiate the address with the equivalent form so that the
debugging information contains the actual register, instead of the
virtual register. Do this by not passing an insn to
subst_constants. */
- subst_constants (&DECL_RTL (d), NULL_RTX, map);
+ r = DECL_RTL (d);
+ subst_constants (&r, NULL_RTX, map, 1);
+ SET_DECL_RTL (d, r);
apply_change_group ();
}
- /* These args would always appear unused, if not for this. */
- TREE_USED (d) = 1;
- if (DECL_LANG_SPECIFIC (d))
- copy_lang_decl (d);
-
- pushdecl (d);
+ /* Add this declaration to the list of variables in the new
+ block. */
+ *next = d;
+ next = &TREE_CHAIN (d);
}
- for (t = BLOCK_SUBBLOCKS (let); t; t = TREE_CHAIN (t))
- integrate_decl_tree (t, level + 1, map);
-
- if (level > 0)
+ next = &BLOCK_SUBBLOCKS (new_block);
+ for (t = BLOCK_SUBBLOCKS (let); t; t = BLOCK_CHAIN (t))
{
- node = poplevel (1, 0, 0);
- if (node)
- {
- TREE_USED (node) = TREE_USED (let);
- BLOCK_ABSTRACT_ORIGIN (node) = let;
- }
+ *next = integrate_decl_tree (t, map);
+ BLOCK_SUPERCONTEXT (*next) = new_block;
+ next = &BLOCK_CHAIN (*next);
}
+
+ TREE_USED (new_block) = TREE_USED (let);
+ BLOCK_ABSTRACT_ORIGIN (new_block) = let;
+
+ return new_block;
}
\f
-/* Create a new copy of an rtx.
- Recursively copies the operands of the rtx,
+/* Create a new copy of an rtx. Recursively copies the operands of the rtx,
except for those few rtx codes that are sharable.
We always return an rtx that is similar to that incoming rtx, with the
exception of possibly changing a REG to a SUBREG or vice versa. No
rtl is ever emitted.
+ If FOR_LHS is nonzero, if means we are processing something that will
+ be the LHS of a SET. In that case, we copy RTX_UNCHANGING_P even if
+ inlining since we need to be conservative in how it is set for
+ such cases.
+
Handle constants that need to be placed in the constant pool by
calling `force_const_mem'. */
rtx
-copy_rtx_and_substitute (orig, map)
+copy_rtx_and_substitute (orig, map, for_lhs)
register rtx orig;
struct inline_remap *map;
+ int for_lhs;
{
register rtx copy, temp;
register int i, j;
equivalence for it to be the address. This will substitute the
address into insns where it can be substituted and use the new
pseudo where it can't. */
- if (regno == VIRTUAL_STACK_VARS_REGNUM)
+ else if (regno == VIRTUAL_STACK_VARS_REGNUM)
{
rtx loc, seq;
int size = get_func_frame_size (DECL_SAVED_INSNS (map->fndecl));
-
#ifdef FRAME_GROWS_DOWNWARD
+ int alignment
+ = (DECL_SAVED_INSNS (map->fndecl)->stack_alignment_needed
+ / BITS_PER_UNIT);
+
/* In this case, virtual_stack_vars_rtx points to one byte
higher than the top of the frame area. So make sure we
allocate a big enough chunk to keep the frame pointer
aligned like a real one. */
- size = CEIL_ROUND (size, BIGGEST_ALIGNMENT / BITS_PER_UNIT);
+ if (alignment)
+ size = CEIL_ROUND (size, alignment);
#endif
start_sequence ();
loc = assign_stack_temp (BLKmode, size, 1);
= force_reg (Pmode, force_operand (loc, NULL_RTX));
#ifdef STACK_BOUNDARY
- mark_reg_pointer (map->reg_map[regno],
- STACK_BOUNDARY / BITS_PER_UNIT);
+ mark_reg_pointer (map->reg_map[regno], STACK_BOUNDARY);
#endif
SET_CONST_EQUIV_DATA (map, temp, loc, CONST_AGE_PARM);
start_sequence ();
loc = assign_stack_temp (BLKmode, size, 1);
loc = XEXP (loc, 0);
- /* When arguments grow downward, the virtual incoming
+ /* When arguments grow downward, the virtual incoming
args pointer points to the top of the argument block,
so the remapped location better do the same. */
#ifdef ARGS_GROW_DOWNWARD
= force_reg (Pmode, force_operand (loc, NULL_RTX));
#ifdef STACK_BOUNDARY
- mark_reg_pointer (map->reg_map[regno],
- STACK_BOUNDARY / BITS_PER_UNIT);
+ mark_reg_pointer (map->reg_map[regno], STACK_BOUNDARY);
#endif
SET_CONST_EQUIV_DATA (map, temp, loc, CONST_AGE_PARM);
the function doesn't have a return value, error. If the
mode doesn't agree, and it ain't BLKmode, make a SUBREG. */
if (map->inline_target == 0)
- /* Must be unrolling loops or replicating code if we
- reach here, so return the register unchanged. */
- return orig;
+ {
+ if (rtx_equal_function_value_matters)
+ /* This is an ignored return value. We must not
+ leave it in with REG_FUNCTION_VALUE_P set, since
+ that would confuse subsequent inlining of the
+ current function into a later function. */
+ return gen_rtx_REG (GET_MODE (orig), regno);
+ else
+ /* Must be unrolling loops or replicating code if we
+ reach here, so return the register unchanged. */
+ return orig;
+ }
else if (GET_MODE (map->inline_target) != BLKmode
&& mode != GET_MODE (map->inline_target))
return gen_lowpart (mode, map->inline_target);
else
return map->inline_target;
}
- return orig;
+#if defined (LEAF_REGISTERS) && defined (LEAF_REG_REMAP)
+ /* If leaf_renumber_regs_insn() might remap this register to
+ some other number, make sure we don't share it with the
+ inlined function, otherwise delayed optimization of the
+ inlined function may change it in place, breaking our
+ reference to it. We may still shared it within the
+ function, so create an entry for this register in the
+ reg_map. */
+ if (map->integrating && regno < FIRST_PSEUDO_REGISTER
+ && LEAF_REGISTERS[regno] && LEAF_REG_REMAP (regno) != regno)
+ {
+ if (!map->leaf_reg_map[regno][mode])
+ map->leaf_reg_map[regno][mode] = gen_rtx_REG (mode, regno);
+ return map->leaf_reg_map[regno][mode];
+ }
+#endif
+ else
+ return orig;
+
+ abort ();
}
if (map->reg_map[regno] == NULL)
{
RTX_UNCHANGING_P (map->reg_map[regno]) = RTX_UNCHANGING_P (orig);
/* A reg with REG_FUNCTION_VALUE_P true will never reach here. */
- if (map->regno_pointer_flag[regno])
+ if (REG_POINTER (map->x_regno_reg_rtx[regno]))
mark_reg_pointer (map->reg_map[regno],
map->regno_pointer_align[regno]);
}
return map->reg_map[regno];
case SUBREG:
- copy = copy_rtx_and_substitute (SUBREG_REG (orig), map);
- /* SUBREG is ordinary, but don't make nested SUBREGs. */
- if (GET_CODE (copy) == SUBREG)
- return gen_rtx_SUBREG (GET_MODE (orig), SUBREG_REG (copy),
- SUBREG_WORD (orig) + SUBREG_WORD (copy));
- else if (GET_CODE (copy) == CONCAT)
- {
- rtx retval = subreg_realpart_p (orig) ? XEXP (copy, 0) : XEXP (copy, 1);
-
- if (GET_MODE (retval) == GET_MODE (orig))
- return retval;
- else
- return gen_rtx_SUBREG (GET_MODE (orig), retval,
- (SUBREG_WORD (orig) %
- (GET_MODE_UNIT_SIZE (GET_MODE (SUBREG_REG (orig)))
- / (unsigned) UNITS_PER_WORD)));
- }
- else
- return gen_rtx_SUBREG (GET_MODE (orig), copy,
- SUBREG_WORD (orig));
+ copy = copy_rtx_and_substitute (SUBREG_REG (orig), map, for_lhs);
+ return simplify_gen_subreg (GET_MODE (orig), copy,
+ GET_MODE (SUBREG_REG (orig)),
+ SUBREG_BYTE (orig));
case ADDRESSOF:
copy = gen_rtx_ADDRESSOF (mode,
- copy_rtx_and_substitute (XEXP (orig, 0), map),
- 0, ADDRESSOF_DECL(orig));
+ copy_rtx_and_substitute (XEXP (orig, 0),
+ map, for_lhs),
+ 0, ADDRESSOF_DECL (orig));
regno = ADDRESSOF_REGNO (orig);
if (map->reg_map[regno])
regno = REGNO (map->reg_map[regno]);
RTX_UNCHANGING_P (map->reg_map[regno]) = RTX_UNCHANGING_P (temp);
/* A reg with REG_FUNCTION_VALUE_P true will never reach here. */
- if (map->regno_pointer_flag[regno])
+ if (REG_POINTER (map->x_regno_reg_rtx[regno]))
mark_reg_pointer (map->reg_map[regno],
map->regno_pointer_align[regno]);
regno = REGNO (map->reg_map[regno]);
to (use foo) if the original insn didn't have a subreg.
Removing the subreg distorts the VAX movstrhi pattern
by changing the mode of an operand. */
- copy = copy_rtx_and_substitute (XEXP (orig, 0), map);
+ copy = copy_rtx_and_substitute (XEXP (orig, 0), map, code == CLOBBER);
if (GET_CODE (copy) == SUBREG && GET_CODE (XEXP (orig, 0)) != SUBREG)
copy = SUBREG_REG (copy);
return gen_rtx_fmt_e (code, VOIDmode, copy);
+ /* We need to handle "deleted" labels that appear in the DECL_RTL
+ of a LABEL_DECL. */
+ case NOTE:
+ if (NOTE_LINE_NUMBER (orig) != NOTE_INSN_DELETED_LABEL)
+ break;
+
+ /* ... FALLTHRU ... */
case CODE_LABEL:
LABEL_PRESERVE_P (get_label_from_map (map, CODE_LABEL_NUMBER (orig)))
= LABEL_PRESERVE_P (orig);
return get_label_from_map (map, CODE_LABEL_NUMBER (orig));
case LABEL_REF:
- copy = gen_rtx_LABEL_REF (mode,
- LABEL_REF_NONLOCAL_P (orig) ? XEXP (orig, 0)
- : get_label_from_map (map,
- CODE_LABEL_NUMBER (XEXP (orig, 0))));
+ copy
+ = gen_rtx_LABEL_REF
+ (mode,
+ LABEL_REF_NONLOCAL_P (orig) ? XEXP (orig, 0)
+ : get_label_from_map (map, CODE_LABEL_NUMBER (XEXP (orig, 0))));
+
LABEL_OUTSIDE_LOOP_P (copy) = LABEL_OUTSIDE_LOOP_P (orig);
/* The fact that this label was previously nonlocal does not mean
remapped label. Otherwise, symbols are returned unchanged. */
if (CONSTANT_POOL_ADDRESS_P (orig))
{
- struct function *f = inlining ? inlining : current_function;
+ struct function *f = inlining ? inlining : cfun;
rtx constant = get_pool_constant_for_function (f, orig);
enum machine_mode const_mode = get_pool_mode_for_function (f, orig);
if (inlining)
{
rtx temp = force_const_mem (const_mode,
- copy_rtx_and_substitute (constant, map));
+ copy_rtx_and_substitute (constant,
+ map, 0));
+
#if 0
/* Legitimizing the address here is incorrect.
return temp;
}
else if (GET_CODE (constant) == LABEL_REF)
- return XEXP (force_const_mem (GET_MODE (orig),
- copy_rtx_and_substitute (constant,
- map)),
+ return XEXP (force_const_mem
+ (GET_MODE (orig),
+ copy_rtx_and_substitute (constant, map, for_lhs)),
0);
}
- else
- if (SYMBOL_REF_NEED_ADJUST (orig))
- {
- eif_eh_map = map;
- return rethrow_symbol_map (orig,
- expand_inline_function_eh_labelmap);
- }
return orig;
break;
case ASM_OPERANDS:
- /* If a single asm insn contains multiple output operands
- then it contains multiple ASM_OPERANDS rtx's that share operand 3.
- We must make sure that the copied insn continues to share it. */
- if (map->orig_asm_operands_vector == XVEC (orig, 3))
+ /* If a single asm insn contains multiple output operands then
+ it contains multiple ASM_OPERANDS rtx's that share the input
+ and constraint vecs. We must make sure that the copied insn
+ continues to share it. */
+ if (map->orig_asm_operands_vector == ASM_OPERANDS_INPUT_VEC (orig))
{
copy = rtx_alloc (ASM_OPERANDS);
copy->volatil = orig->volatil;
- XSTR (copy, 0) = XSTR (orig, 0);
- XSTR (copy, 1) = XSTR (orig, 1);
- XINT (copy, 2) = XINT (orig, 2);
- XVEC (copy, 3) = map->copy_asm_operands_vector;
- XVEC (copy, 4) = map->copy_asm_constraints_vector;
- XSTR (copy, 5) = XSTR (orig, 5);
- XINT (copy, 6) = XINT (orig, 6);
+ PUT_MODE (copy, GET_MODE (orig));
+ ASM_OPERANDS_TEMPLATE (copy) = ASM_OPERANDS_TEMPLATE (orig);
+ ASM_OPERANDS_OUTPUT_CONSTRAINT (copy)
+ = ASM_OPERANDS_OUTPUT_CONSTRAINT (orig);
+ ASM_OPERANDS_OUTPUT_IDX (copy) = ASM_OPERANDS_OUTPUT_IDX (orig);
+ ASM_OPERANDS_INPUT_VEC (copy) = map->copy_asm_operands_vector;
+ ASM_OPERANDS_INPUT_CONSTRAINT_VEC (copy)
+ = map->copy_asm_constraints_vector;
+ ASM_OPERANDS_SOURCE_FILE (copy) = ASM_OPERANDS_SOURCE_FILE (orig);
+ ASM_OPERANDS_SOURCE_LINE (copy) = ASM_OPERANDS_SOURCE_LINE (orig);
return copy;
}
break;
#ifndef NO_FUNCTION_CSE
if (! (optimize && ! flag_no_function_cse))
#endif
- return gen_rtx_CALL (GET_MODE (orig),
- gen_rtx_MEM (GET_MODE (XEXP (orig, 0)),
- copy_rtx_and_substitute (XEXP (XEXP (orig, 0), 0), map)),
- copy_rtx_and_substitute (XEXP (orig, 1), map));
+ return
+ gen_rtx_CALL
+ (GET_MODE (orig),
+ gen_rtx_MEM (GET_MODE (XEXP (orig, 0)),
+ copy_rtx_and_substitute (XEXP (XEXP (orig, 0), 0),
+ map, 0)),
+ copy_rtx_and_substitute (XEXP (orig, 1), map, 0));
break;
#if 0
if (SET_DEST (orig) == virtual_stack_vars_rtx
|| SET_DEST (orig) == virtual_incoming_args_rtx)
{
- /* In case a translation hasn't occurred already, make one now. */
+ /* In case a translation hasn't occurred already, make one now. */
rtx equiv_reg;
rtx equiv_loc;
HOST_WIDE_INT loc_offset;
- copy_rtx_and_substitute (SET_DEST (orig), map);
+ copy_rtx_and_substitute (SET_DEST (orig), map, for_lhs);
equiv_reg = map->reg_map[REGNO (SET_DEST (orig))];
- equiv_loc = VARRAY_CONST_EQUIV (map->const_equiv_varray, REGNO (equiv_reg)).rtx;
+ equiv_loc = VARRAY_CONST_EQUIV (map->const_equiv_varray,
+ REGNO (equiv_reg)).rtx;
loc_offset
= GET_CODE (equiv_loc) == REG ? 0 : INTVAL (XEXP (equiv_loc, 1));
+
return gen_rtx_SET (VOIDmode, SET_DEST (orig),
force_operand
(plus_constant
- (copy_rtx_and_substitute (SET_SRC (orig), map),
+ (copy_rtx_and_substitute (SET_SRC (orig),
+ map, 0),
- loc_offset),
NULL_RTX));
}
+ else
+ return gen_rtx_SET (VOIDmode,
+ copy_rtx_and_substitute (SET_DEST (orig), map, 1),
+ copy_rtx_and_substitute (SET_SRC (orig), map, 0));
break;
case MEM:
&& GET_CODE (XEXP (orig, 0)) == SYMBOL_REF
&& CONSTANT_POOL_ADDRESS_P (XEXP (orig, 0)))
{
- enum machine_mode const_mode = get_pool_mode_for_function (inlining, XEXP (orig, 0));
- rtx constant = get_pool_constant_for_function (inlining, XEXP (orig, 0));
- constant = copy_rtx_and_substitute (constant, map);
+ enum machine_mode const_mode
+ = get_pool_mode_for_function (inlining, XEXP (orig, 0));
+ rtx constant
+ = get_pool_constant_for_function (inlining, XEXP (orig, 0));
+
+ constant = copy_rtx_and_substitute (constant, map, 0);
+
/* If this was an address of a constant pool entry that itself
had to be placed in the constant pool, it might not be a
valid address. So the recursive call might have turned it
MEM into a REG, but we'll assume that it safe. */
if (! CONSTANT_P (constant))
return constant;
+
return validize_mem (force_const_mem (const_mode, constant));
}
+
copy = rtx_alloc (MEM);
PUT_MODE (copy, mode);
- XEXP (copy, 0) = copy_rtx_and_substitute (XEXP (orig, 0), map);
+ XEXP (copy, 0) = copy_rtx_and_substitute (XEXP (orig, 0), map, 0);
MEM_COPY_ATTRIBUTES (copy, orig);
- MEM_ALIAS_SET (copy) = MEM_ALIAS_SET (orig);
-
- /* If doing function inlining, this MEM might not be const in the
- function that it is being inlined into, and thus may not be
- unchanging after function inlining. Constant pool references are
- handled elsewhere, so this doesn't lose RTX_UNCHANGING_P bits
- for them. */
- if (! map->integrating)
- RTX_UNCHANGING_P (copy) = RTX_UNCHANGING_P (orig);
-
return copy;
-
+
default:
break;
}
break;
case 'e':
- XEXP (copy, i) = copy_rtx_and_substitute (XEXP (orig, i), map);
+ XEXP (copy, i)
+ = copy_rtx_and_substitute (XEXP (orig, i), map, for_lhs);
break;
case 'u':
XVEC (copy, i) = rtvec_alloc (XVECLEN (orig, i));
for (j = 0; j < XVECLEN (copy, i); j++)
XVECEXP (copy, i, j)
- = copy_rtx_and_substitute (XVECEXP (orig, i, j), map);
+ = copy_rtx_and_substitute (XVECEXP (orig, i, j),
+ map, for_lhs);
}
break;
if (code == ASM_OPERANDS && map->orig_asm_operands_vector == 0)
{
- map->orig_asm_operands_vector = XVEC (orig, 3);
- map->copy_asm_operands_vector = XVEC (copy, 3);
- map->copy_asm_constraints_vector = XVEC (copy, 4);
+ map->orig_asm_operands_vector = ASM_OPERANDS_INPUT_VEC (orig);
+ map->copy_asm_operands_vector = ASM_OPERANDS_INPUT_VEC (copy);
+ map->copy_asm_constraints_vector
+ = ASM_OPERANDS_INPUT_CONSTRAINT_VEC (copy);
}
return copy;
int i;
map->num_sets = 0;
- subst_constants (&PATTERN (insn), insn, map);
- /* Apply the changes if they are valid; otherwise discard them. */
+ /* First try just updating addresses, then other things. This is
+ important when we have something like the store of a constant
+ into memory and we can update the memory address but the machine
+ does not support a constant source. */
+ subst_constants (&PATTERN (insn), insn, map, 1);
+ apply_change_group ();
+ subst_constants (&PATTERN (insn), insn, map, 0);
apply_change_group ();
/* Show we don't know the value of anything stored or clobbered. */
- note_stores (PATTERN (insn), mark_stores);
+ note_stores (PATTERN (insn), mark_stores, NULL);
map->last_pc_value = 0;
#ifdef HAVE_cc0
map->last_cc0_value = 0;
into insns; cse will do the latter task better.
This function is also used to adjust address of items previously addressed
- via the virtual stack variable or virtual incoming arguments registers. */
+ via the virtual stack variable or virtual incoming arguments registers.
+
+ If MEMONLY is nonzero, only make changes inside a MEM. */
static void
-subst_constants (loc, insn, map)
+subst_constants (loc, insn, map, memonly)
rtx *loc;
rtx insn;
struct inline_remap *map;
+ int memonly;
{
rtx x = *loc;
- register int i;
+ register int i, j;
register enum rtx_code code;
register const char *format_ptr;
int num_changes = num_validated_changes ();
#ifdef HAVE_cc0
case CC0:
- validate_change (insn, loc, map->last_cc0_value, 1);
+ if (! memonly)
+ validate_change (insn, loc, map->last_cc0_value, 1);
return;
#endif
/* The only thing we can do with a USE or CLOBBER is possibly do
some substitutions in a MEM within it. */
if (GET_CODE (XEXP (x, 0)) == MEM)
- subst_constants (&XEXP (XEXP (x, 0), 0), insn, map);
+ subst_constants (&XEXP (XEXP (x, 0), 0), insn, map, 0);
return;
case REG:
/* Substitute for parms and known constants. Don't replace
hard regs used as user variables with constants. */
- {
- int regno = REGNO (x);
- struct const_equiv_data *p;
-
- if (! (regno < FIRST_PSEUDO_REGISTER && REG_USERVAR_P (x))
- && (size_t) regno < VARRAY_SIZE (map->const_equiv_varray)
- && (p = &VARRAY_CONST_EQUIV (map->const_equiv_varray, regno),
- p->rtx != 0)
- && p->age >= map->const_age)
- validate_change (insn, loc, p->rtx, 1);
- return;
- }
+ if (! memonly)
+ {
+ int regno = REGNO (x);
+ struct const_equiv_data *p;
+
+ if (! (regno < FIRST_PSEUDO_REGISTER && REG_USERVAR_P (x))
+ && (size_t) regno < VARRAY_SIZE (map->const_equiv_varray)
+ && (p = &VARRAY_CONST_EQUIV (map->const_equiv_varray, regno),
+ p->rtx != 0)
+ && p->age >= map->const_age)
+ validate_change (insn, loc, p->rtx, 1);
+ }
+ return;
case SUBREG:
/* SUBREG applied to something other than a reg
be a special hack and we don't know how to treat it specially.
Consider for example mulsidi3 in m68k.md.
Ordinary SUBREG of a REG needs this special treatment. */
- if (GET_CODE (SUBREG_REG (x)) == REG)
+ if (! memonly && GET_CODE (SUBREG_REG (x)) == REG)
{
rtx inner = SUBREG_REG (x);
rtx new = 0;
/* We can't call subst_constants on &SUBREG_REG (x) because any
constant or SUBREG wouldn't be valid inside our SUBEG. Instead,
see what is inside, try to form the new SUBREG and see if that is
- valid. We handle two cases: extracting a full word in an
+ valid. We handle two cases: extracting a full word in an
integral mode and extracting the low part. */
- subst_constants (&inner, NULL_RTX, map);
-
- if (GET_MODE_CLASS (GET_MODE (x)) == MODE_INT
- && GET_MODE_SIZE (GET_MODE (x)) == UNITS_PER_WORD
- && GET_MODE (SUBREG_REG (x)) != VOIDmode)
- new = operand_subword (inner, SUBREG_WORD (x), 0,
- GET_MODE (SUBREG_REG (x)));
-
- cancel_changes (num_changes);
- if (new == 0 && subreg_lowpart_p (x))
- new = gen_lowpart_common (GET_MODE (x), inner);
+ subst_constants (&inner, NULL_RTX, map, 0);
+ new = simplify_gen_subreg (GET_MODE (x), inner,
+ GET_MODE (SUBREG_REG (x)),
+ SUBREG_BYTE (x));
if (new)
validate_change (insn, loc, new, 1);
+ else
+ cancel_changes (num_changes);
return;
}
break;
case MEM:
- subst_constants (&XEXP (x, 0), insn, map);
+ subst_constants (&XEXP (x, 0), insn, map, 0);
/* If a memory address got spoiled, change it back. */
- if (insn != 0 && num_validated_changes () != num_changes
- && !memory_address_p (GET_MODE (x), XEXP (x, 0)))
+ if (! memonly && insn != 0 && num_validated_changes () != num_changes
+ && ! memory_address_p (GET_MODE (x), XEXP (x, 0)))
cancel_changes (num_changes);
return;
rtx *dest_loc = &SET_DEST (x);
rtx dest = *dest_loc;
rtx src, tem;
+ enum machine_mode compare_mode = VOIDmode;
- subst_constants (&SET_SRC (x), insn, map);
+ /* If SET_SRC is a COMPARE which subst_constants would turn into
+ COMPARE of 2 VOIDmode constants, note the mode in which comparison
+ is to be done. */
+ if (GET_CODE (SET_SRC (x)) == COMPARE)
+ {
+ src = SET_SRC (x);
+ if (GET_MODE_CLASS (GET_MODE (src)) == MODE_CC
+#ifdef HAVE_cc0
+ || dest == cc0_rtx
+#endif
+ )
+ {
+ compare_mode = GET_MODE (XEXP (src, 0));
+ if (compare_mode == VOIDmode)
+ compare_mode = GET_MODE (XEXP (src, 1));
+ }
+ }
+
+ subst_constants (&SET_SRC (x), insn, map, memonly);
src = SET_SRC (x);
while (GET_CODE (*dest_loc) == ZERO_EXTRACT
{
if (GET_CODE (*dest_loc) == ZERO_EXTRACT)
{
- subst_constants (&XEXP (*dest_loc, 1), insn, map);
- subst_constants (&XEXP (*dest_loc, 2), insn, map);
+ subst_constants (&XEXP (*dest_loc, 1), insn, map, memonly);
+ subst_constants (&XEXP (*dest_loc, 2), insn, map, memonly);
}
dest_loc = &XEXP (*dest_loc, 0);
}
/* Do substitute in the address of a destination in memory. */
if (GET_CODE (*dest_loc) == MEM)
- subst_constants (&XEXP (*dest_loc, 0), insn, map);
+ subst_constants (&XEXP (*dest_loc, 0), insn, map, 0);
/* Check for the case of DEST a SUBREG, both it and the underlying
register are less than one word, and the SUBREG has the wider mode.
/* Normally, this copy won't do anything. But, if SRC is a COMPARE
it will cause us to save the COMPARE with any constants
substituted, which is what we want for later. */
- map->equiv_sets[map->num_sets].equiv = copy_rtx (src);
+ rtx src_copy = copy_rtx (src);
+ map->equiv_sets[map->num_sets].equiv = src_copy;
map->equiv_sets[map->num_sets++].dest = dest;
+ if (compare_mode != VOIDmode
+ && GET_CODE (src) == COMPARE
+ && (GET_MODE_CLASS (GET_MODE (src)) == MODE_CC
+#ifdef HAVE_cc0
+ || dest == cc0_rtx
+#endif
+ )
+ && GET_MODE (XEXP (src, 0)) == VOIDmode
+ && GET_MODE (XEXP (src, 1)) == VOIDmode)
+ {
+ map->compare_src = src_copy;
+ map->compare_mode = compare_mode;
+ }
}
}
return;
}
format_ptr = GET_RTX_FORMAT (code);
-
+
/* If the first operand is an expression, save its mode for later. */
if (*format_ptr == 'e')
op0_mode = GET_MODE (XEXP (x, 0));
case 'e':
if (XEXP (x, i))
- subst_constants (&XEXP (x, i), insn, map);
+ subst_constants (&XEXP (x, i), insn, map, memonly);
break;
case 'u':
case 'i':
case 's':
case 'w':
+ case 'n':
case 't':
break;
case 'E':
if (XVEC (x, i) != NULL && XVECLEN (x, i) != 0)
- {
- int j;
- for (j = 0; j < XVECLEN (x, i); j++)
- subst_constants (&XVECEXP (x, i, j), insn, map);
- }
+ for (j = 0; j < XVECLEN (x, i); j++)
+ subst_constants (&XVECEXP (x, i, j), insn, map, memonly);
+
break;
default:
/* If this is a commutative operation, move a constant to the second
operand unless the second operand is already a CONST_INT. */
- if ((GET_RTX_CLASS (code) == 'c' || code == NE || code == EQ)
+ if (! memonly
+ && (GET_RTX_CLASS (code) == 'c' || code == NE || code == EQ)
&& CONSTANT_P (XEXP (x, 0)) && GET_CODE (XEXP (x, 1)) != CONST_INT)
{
rtx tem = XEXP (x, 0);
}
/* Simplify the expression in case we put in some constants. */
- switch (GET_RTX_CLASS (code))
- {
- case '1':
- if (op0_mode == MAX_MACHINE_MODE)
- abort ();
- new = simplify_unary_operation (code, GET_MODE (x),
- XEXP (x, 0), op0_mode);
- break;
-
- case '<':
+ if (! memonly)
+ switch (GET_RTX_CLASS (code))
{
- enum machine_mode op_mode = GET_MODE (XEXP (x, 0));
- if (op_mode == VOIDmode)
- op_mode = GET_MODE (XEXP (x, 1));
- new = simplify_relational_operation (code, op_mode,
- XEXP (x, 0), XEXP (x, 1));
+ case '1':
+ if (op0_mode == MAX_MACHINE_MODE)
+ abort ();
+ new = simplify_unary_operation (code, GET_MODE (x),
+ XEXP (x, 0), op0_mode);
+ break;
+
+ case '<':
+ {
+ enum machine_mode op_mode = GET_MODE (XEXP (x, 0));
+
+ if (op_mode == VOIDmode)
+ op_mode = GET_MODE (XEXP (x, 1));
+ new = simplify_relational_operation (code, op_mode,
+ XEXP (x, 0), XEXP (x, 1));
#ifdef FLOAT_STORE_FLAG_VALUE
- if (new != 0 && GET_MODE_CLASS (GET_MODE (x)) == MODE_FLOAT)
- new = ((new == const0_rtx) ? CONST0_RTX (GET_MODE (x))
- : CONST_DOUBLE_FROM_REAL_VALUE (FLOAT_STORE_FLAG_VALUE,
- GET_MODE (x)));
+ if (new != 0 && GET_MODE_CLASS (GET_MODE (x)) == MODE_FLOAT)
+ {
+ enum machine_mode mode = GET_MODE (x);
+ if (new == const0_rtx)
+ new = CONST0_RTX (mode);
+ else
+ {
+ REAL_VALUE_TYPE val = FLOAT_STORE_FLAG_VALUE (mode);
+ new = CONST_DOUBLE_FROM_REAL_VALUE (val, mode);
+ }
+ }
#endif
+ break;
+ }
+
+ case '2':
+ case 'c':
+ new = simplify_binary_operation (code, GET_MODE (x),
+ XEXP (x, 0), XEXP (x, 1));
break;
- }
- case '2':
- case 'c':
- new = simplify_binary_operation (code, GET_MODE (x),
- XEXP (x, 0), XEXP (x, 1));
- break;
+ case 'b':
+ case '3':
+ if (op0_mode == MAX_MACHINE_MODE)
+ abort ();
- case 'b':
- case '3':
- if (op0_mode == MAX_MACHINE_MODE)
- abort ();
- new = simplify_ternary_operation (code, GET_MODE (x), op0_mode,
- XEXP (x, 0), XEXP (x, 1), XEXP (x, 2));
- break;
- }
+ if (code == IF_THEN_ELSE)
+ {
+ rtx op0 = XEXP (x, 0);
+
+ if (GET_RTX_CLASS (GET_CODE (op0)) == '<'
+ && GET_MODE (op0) == VOIDmode
+ && ! side_effects_p (op0)
+ && XEXP (op0, 0) == map->compare_src
+ && GET_MODE (XEXP (op0, 1)) == VOIDmode)
+ {
+ /* We have compare of two VOIDmode constants for which
+ we recorded the comparison mode. */
+ rtx temp =
+ simplify_relational_operation (GET_CODE (op0),
+ map->compare_mode,
+ XEXP (op0, 0),
+ XEXP (op0, 1));
+
+ if (temp == const0_rtx)
+ new = XEXP (x, 2);
+ else if (temp == const1_rtx)
+ new = XEXP (x, 1);
+ }
+ }
+ if (!new)
+ new = simplify_ternary_operation (code, GET_MODE (x), op0_mode,
+ XEXP (x, 0), XEXP (x, 1),
+ XEXP (x, 2));
+ break;
+ }
if (new)
validate_change (insn, loc, new, 1);
/* Show that register modified no longer contain known constants. We are
called from note_stores with parts of the new insn. */
-void
-mark_stores (dest, x)
+static void
+mark_stores (dest, x, data)
rtx dest;
rtx x ATTRIBUTE_UNUSED;
+ void *data ATTRIBUTE_UNUSED;
{
int regno = -1;
enum machine_mode mode = VOIDmode;
regno = REGNO (dest), mode = GET_MODE (dest);
else if (GET_CODE (dest) == SUBREG && GET_CODE (SUBREG_REG (dest)) == REG)
{
- regno = REGNO (SUBREG_REG (dest)) + SUBREG_WORD (dest);
+ regno = REGNO (SUBREG_REG (dest));
+ if (regno < FIRST_PSEUDO_REGISTER)
+ regno += subreg_regno_offset (REGNO (SUBREG_REG (dest)),
+ GET_MODE (SUBREG_REG (dest)),
+ SUBREG_BYTE (dest),
+ GET_MODE (dest));
mode = GET_MODE (SUBREG_REG (dest));
}
if (regno >= 0)
{
- int last_reg = (regno >= FIRST_PSEUDO_REGISTER ? regno
- : regno + HARD_REGNO_NREGS (regno, mode) - 1);
- int i;
+ unsigned int uregno = regno;
+ unsigned int last_reg = (uregno >= FIRST_PSEUDO_REGISTER ? uregno
+ : uregno + HARD_REGNO_NREGS (uregno, mode) - 1);
+ unsigned int i;
/* Ignore virtual stack var or virtual arg register since those
are handled separately. */
- if (regno != VIRTUAL_INCOMING_ARGS_REGNUM
- && regno != VIRTUAL_STACK_VARS_REGNUM)
- for (i = regno; i <= last_reg; i++)
+ if (uregno != VIRTUAL_INCOMING_ARGS_REGNUM
+ && uregno != VIRTUAL_STACK_VARS_REGNUM)
+ for (i = uregno; i <= last_reg; i++)
if ((size_t) i < VARRAY_SIZE (global_const_equiv_varray))
VARRAY_CONST_EQUIV (global_const_equiv_varray, i).rtx = 0;
}
BLOCK_ABSTRACT_ORIGIN (stmt) = stmt;
{
- register tree local_decl;
+ register tree local_decl;
- for (local_decl = BLOCK_VARS (stmt);
+ for (local_decl = BLOCK_VARS (stmt);
local_decl != NULL_TREE;
local_decl = TREE_CHAIN (local_decl))
- set_decl_origin_self (local_decl); /* Potential recursion. */
+ set_decl_origin_self (local_decl); /* Potential recursion. */
}
{
- register tree subblock;
+ register tree subblock;
- for (subblock = BLOCK_SUBBLOCKS (stmt);
+ for (subblock = BLOCK_SUBBLOCKS (stmt);
subblock != NULL_TREE;
subblock = BLOCK_CHAIN (subblock))
- set_block_origin_self (subblock); /* Recurse. */
+ set_block_origin_self (subblock); /* Recurse. */
}
}
}
set *their* DECL_ABSTRACT_ORIGIN or BLOCK_ABSTRACT_ORIGIN values to
point to themselves. */
-static void
+void
set_decl_origin_self (decl)
register tree decl;
{
output_inline_function (fndecl)
tree fndecl;
{
- struct function *curf = current_function;
+ struct function *old_cfun = cfun;
+ enum debug_info_type old_write_symbols = write_symbols;
+ struct gcc_debug_hooks *old_debug_hooks = debug_hooks;
struct function *f = DECL_SAVED_INSNS (fndecl);
- current_function = f;
+ cfun = f;
current_function_decl = fndecl;
clear_emit_caches ();
- /* Things we allocate from here on are part of this function, not
- permanent. */
- temporary_allocation ();
-
set_new_last_label_num (f->inl_max_label_num);
- /* We must have already output DWARF debugging information for the
- original (abstract) inline function declaration/definition, so
- we want to make sure that the debugging information we generate
- for this special instance of the inline function refers back to
- the information we already generated. To make sure that happens,
- we simply have to set the DECL_ABSTRACT_ORIGIN for the function
- node (and for all of the local ..._DECL nodes which are its children)
- so that they all point to themselves. */
-
- set_decl_origin_self (fndecl);
-
/* We're not deferring this any longer. */
DECL_DEFER_OUTPUT (fndecl) = 0;
+ /* If requested, suppress debugging information. */
+ if (f->no_debugging_symbols)
+ {
+ write_symbols = NO_DEBUG;
+ debug_hooks = &do_nothing_debug_hooks;
+ }
+
+ /* Do any preparation, such as emitting abstract debug info for the inline
+ before it gets mangled by optimization. */
+ (*debug_hooks->outlining_inline_function) (fndecl);
+
+ /* Compile this function all the way down to assembly code. */
+ rest_of_compilation (fndecl);
+
/* We can't inline this anymore. */
f->inlinable = 0;
DECL_INLINE (fndecl) = 0;
- /* Compile this function all the way down to assembly code. */
- rest_of_compilation (fndecl);
+ cfun = old_cfun;
+ current_function_decl = old_cfun ? old_cfun->decl : 0;
+ write_symbols = old_write_symbols;
+ debug_hooks = old_debug_hooks;
+}
+
+\f
+/* Functions to keep track of the values hard regs had at the start of
+ the function. */
+
+rtx
+has_func_hard_reg_initial_val (fun, reg)
+ struct function *fun;
+ rtx reg;
+{
+ struct initial_value_struct *ivs = fun->hard_reg_initial_vals;
+ int i;
+
+ if (ivs == 0)
+ return NULL_RTX;
+
+ for (i = 0; i < ivs->num_entries; i++)
+ if (rtx_equal_p (ivs->entries[i].hard_reg, reg))
+ return ivs->entries[i].pseudo;
+
+ return NULL_RTX;
+}
+
+rtx
+get_func_hard_reg_initial_val (fun, reg)
+ struct function *fun;
+ rtx reg;
+{
+ struct initial_value_struct *ivs = fun->hard_reg_initial_vals;
+ rtx rv = has_func_hard_reg_initial_val (fun, reg);
+
+ if (rv)
+ return rv;
+
+ if (ivs == 0)
+ {
+ fun->hard_reg_initial_vals = (void *) xmalloc (sizeof (initial_value_struct));
+ ivs = fun->hard_reg_initial_vals;
+ ivs->num_entries = 0;
+ ivs->max_entries = 5;
+ ivs->entries = (initial_value_pair *) xmalloc (5 * sizeof (initial_value_pair));
+ }
+
+ if (ivs->num_entries >= ivs->max_entries)
+ {
+ ivs->max_entries += 5;
+ ivs->entries =
+ (initial_value_pair *) xrealloc (ivs->entries,
+ ivs->max_entries
+ * sizeof (initial_value_pair));
+ }
+
+ ivs->entries[ivs->num_entries].hard_reg = reg;
+ ivs->entries[ivs->num_entries].pseudo = gen_reg_rtx (GET_MODE (reg));
+
+ return ivs->entries[ivs->num_entries++].pseudo;
+}
+
+rtx
+get_hard_reg_initial_val (mode, regno)
+ enum machine_mode mode;
+ int regno;
+{
+ return get_func_hard_reg_initial_val (cfun, gen_rtx_REG (mode, regno));
+}
+
+rtx
+has_hard_reg_initial_val (mode, regno)
+ enum machine_mode mode;
+ int regno;
+{
+ return has_func_hard_reg_initial_val (cfun, gen_rtx_REG (mode, regno));
+}
+
+void
+mark_hard_reg_initial_vals (fun)
+ struct function *fun;
+{
+ struct initial_value_struct *ivs = fun->hard_reg_initial_vals;
+ int i;
+
+ if (ivs == 0)
+ return;
+
+ for (i = 0; i < ivs->num_entries; i ++)
+ {
+ ggc_mark_rtx (ivs->entries[i].hard_reg);
+ ggc_mark_rtx (ivs->entries[i].pseudo);
+ }
+}
+
+static void
+setup_initial_hard_reg_value_integration (inl_f, remap)
+ struct function *inl_f;
+ struct inline_remap *remap;
+{
+ struct initial_value_struct *ivs = inl_f->hard_reg_initial_vals;
+ int i;
+
+ if (ivs == 0)
+ return;
+
+ for (i = 0; i < ivs->num_entries; i ++)
+ remap->reg_map[REGNO (ivs->entries[i].pseudo)]
+ = get_func_hard_reg_initial_val (cfun, ivs->entries[i].hard_reg);
+}
+
+
+void
+emit_initial_value_sets ()
+{
+ struct initial_value_struct *ivs = cfun->hard_reg_initial_vals;
+ int i;
+ rtx seq;
+
+ if (ivs == 0)
+ return;
+
+ start_sequence ();
+ for (i = 0; i < ivs->num_entries; i++)
+ emit_move_insn (ivs->entries[i].pseudo, ivs->entries[i].hard_reg);
+ seq = get_insns ();
+ end_sequence ();
- current_function = curf;
- current_function_decl = curf ? curf->decl : 0;
+ emit_insns_after (seq, get_insns ());
}
OSDN Git Service
