CbC/CbC_gcc: gcc/function.c comparison

comparison gcc/function.c @ 57:326d9e06c2e3

modify c-parser.c

author	ryoma <e075725@ie.u-ryukyu.ac.jp>
date	Mon, 15 Feb 2010 00:54:17 +0900
parents	9907f3135723 77e2b8dfacca
children	1b10fe6932e1

comparison

equal deleted inserted replaced

-:f62c169bbc24
+:326d9e06c2e3
 struct machine_function * (*init_machine_status) (void);
 /* The currently compiled function.  */
 struct function *cfun = 0;
-/* These arrays record the INSN_UIDs of the prologue and epilogue insns.  */
+/* These hashes record the prologue and epilogue insns.  */
-static VEC(int,heap) *prologue;
+static GTY((if_marked ("ggc_marked_p"), param_is (struct rtx_def)))
-static VEC(int,heap) *epilogue;
+htab_t prologue_insn_hash;
+static GTY((if_marked ("ggc_marked_p"), param_is (struct rtx_def)))
-/* Array of INSN_UIDs to hold the INSN_UIDs for each sibcall epilogue
+htab_t epilogue_insn_hash;
-in this function.  */
-static VEC(int,heap) *sibcall_epilogue;
 htab_t types_used_by_vars_hash = NULL;
 tree types_used_by_cur_var_decl = NULL;
 static int all_blocks (tree, tree *);
 static tree *get_block_vector (tree, int *);
 extern tree debug_find_var_in_block_tree (tree, tree);
 /* We always define `record_insns' even if it's not used so that we
 can always export `prologue_epilogue_contains'.  */
-static void record_insns (rtx, VEC(int,heap) **) ATTRIBUTE_UNUSED;
+static void record_insns (rtx, rtx, htab_t *) ATTRIBUTE_UNUSED;
-static int contains (const_rtx, VEC(int,heap) **);
+static bool contains (const_rtx, htab_t);
 #ifdef HAVE_return
 static void emit_return_into_block (basic_block);
 #endif
 static void prepare_function_start (void);
 static void do_clobber_return_reg (rtx, void *);
 reclaim the memory.  */
 void
 free_after_compilation (struct function *f)
 {
-VEC_free (int, heap, prologue);
+prologue_insn_hash = NULL;
-VEC_free (int, heap, epilogue);
+epilogue_insn_hash = NULL;
-VEC_free (int, heap, sibcall_epilogue);
 if (crtl->emit.regno_pointer_align)
 free (crtl->emit.regno_pointer_align);
 memset (crtl, 0, sizeof (struct rtl_data));
 f->eh = NULL;
 the signed target pointer arithmetics for function FUNC.  Otherwise
 return FALSE.  */
 bool
 frame_offset_overflow (HOST_WIDE_INT offset, tree func)
 {
 unsigned HOST_WIDE_INT size = FRAME_GROWS_DOWNWARD ? -offset : offset;
 if (size > ((unsigned HOST_WIDE_INT) 1 << (GET_MODE_BITSIZE (Pmode) - 1))
 	       /* Leave room for the fixed part of the frame.  */
 	       - 64 * UNITS_PER_WORD)
 {
-error ("%Jtotal size of local objects too large", func);
+error_at (DECL_SOURCE_LOCATION (func),
+		"total size of local objects too large");
 return TRUE;
 }
 return FALSE;
 }
 	}
 }
 if (crtl->stack_alignment_needed < alignment_in_bits)
 crtl->stack_alignment_needed = alignment_in_bits;
-if (crtl->max_used_stack_slot_alignment < crtl->stack_alignment_needed)
+if (crtl->max_used_stack_slot_alignment < alignment_in_bits)
-crtl->max_used_stack_slot_alignment = crtl->stack_alignment_needed;
+crtl->max_used_stack_slot_alignment = alignment_in_bits;
 /* Calculate how many bytes the start of local variables is off from
 stack alignment.  */
 frame_alignment = PREFERRED_STACK_BOUNDARY / BITS_PER_UNIT;
 frame_off = STARTING_FRAME_OFFSET % frame_alignment;
 Automatic variables are also assigned temporary slots, at the nesting
 level where they are defined.  They are marked a "kept" so that
 free_temp_slots will not free them.  */
-struct temp_slot GTY(())
+struct GTY(()) temp_slot {
-{
 /* Points to next temporary slot.  */
 struct temp_slot *next;
 /* Points to previous temporary slot.  */
 struct temp_slot *prev;
 /* The rtx to used to reference the slot.  */
 /* A table of addresses that represent a stack slot.  The table is a mapping
 from address RTXen to a temp slot.  */
 static GTY((param_is(struct temp_slot_address_entry))) htab_t temp_slot_address_table;
 /* Entry for the above hash table.  */
-struct temp_slot_address_entry GTY(())
+struct GTY(()) temp_slot_address_entry {
-{
 hashval_t hash;
 rtx address;
 struct temp_slot *temp_slot;
 };
 return p;
 /* Last resort: Address is a virtual stack var address.  */
 if (GET_CODE (x) == PLUS
 && XEXP (x, 0) == virtual_stack_vars_rtx
-&& GET_CODE (XEXP (x, 1)) == CONST_INT)
+&& CONST_INT_P (XEXP (x, 1)))
 {
 int i;
 for (i = max_slot_level (); i >= 0; i--)
 	for (p = *temp_slots_at_level (i); p; p = p->next)
 	  {
 align = get_stack_local_alignment (type, mode);
 /* Try to find an available, already-allocated temporary of the proper
 mode which meets the size and alignment requirements.  Choose the
 smallest one with the closest alignment.
 If assign_stack_temp is called outside of the tree->rtl expansion,
 we cannot reuse the stack slots (that may still refer to
 VIRTUAL_STACK_VARS_REGNUM).  */
 if (!virtuals_instantiated)
 {
 return tmp;
 }
 #ifdef PROMOTE_MODE
 if (! dont_promote)
-mode = promote_mode (type, mode, &unsignedp, 0);
+mode = promote_mode (type, mode, &unsignedp);
 #endif
 return gen_reg_rtx (mode);
 }
 void
 free_temp_slots (void)
 {
 struct temp_slot *p, *next;
+bool some_available = false;
 for (p = *temp_slots_at_level (temp_slot_level); p; p = next)
 {
 next = p->next;
 if (!p->keep)
-	make_slot_available (p);
+	{
-}
+	  make_slot_available (p);
+	  some_available = true;
-remove_unused_temp_slot_addresses ();
+	}
-combine_temp_slots ();
+}
+if (some_available)
+{
+remove_unused_temp_slot_addresses ();
+combine_temp_slots ();
+}
 }
 /* Push deeper into the nesting level for stack temporaries.  */
 void
 void
 pop_temp_slots (void)
 {
 struct temp_slot *p, *next;
+bool some_available = false;
 for (p = *temp_slots_at_level (temp_slot_level); p; p = next)
 {
 next = p->next;
 make_slot_available (p);
-}
+some_available = true;
+}
-remove_unused_temp_slot_addresses ();
-combine_temp_slots ();
+if (some_available)
+{
+remove_unused_temp_slot_addresses ();
+combine_temp_slots ();
+}
 temp_slot_level--;
 }
 /* Initialize temporary slots.  */
 	 operands remain valid if they're modified in place.  */
 if (GET_CODE (SET_SRC (set)) == PLUS
 	  && recog_data.n_operands >= 3
 	  && recog_data.operand_loc[1] == &XEXP (SET_SRC (set), 0)
 	  && recog_data.operand_loc[2] == &XEXP (SET_SRC (set), 1)
-	  && GET_CODE (recog_data.operand[2]) == CONST_INT
+	  && CONST_INT_P (recog_data.operand[2])
 	  && (new_rtx = instantiate_new_reg (recog_data.operand[1], &offset)))
 	{
 	  offset += INTVAL (recog_data.operand[2]);
 	  /* If the sum is zero, then replace with a plain move.  */
 	 Validate the new value vs the insn predicate.  Note that
 	 asm insns will have insn_code -1 here.  */
 if (!safe_insn_predicate (insn_code, i, x))
 	{
 	  start_sequence ();
-	  x = force_reg (insn_data[insn_code].operand[i].mode, x);
+	  if (REG_P (x))
+	    {
+	      gcc_assert (REGNO (x) <= LAST_VIRTUAL_REGISTER);
+	      x = copy_to_reg (x);
+	    }
+	  else
+	    x = force_reg (insn_data[insn_code].operand[i].mode, x);
 	  seq = get_insns ();
 	  end_sequence ();
 	  if (seq)
 	    emit_insn_before (seq, insn);
 	}
 	    || GET_CODE (PATTERN (insn)) == CLOBBER
 	    || GET_CODE (PATTERN (insn)) == ADDR_VEC
 	    || GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC
 	    || GET_CODE (PATTERN (insn)) == ASM_INPUT)
 	  continue;
+	else if (DEBUG_INSN_P (insn))
-	instantiate_virtual_regs_in_insn (insn);
+	  for_each_rtx (&INSN_VAR_LOCATION (insn),
+			instantiate_virtual_regs_in_rtx, NULL);
+	else
+	  instantiate_virtual_regs_in_insn (insn);
 	if (INSN_DELETED_P (insn))
 	  continue;
 	for_each_rtx (&REG_NOTES (insn), instantiate_virtual_regs_in_rtx, NULL);
 	/* Instantiate any virtual registers in CALL_INSN_FUNCTION_USAGE.  */
-	if (GET_CODE (insn) == CALL_INSN)
+	if (CALL_P (insn))
 	  for_each_rtx (&CALL_INSN_FUNCTION_USAGE (insn),
 			instantiate_virtual_regs_in_rtx, NULL);
 }
 /* Instantiate the virtual registers in the DECLs for debugging purposes.  */
 NULL,                                 /* gate */
 instantiate_virtual_regs,             /* execute */
 NULL,                                 /* sub */
 NULL,                                 /* next */
 0,                                    /* static_pass_number */
-0,                                    /* tv_id */
+TV_NONE,                              /* tv_id */
 0,                                    /* properties_required */
 0,                                    /* properties_provided */
 0,                                    /* properties_destroyed */
 0,                                    /* todo_flags_start */
 TODO_dump_func                        /* todo_flags_finish */
 /* DECL node associated with FNTYPE when relevant, which we might need to
 check for by-invisible-reference returns, typically for CALL_EXPR input
 EXPressions.  */
 const_tree fndecl = NULL_TREE;
 if (fntype)
 switch (TREE_CODE (fntype))
 {
 case CALL_EXPR:
 	fndecl = get_callee_fndecl (fntype);
 mechanism but might now be causing troubles at gimplification time if
 temporaries with the function type need to be created.  */
 if (TREE_CODE (exp) == CALL_EXPR && fndecl && DECL_RESULT (fndecl)
 && DECL_BY_REFERENCE (DECL_RESULT (fndecl)))
 return 1;
 if (targetm.calls.return_in_memory (type, fntype))
 return 1;
 /* Types that are TREE_ADDRESSABLE must be constructed in memory,
 and thus can't be returned in registers.  */
 if (TREE_ADDRESSABLE (type))
 bool
 use_register_for_decl (const_tree decl)
 {
 if (!targetm.calls.allocate_stack_slots_for_args())
 return true;
 /* Honor volatile.  */
 if (TREE_SIDE_EFFECTS (decl))
 return false;
 /* Honor addressability.  */
 	  DECL_IGNORED_P (p) = addressable;
 	  TREE_ADDRESSABLE (p) = 0;
 	  layout_decl (p, 0);
 	  /* Build a second synthetic decl.  */
-	  decl = build_decl (PARM_DECL, NULL_TREE, subtype);
+	  decl = build_decl (EXPR_LOCATION (p),
+			     PARM_DECL, NULL_TREE, subtype);
 	  DECL_ARG_TYPE (decl) = DECL_ARG_TYPE (p);
 	  DECL_ARTIFICIAL (decl) = addressable;
 	  DECL_IGNORED_P (decl) = addressable;
 	  layout_decl (decl, 0);
 && targetm.calls.struct_value_rtx (TREE_TYPE (fndecl), 1) == 0)
 {
 tree type = build_pointer_type (TREE_TYPE (fntype));
 tree decl;
-decl = build_decl (PARM_DECL, NULL_TREE, type);
+decl = build_decl (DECL_SOURCE_LOCATION (fndecl),
+			 PARM_DECL, NULL_TREE, type);
 DECL_ARG_TYPE (decl) = type;
 DECL_ARTIFICIAL (decl) = 1;
 DECL_IGNORED_P (decl) = 1;
 TREE_CHAIN (decl) = fnargs;
 assign_parm_find_data_types (struct assign_parm_data_all *all, tree parm,
 			     struct assign_parm_data_one *data)
 {
 tree nominal_type, passed_type;
 enum machine_mode nominal_mode, passed_mode, promoted_mode;
+int unsignedp;
 memset (data, 0, sizeof (*data));
 /* NAMED_ARG is a misnomer.  We really mean 'non-variadic'. */
 if (!cfun->stdarg)
 data->passed_pointer = true;
 passed_mode = nominal_mode = Pmode;
 }
 /* Find mode as it is passed by the ABI.  */
-promoted_mode = passed_mode;
+unsignedp = TYPE_UNSIGNED (passed_type);
-if (targetm.calls.promote_function_args (TREE_TYPE (current_function_decl)))
+promoted_mode = promote_function_mode (passed_type, passed_mode, &unsignedp,
-{
+				         TREE_TYPE (current_function_decl), 0);
-int unsignedp = TYPE_UNSIGNED (passed_type);
-promoted_mode = promote_mode (passed_type, promoted_mode,
-				    &unsignedp, 1);
-}
 egress:
 data->nominal_type = nominal_type;
 data->passed_type = passed_type;
 data->nominal_mode = nominal_mode;
 stack_parm = crtl->args.internal_arg_pointer;
 if (offset_rtx != const0_rtx)
 stack_parm = gen_rtx_PLUS (Pmode, stack_parm, offset_rtx);
 stack_parm = gen_rtx_MEM (data->promoted_mode, stack_parm);
-set_mem_attributes (stack_parm, parm, 1);
+if (!data->passed_pointer)
-/* set_mem_attributes could set MEM_SIZE to the passed mode's size,
+{
-while promoted mode's size is needed.  */
+set_mem_attributes (stack_parm, parm, 1);
-if (data->promoted_mode != BLKmode
+/* set_mem_attributes could set MEM_SIZE to the passed mode's size,
-&& data->promoted_mode != DECL_MODE (parm))
+	 while promoted mode's size is needed.  */
-{
+if (data->promoted_mode != BLKmode
-set_mem_size (stack_parm, GEN_INT (GET_MODE_SIZE (data->promoted_mode)));
+	  && data->promoted_mode != DECL_MODE (parm))
-if (MEM_EXPR (stack_parm) && MEM_OFFSET (stack_parm))
+	{
-	{
+	  set_mem_size (stack_parm,
-	  int offset = subreg_lowpart_offset (DECL_MODE (parm),
+			GEN_INT (GET_MODE_SIZE (data->promoted_mode)));
-					      data->promoted_mode);
+	  if (MEM_EXPR (stack_parm) && MEM_OFFSET (stack_parm))
-	  if (offset)
+	    {
-	    set_mem_offset (stack_parm,
+	      int offset = subreg_lowpart_offset (DECL_MODE (parm),
-			    plus_constant (MEM_OFFSET (stack_parm), -offset));
+						  data->promoted_mode);
+	      if (offset)
+		set_mem_offset (stack_parm,
+				plus_constant (MEM_OFFSET (stack_parm),
+					       -offset));
+	    }
 	}
 }
 boundary = data->locate.boundary;
 align = BITS_PER_UNIT;
 is FUNCTION_ARG_BOUNDARY.  If we're using slot_offset, we're
 intentionally forcing upward padding.  Otherwise we have to come
 up with a guess at the alignment based on OFFSET_RTX.  */
 if (data->locate.where_pad != downward || data->entry_parm)
 align = boundary;
-else if (GET_CODE (offset_rtx) == CONST_INT)
+else if (CONST_INT_P (offset_rtx))
 {
 align = INTVAL (offset_rtx) * BITS_PER_UNIT | boundary;
 align = align & -align;
 }
 set_mem_align (stack_parm, align);
 {
 /* Handle calls that pass values in multiple non-contiguous
 	 locations.  The Irix 6 ABI has examples of this.  */
 if (GET_CODE (entry_parm) == PARALLEL)
 	emit_group_store (validize_mem (stack_parm), entry_parm,
 			  data->passed_type,
 			  int_size_in_bytes (data->passed_type));
 else
 	{
 	  gcc_assert (data->partial % UNITS_PER_WORD == 0);
 	  move_block_from_reg (REGNO (entry_parm), validize_mem (stack_parm),
 #endif
 return false;
 }
 /* A subroutine of assign_parms.  Arrange for the parameter to be
 present and valid in DATA->STACK_RTL.  */
 static void
 assign_parm_setup_block (struct assign_parm_data_all *all,
 			 tree parm, struct assign_parm_data_one *data)
 enum machine_mode promoted_nominal_mode;
 int unsignedp = TYPE_UNSIGNED (TREE_TYPE (parm));
 bool did_conversion = false;
 /* Store the parm in a pseudoregister during the function, but we may
-need to do it in a wider mode.  */
+need to do it in a wider mode.  Using 2 here makes the result
+consistent with promote_decl_mode and thus expand_expr_real_1.  */
-/* This is not really promoting for a call.  However we need to be
-consistent with assign_parm_find_data_types and expand_expr_real_1.  */
 promoted_nominal_mode
-= promote_mode (data->nominal_type, data->nominal_mode, &unsignedp, 1);
+= promote_function_mode (data->nominal_type, data->nominal_mode, &unsignedp,
+			     TREE_TYPE (current_function_decl), 2);
 parmreg = gen_reg_rtx (promoted_nominal_mode);
 if (!DECL_ARTIFICIAL (parm))
 mark_user_reg (parmreg);
 else
 SET_DECL_RTL (parm, parmreg);
 assign_parm_remove_parallels (data);
-/* Copy the value into the register.  */
+/* Copy the value into the register, thus bridging between
+assign_parm_find_data_types and expand_expr_real_1.  */
 if (data->nominal_mode != data->passed_mode
 || promoted_nominal_mode != data->promoted_mode)
 {
 int save_tree_used;
 	    {
 	      gcc_assert (!crtl->stack_realign_processed);
 	      crtl->stack_alignment_estimated = align;
 	    }
 	}
 if (cfun->stdarg && !TREE_CHAIN (parm))
 	assign_parms_setup_varargs (&all, &data, false);
 /* Find out where the parameter arrives in this function.  */
 assign_parm_find_entry_rtl (&all, &data);
 		{
 		  gcc_assert (!crtl->stack_realign_processed);
 		  crtl->stack_alignment_estimated = align;
 		}
 	    }
 	}
 }
 /* If we are receiving a struct value address as the first argument, set up
 the RTL for the function result. As this might require code to convert
 the transmitted address to Pmode, we do this here to ensure that possible
 #ifdef ARGS_GROW_DOWNWARD
 crtl->args.arg_offset_rtx
 = (all.stack_args_size.var == 0 ? GEN_INT (-all.stack_args_size.constant)
 : expand_expr (size_diffop (all.stack_args_size.var,
 				   size_int (-all.stack_args_size.constant)),
-		      NULL_RTX, VOIDmode, 0));
+		      NULL_RTX, VOIDmode, EXPAND_NORMAL));
 #else
 crtl->args.arg_offset_rtx = ARGS_SIZE_RTX (all.stack_args_size);
 #endif
 /* See how many bytes, if any, of its args a function should try to pop
 /* Remember if the outgoing parameter requires extra alignment on the
 calling function side.  */
 if (crtl->stack_alignment_needed < boundary)
 crtl->stack_alignment_needed = boundary;
-if (crtl->max_used_stack_slot_alignment < crtl->stack_alignment_needed)
-crtl->max_used_stack_slot_alignment = crtl->stack_alignment_needed;
 if (crtl->preferred_stack_boundary < boundary)
 crtl->preferred_stack_boundary = boundary;
 #ifdef ARGS_GROW_DOWNWARD
 locate->slot_offset.constant = -initial_offset_ptr->constant;
 {
 if (TREE_CODE (decl) == VAR_DECL
 	  && DECL_RTL_SET_P (decl)
 	  && REG_P (DECL_RTL (decl))
 	  && regno_clobbered_at_setjmp (setjmp_crosses, REGNO (DECL_RTL (decl))))
 	warning (OPT_Wclobbered, "variable %q+D might be clobbered by"
 " %<longjmp%> or %<vfork%>", decl);
 }
 for (sub = BLOCK_SUBBLOCKS (block); sub; sub = BLOCK_CHAIN (sub))
 setjmp_vars_warning (setjmp_crosses, sub);
 for (decl = DECL_ARGUMENTS (current_function_decl);
 decl; decl = TREE_CHAIN (decl))
 if (DECL_RTL (decl) != 0
 	&& REG_P (DECL_RTL (decl))
 	&& regno_clobbered_at_setjmp (setjmp_crosses, REGNO (DECL_RTL (decl))))
 warning (OPT_Wclobbered,
 "argument %q+D might be clobbered by %<longjmp%> or %<vfork%>",
 	       decl);
 }
 /* Generate warning messages for variables live across setjmp.  */
 void
 generate_setjmp_warnings (void)
 {
 bitmap setjmp_crosses = regstat_get_setjmp_crosses ();
 if (n_basic_blocks == NUM_FIXED_BLOCKS
 set_cfun (new_cfun);
 }
 /* Return value of funcdef and increase it.  */
 int
 get_next_funcdef_no (void)
 {
 return funcdef_no++;
 }
 /* Allocate a function structure for FNDECL and set its contents
 cfun->stdarg
 	= (fntype
 	   && TYPE_ARG_TYPES (fntype) != 0
 	   && (TREE_VALUE (tree_last (TYPE_ARG_TYPES (fntype)))
 	       != void_type_node));
 /* Assume all registers in stdarg functions need to be saved.  */
 cfun->va_list_gpr_size = VA_LIST_MAX_GPR_SIZE;
 cfun->va_list_fpr_size = VA_LIST_MAX_FPR_SIZE;
 }
 }
 regardless of which calling convention we are using for it.  */
 if (AGGREGATE_TYPE_P (TREE_TYPE (DECL_RESULT (subr))))
 warning (OPT_Waggregate_return, "function returns an aggregate");
 }
-/* Make sure all values used by the optimization passes have sane
+/* Make sure all values used by the optimization passes have sane defaults.  */
-defaults.  */
 unsigned int
 init_function_for_compilation (void)
 {
 reg_renumber = 0;
-/* No prologue/epilogue insns yet.  Make sure that these vectors are
-empty.  */
-gcc_assert (VEC_length (int, prologue) == 0);
-gcc_assert (VEC_length (int, epilogue) == 0);
-gcc_assert (VEC_length (int, sibcall_epilogue) == 0);
 return 0;
 }
 struct rtl_opt_pass pass_init_function =
 {
 {
 RTL_PASS,
-NULL,                                 /* name */
+"*init_function",                     /* name */
 NULL,                                 /* gate */
 init_function_for_compilation,        /* execute */
 NULL,                                 /* sub */
 NULL,                                 /* next */
 0,                                    /* static_pass_number */
-0,                                    /* tv_id */
+TV_NONE,                              /* tv_id */
 0,                                    /* properties_required */
 0,                                    /* properties_provided */
 0,                                    /* properties_destroyed */
 0,                                    /* todo_flags_start */
 0                                     /* todo_flags_finish */
 /* If function gets a static chain arg, store it.  */
 if (cfun->static_chain_decl)
 {
 tree parm = cfun->static_chain_decl;
-rtx local = gen_reg_rtx (Pmode);
+rtx local, chain, insn;
-set_decl_incoming_rtl (parm, static_chain_incoming_rtx, false);
+local = gen_reg_rtx (Pmode);
+chain = targetm.calls.static_chain (current_function_decl, true);
+set_decl_incoming_rtl (parm, chain, false);
 SET_DECL_RTL (parm, local);
 mark_reg_pointer (local, TYPE_ALIGN (TREE_TYPE (TREE_TYPE (parm))));
-emit_move_insn (local, static_chain_incoming_rtx);
+insn = emit_move_insn (local, chain);
+/* Mark the register as eliminable, similar to parameters.  */
+if (MEM_P (chain)
+	  && reg_mentioned_p (arg_pointer_rtx, XEXP (chain, 0)))
+	set_unique_reg_note (insn, REG_EQUIV, chain);
 }
 /* If the function receives a non-local goto, then store the
 bits we need to restore the frame pointer.  */
 if (cfun->nonlocal_goto_save_area)
 rtx insn, seq;
 for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
 	if (CALL_P (insn))
 	  {
+	    rtx max_frame_size = GEN_INT (STACK_CHECK_MAX_FRAME_SIZE);
 	    start_sequence ();
-	    probe_stack_range (STACK_OLD_CHECK_PROTECT,
+	    if (STACK_CHECK_MOVING_SP)
-			       GEN_INT (STACK_CHECK_MAX_FRAME_SIZE));
+	      anti_adjust_stack_and_probe (max_frame_size, true);
+	    else
+	      probe_stack_range (STACK_OLD_CHECK_PROTECT, max_frame_size);
 	    seq = get_insns ();
 	    end_sequence ();
 	    emit_insn_before (seq, stack_check_probe_note);
 	    break;
 	  }
 	     we may need to re-do the PROMOTE_MODE signed/unsigned
 	     extension.  */
 	  else if (GET_MODE (real_decl_rtl) != GET_MODE (decl_rtl))
 	    {
 	      int unsignedp = TYPE_UNSIGNED (TREE_TYPE (decl_result));
+	      promote_function_mode (TREE_TYPE (decl_result),
-	      if (targetm.calls.promote_function_return (TREE_TYPE (current_function_decl)))
+				     GET_MODE (decl_rtl), &unsignedp,
-		promote_mode (TREE_TYPE (decl_result), GET_MODE (decl_rtl),
+				     TREE_TYPE (current_function_decl), 1);
-			      &unsignedp, 1);
 	      convert_move (real_decl_rtl, decl_rtl, unsignedp);
 	    }
 	  else if (GET_CODE (real_decl_rtl) == PARALLEL)
 	    {
 {
 rtx seq;
 start_sequence ();
 clobber_return_register ();
-expand_naked_return ();
 seq = get_insns ();
 end_sequence ();
 emit_insn_after (seq, clobber_after);
 }
 /* Output the label for the naked return from the function.  */
-emit_label (naked_return_label);
+if (naked_return_label)
+emit_label (naked_return_label);
 /* @@@ This is a kludge.  We want to ensure that instructions that
 may trap are not moved into the epilogue by scheduling, because
 we don't always emit unwind information for the epilogue.  */
 if (! USING_SJLJ_EXCEPTIONS && flag_non_call_exceptions)
 }
 return ret;
 }
-/* Extend a vector that records the INSN_UIDs of INSNS
+/* Add a list of INSNS to the hash HASHP, possibly allocating HASHP
-(a list of one or more insns).  */
+for the first time.  */
 static void
-record_insns (rtx insns, VEC(int,heap) **vecp)
+record_insns (rtx insns, rtx end, htab_t *hashp)
 {
 rtx tmp;
+htab_t hash = *hashp;
-for (tmp = insns; tmp != NULL_RTX; tmp = NEXT_INSN (tmp))
-VEC_safe_push (int, heap, *vecp, INSN_UID (tmp));
+if (hash == NULL)
+*hashp = hash
+= htab_create_ggc (17, htab_hash_pointer, htab_eq_pointer, NULL);
+for (tmp = insns; tmp != end; tmp = NEXT_INSN (tmp))
+{
+void **slot = htab_find_slot (hash, tmp, INSERT);
+gcc_assert (*slot == NULL);
+*slot = tmp;
+}
+}
+/* INSN has been duplicated as COPY, as part of duping a basic block.
+If INSN is an epilogue insn, then record COPY as epilogue as well.  */
+void
+maybe_copy_epilogue_insn (rtx insn, rtx copy)
+{
+void **slot;
+if (epilogue_insn_hash == NULL
+|| htab_find (epilogue_insn_hash, insn) == NULL)
+return;
+slot = htab_find_slot (epilogue_insn_hash, copy, INSERT);
+gcc_assert (*slot == NULL);
+*slot = copy;
 }
 /* Set the locator of the insn chain starting at INSN to LOC.  */
 static void
 set_insn_locators (rtx insn, int loc)
 	INSN_LOCATOR (insn) = loc;
 insn = NEXT_INSN (insn);
 }
 }
-/* Determine how many INSN_UIDs in VEC are part of INSN.  Because we can
+/* Determine if any INSNs in HASH are, or are part of, INSN.  Because
-be running after reorg, SEQUENCE rtl is possible.  */
+we can be running after reorg, SEQUENCE rtl is possible.  */
-static int
+static bool
-contains (const_rtx insn, VEC(int,heap) **vec)
+contains (const_rtx insn, htab_t hash)
 {
-int i, j;
+if (hash == NULL)
+return false;
-if (NONJUMP_INSN_P (insn)
-&& GET_CODE (PATTERN (insn)) == SEQUENCE)
+if (NONJUMP_INSN_P (insn) && GET_CODE (PATTERN (insn)) == SEQUENCE)
 {
-int count = 0;
+int i;
 for (i = XVECLEN (PATTERN (insn), 0) - 1; i >= 0; i--)
-	for (j = VEC_length (int, *vec) - 1; j >= 0; --j)
+	if (htab_find (hash, XVECEXP (PATTERN (insn), 0, i)))
-	  if (INSN_UID (XVECEXP (PATTERN (insn), 0, i))
+	  return true;
-	      == VEC_index (int, *vec, j))
+return false;
-	    count++;
+}
-return count;
-}
+return htab_find (hash, insn) != NULL;
-else
-{
-for (j = VEC_length (int, *vec) - 1; j >= 0; --j)
-	if (INSN_UID (insn) == VEC_index (int, *vec, j))
-	  return 1;
-}
-return 0;
 }
 int
 prologue_epilogue_contains (const_rtx insn)
 {
-if (contains (insn, &prologue))
+if (contains (insn, prologue_insn_hash))
 return 1;
-if (contains (insn, &epilogue))
+if (contains (insn, epilogue_insn_hash))
 return 1;
-return 0;
-}
-int
-sibcall_epilogue_contains (const_rtx insn)
-{
-if (sibcall_epilogue)
-return contains (insn, &sibcall_epilogue);
 return 0;
 }
 #ifdef HAVE_return
 /* Insert gen_return at the end of block BB.  This also means updating
 {
 start_sequence ();
 seq = gen_prologue ();
 emit_insn (seq);
 /* Insert an explicit USE for the frame pointer
 if the profiling is on and the frame pointer is required.  */
 if (crtl->profile && frame_pointer_needed)
 	emit_use (hard_frame_pointer_rtx);
 /* Retain a map of the prologue insns.  */
-record_insns (seq, &prologue);
+record_insns (seq, NULL, &prologue_insn_hash);
 emit_note (NOTE_INSN_PROLOGUE_END);
 #ifndef PROFILE_BEFORE_PROLOGUE
 /* Ensure that instructions are not moved into the prologue when
 	 profiling is on.  The call to the profiling routine can be
 	 emitted within the live range of a call-clobbered register.  */
 if (crtl->profile)
 	  single_succ_edge (last)->flags &= ~EDGE_FALLTHRU;
 	  goto epilogue_done;
 	}
 }
 #endif
+/* A small fib -- epilogue is not yet completed, but we wish to re-use
+this marker for the splits of EH_RETURN patterns, and nothing else
+uses the flag in the meantime.  */
+epilogue_completed = 1;
+#ifdef HAVE_eh_return
+/* Find non-fallthru edges that end with EH_RETURN instructions.  On
+some targets, these get split to a special version of the epilogue
+code.  In order to be able to properly annotate these with unwind
+info, try to split them now.  If we get a valid split, drop an
+EPILOGUE_BEG note and mark the insns as epilogue insns.  */
+FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR->preds)
+{
+rtx prev, last, trial;
+if (e->flags & EDGE_FALLTHRU)
+	continue;
+last = BB_END (e->src);
+if (!eh_returnjump_p (last))
+	continue;
+prev = PREV_INSN (last);
+trial = try_split (PATTERN (last), last, 1);
+if (trial == last)
+	continue;
+record_insns (NEXT_INSN (prev), NEXT_INSN (trial), &epilogue_insn_hash);
+emit_note_after (NOTE_INSN_EPILOGUE_BEG, prev);
+}
+#endif
 /* Find the edge that falls through to EXIT.  Other edges may exist
 due to RETURN instructions, but those don't need epilogues.
 There really shouldn't be a mixture -- either all should have
 been converted or none, however...  */
 epilogue_end = emit_note (NOTE_INSN_EPILOGUE_BEG);
 seq = gen_epilogue ();
 emit_jump_insn (seq);
 /* Retain a map of the epilogue insns.  */
-record_insns (seq, &epilogue);
+record_insns (seq, NULL, &epilogue_insn_hash);
 set_insn_locators (seq, epilogue_locator);
 seq = get_insns ();
 end_sequence ();
 	  ei_next (&ei);
 	  continue;
 	}
 start_sequence ();
+emit_note (NOTE_INSN_EPILOGUE_BEG);
 emit_insn (gen_sibcall_epilogue ());
 seq = get_insns ();
 end_sequence ();
 /* Retain a map of the epilogue insns.  Used in life analysis to
 	 avoid getting rid of sibcall epilogue insns.  Do this before we
 	 actually emit the sequence.  */
-record_insns (seq, &sibcall_epilogue);
+record_insns (seq, NULL, &epilogue_insn_hash);
 set_insn_locators (seq, epilogue_locator);
 emit_insn_before (seq, insn);
 ei_next (&ei);
 }
 	 NOTE_INSN_FUNCTION_BEG notes, as those can be relevant for debug
 	 info generation.  */
 for (insn = epilogue_end; insn; insn = next)
 	{
 	  next = NEXT_INSN (insn);
 	  if (NOTE_P (insn)
 	      && (NOTE_KIND (insn) == NOTE_INSN_FUNCTION_BEG))
 	    reorder_insns (insn, insn, PREV_INSN (epilogue_end));
 	}
 }
 #endif
 in the entry and exit blocks.  */
 epilogue_completed = 1;
 df_update_entry_exit_and_calls ();
 }
-/* Reposition the prologue-end and epilogue-begin notes after instruction
+/* Reposition the prologue-end and epilogue-begin notes after
-scheduling and delayed branch scheduling.  */
+instruction scheduling.  */
 void
 reposition_prologue_and_epilogue_notes (void)
 {
-#if defined (HAVE_prologue) || defined (HAVE_epilogue)
+#if defined (HAVE_prologue) || defined (HAVE_epilogue) \
-rtx insn, last, note;
+|| defined (HAVE_sibcall_epilogue)
-int len;
+/* Since the hash table is created on demand, the fact that it is
+non-null is a signal that it is non-empty.  */
-if ((len = VEC_length (int, prologue)) > 0)
+if (prologue_insn_hash != NULL)
 {
-last = 0, note = 0;
+size_t len = htab_elements (prologue_insn_hash);
+rtx insn, last = NULL, note = NULL;
-/* Scan from the beginning until we reach the last prologue insn.
-	 We apparently can't depend on basic_block_{head,end} after
+/* Scan from the beginning until we reach the last prologue insn.  */
-	 reorg has run.  */
+/* ??? While we do have the CFG intact, there are two problems:
+	 (1) The prologue can contain loops (typically probing the stack),
+	     which means that the end of the prologue isn't in the first bb.
+	 (2) Sometimes the PROLOGUE_END note gets pushed into the next bb.  */
 for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
 	{
 	  if (NOTE_P (insn))
 	    {
 	      if (NOTE_KIND (insn) == NOTE_INSN_PROLOGUE_END)
 		note = insn;
 	    }
-	  else if (contains (insn, &prologue))
+	  else if (contains (insn, prologue_insn_hash))
 	    {
 	      last = insn;
 	      if (--len == 0)
 		break;
 	    }
 	}
 if (last)
 	{
-	  /* Find the prologue-end note if we haven't already, and
+	  if (note == NULL)
-	     move it to just after the last prologue insn.  */
-	  if (note == 0)
 	    {
-	      for (note = last; (note = NEXT_INSN (note));)
+	      /* Scan forward looking for the PROLOGUE_END note.  It should
-		if (NOTE_P (note)
+		 be right at the beginning of the block, possibly with other
-		    && NOTE_KIND (note) == NOTE_INSN_PROLOGUE_END)
+		 insn notes that got moved there.  */
-		  break;
+	      for (note = NEXT_INSN (last); ; note = NEXT_INSN (note))
+		{
+		  if (NOTE_P (note)
+		      && NOTE_KIND (note) == NOTE_INSN_PROLOGUE_END)
+		    break;
+		}
 	    }
 	  /* Avoid placing note between CODE_LABEL and BASIC_BLOCK note.  */
 	  if (LABEL_P (last))
 	    last = NEXT_INSN (last);
 	  reorder_insns (note, note, last);
 	}
 }
-if ((len = VEC_length (int, epilogue)) > 0)
+if (epilogue_insn_hash != NULL)
 {
-last = 0, note = 0;
+edge_iterator ei;
+edge e;
-/* Scan from the end until we reach the first epilogue insn.
-	 We apparently can't depend on basic_block_{head,end} after
+FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR->preds)
-	 reorg has run.  */
+	{
-for (insn = get_last_insn (); insn; insn = PREV_INSN (insn))
+	  rtx insn, first = NULL, note = NULL;
-	{
+	  basic_block bb = e->src;
-	  if (NOTE_P (insn))
+	  /* Scan from the beginning until we reach the first epilogue insn. */
+	  FOR_BB_INSNS (bb, insn)
 	    {
-	      if (NOTE_KIND (insn) == NOTE_INSN_EPILOGUE_BEG)
+	      if (NOTE_P (insn))
-		note = insn;
+		{
+		  if (NOTE_KIND (insn) == NOTE_INSN_EPILOGUE_BEG)
+		    {
+		      note = insn;
+		      if (first != NULL)
+			break;
+		    }
+		}
+	      else if (first == NULL && contains (insn, epilogue_insn_hash))
+		{
+		  first = insn;
+		  if (note != NULL)
+		    break;
+		}
 	    }
-	  else if (contains (insn, &epilogue))
+	  if (note)
 	    {
-	      last = insn;
+	      /* If the function has a single basic block, and no real
-	      if (--len == 0)
+		 epilogue insns (e.g. sibcall with no cleanup), the
-		break;
+		 epilogue note can get scheduled before the prologue
+		 note.  If we have frame related prologue insns, having
+		 them scanned during the epilogue will result in a crash.
+		 In this case re-order the epilogue note to just before
+		 the last insn in the block.  */
+	      if (first == NULL)
+		first = BB_END (bb);
+	      if (PREV_INSN (first) != note)
+		reorder_insns (note, note, PREV_INSN (first));
 	    }
-	}
-if (last)
-	{
-	  /* Find the epilogue-begin note if we haven't already, and
-	     move it to just before the first epilogue insn.  */
-	  if (note == 0)
-	    {
-	      for (note = insn; (note = PREV_INSN (note));)
-		if (NOTE_P (note)
-		    && NOTE_KIND (note) == NOTE_INSN_EPILOGUE_BEG)
-		  break;
-	    }
-	  if (PREV_INSN (last) != note)
-	    reorder_insns (note, note, PREV_INSN (last));
 	}
 }
 #endif /* HAVE_prologue or HAVE_epilogue */
 }
 /* Returns the name of the current function.  */
 const char *
 current_function_name (void)
 {
+if (cfun == NULL)
+return "<none>";
 return lang_hooks.decl_printable_name (cfun->decl, 2);
-}
-/* Returns the raw (mangled) name of the current function.  */
-const char *
-current_function_assembler_name (void)
-{
-return IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (cfun->decl));
 }
 static unsigned int
 rest_of_handle_check_leaf_regs (void)
 struct rtl_opt_pass pass_leaf_regs =
 {
 {
 RTL_PASS,
-NULL,                                 /* name */
+"*leaf_regs",                         /* name */
 NULL,                                 /* gate */
 rest_of_handle_check_leaf_regs,       /* execute */
 NULL,                                 /* sub */
 NULL,                                 /* next */
 0,                                    /* static_pass_number */
-0,                                    /* tv_id */
+TV_NONE,                              /* tv_id */
 0,                                    /* properties_required */
 0,                                    /* properties_provided */
 0,                                    /* properties_destroyed */
 0,                                    /* todo_flags_start */
 0                                     /* todo_flags_finish */
 }
 };
 /* This mini-pass fixes fall-out from SSA in asm statements that have
 in-out constraints.  Say you start with
 orig = inout;
 asm ("": "+mr" (inout));
 use (orig);
 NULL,					/* gate */
 rest_of_match_asm_constraints,	/* execute */
 NULL,                                 /* sub */
 NULL,                                 /* next */
 0,                                    /* static_pass_number */
-0,					/* tv_id */
+TV_NONE,				/* tv_id */
 0,                                    /* properties_required */
 0,                                    /* properties_provided */
 0,                                    /* properties_destroyed */
 0,					/* todo_flags_start */
 TODO_dump_func                       /* todo_flags_finish */

Mercurial > hg > CbC > CbC_gcc

comparison gcc/function.c @ 57:326d9e06c2e3