CbC/CbC_gcc: gcc/resource.c comparison

comparison gcc/resource.c @ 111:04ced10e8804

gcc 7

author	kono
date	Fri, 27 Oct 2017 22:46:09 +0900
parents	f6334be47118
children	84e7813d76e9

comparison

equal deleted inserted replaced

-:561a7518be6b
+:04ced10e8804
 /* Definitions for computing resource usage of specific insns.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1999-2017 Free Software Foundation, Inc.
-2009, 2010 Free Software Foundation, Inc.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 <http://www.gnu.org/licenses/>.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
-#include "diagnostic-core.h"
 #include "rtl.h"
+#include "df.h"
+#include "memmodel.h"
 #include "tm_p.h"
-#include "hard-reg-set.h"
-#include "function.h"
 #include "regs.h"
-#include "flags.h"
+#include "emit-rtl.h"
-#include "output.h"
 #include "resource.h"
-#include "except.h"
 #include "insn-attr.h"
 #include "params.h"
-#include "df.h"
 /* This structure is used to record liveness information at the targets or
 fallthrough insns of branches.  We will most likely need the information
 at targets again, so save them in a hash table rather than recomputing them
 each time.  */
 Also only used by the next two functions.  */
 static HARD_REG_SET pending_dead_regs;
 static void update_live_status (rtx, const_rtx, void *);
-static int find_basic_block (rtx, int);
+static int find_basic_block (rtx_insn *, int);
-static rtx next_insn_no_annul (rtx);
+static rtx_insn *next_insn_no_annul (rtx_insn *);
-static rtx find_dead_or_set_registers (rtx, struct resources*,
+static rtx_insn *find_dead_or_set_registers (rtx_insn *, struct resources*,
-				       rtx*, int, struct resources,
+					     rtx *, int, struct resources,
-				       struct resources);
+					     struct resources);
 /* Utility function called from mark_target_live_regs via note_stores.
 It deadens any CLOBBERed registers and livens any SET registers.  */
 static void
 }
 else
 {
 first_regno = REGNO (dest);
-last_regno = END_HARD_REGNO (dest);
+last_regno = END_REGNO (dest);
 }
 if (GET_CODE (x) == CLOBBER)
 for (i = first_regno; i < last_regno; i++)
 CLEAR_HARD_REG_BIT (current_live_regs, i);
 instead of finding the basic block containing INSN, we search
 backwards toward a BARRIER where the live register information is
 correct.  */
 static int
-find_basic_block (rtx insn, int search_limit)
+find_basic_block (rtx_insn *insn, int search_limit)
 {
 /* Scan backwards to the previous BARRIER.  Then see if we can find a
 label that starts a basic block.  Return the basic block number.  */
 for (insn = prev_nonnote_insn (insn);
 insn && !BARRIER_P (insn) && search_limit != 0;
 if (search_limit == 0)
 return -1;
 /* The start of the function.  */
 else if (insn == 0)
-return ENTRY_BLOCK_PTR->next_bb->index;
+return ENTRY_BLOCK_PTR_FOR_FN (cfun)->next_bb->index;
 /* See if any of the upcoming CODE_LABELs start a basic block.  If we reach
 anything other than a CODE_LABEL or note, we can't find this code.  */
 for (insn = next_nonnote_insn (insn);
 insn && LABEL_P (insn);
 }
 /* Similar to next_insn, but ignores insns in the delay slots of
 an annulled branch.  */
-static rtx
+static rtx_insn *
-next_insn_no_annul (rtx insn)
+next_insn_no_annul (rtx_insn *insn)
 {
 if (insn)
 {
 /* If INSN is an annulled branch, skip any insns from the target
 	 of the branch.  */
-if (INSN_P (insn)
+if (JUMP_P (insn)
 	  && INSN_ANNULLED_BRANCH_P (insn)
 	  && NEXT_INSN (PREV_INSN (insn)) != insn)
 	{
-	  rtx next = NEXT_INSN (insn);
+	  rtx_insn *next = NEXT_INSN (insn);
-	  enum rtx_code code = GET_CODE (next);
+	  while ((NONJUMP_INSN_P (next) || JUMP_P (next) || CALL_P (next))
-	  while ((code == INSN || code == JUMP_INSN || code == CALL_INSN)
 		 && INSN_FROM_TARGET_P (next))
 	    {
 	      insn = next;
 	      next = NEXT_INSN (insn);
-	      code = GET_CODE (next);
 	    }
 	}
 insn = NEXT_INSN (insn);
 if (insn && NONJUMP_INSN_P (insn)
 	  && GET_CODE (PATTERN (insn)) == SEQUENCE)
-	insn = XVECEXP (PATTERN (insn), 0, 0);
+	insn = as_a <rtx_sequence *> (PATTERN (insn))->insn (0);
 }
 return insn;
 }
 /* Handle leaf items for which we set resource flags.  Also, special-case
 CALL, SET and CLOBBER operators.  */
 switch (code)
 {
 case CONST:
-case CONST_INT:
+CASE_CONST_ANY:
-case CONST_DOUBLE:
-case CONST_FIXED:
-case CONST_VECTOR:
 case PC:
 case SYMBOL_REF:
 case LABEL_REF:
 return;
 return;
 case MEM:
 /* If this memory shouldn't change, it really isn't referencing
 	 memory.  */
-if (MEM_READONLY_P (x))
+if (! MEM_READONLY_P (x))
-	res->unch_memory = 1;
-else
 	res->memory = 1;
 res->volatil |= MEM_VOLATILE_P (x);
 /* Mark registers used to access memory.  */
 mark_referenced_resources (XEXP (x, 0), res, false);
 	     USE insns immediately in front of the CALL.
 	     However, we may have moved some of the parameter loading insns
 	     into the delay slot of this CALL.  If so, the USE's for them
 	     don't count and should be skipped.  */
-	  rtx insn = PREV_INSN (x);
+	  rtx_insn *insn = PREV_INSN (as_a <rtx_insn *> (x));
-	  rtx sequence = 0;
+	  rtx_sequence *sequence = 0;
 	  int seq_size = 0;
 	  int i;
 	  /* If we are part of a delay slot sequence, point at the SEQUENCE.  */
 	  if (NEXT_INSN (insn) != x)
 	    {
-	      sequence = PATTERN (NEXT_INSN (insn));
+	      sequence = as_a <rtx_sequence *> (PATTERN (NEXT_INSN (insn)));
-	      seq_size = XVECLEN (sequence, 0);
+	      seq_size = sequence->len ();
 	      gcc_assert (GET_CODE (sequence) == SEQUENCE);
 	    }
 	  res->memory = 1;
 	  SET_HARD_REG_BIT (res->regs, STACK_POINTER_REGNUM);
 	  if (frame_pointer_needed)
 	    {
 	      SET_HARD_REG_BIT (res->regs, FRAME_POINTER_REGNUM);
-#if !HARD_FRAME_POINTER_IS_FRAME_POINTER
+	      if (!HARD_FRAME_POINTER_IS_FRAME_POINTER)
-	      SET_HARD_REG_BIT (res->regs, HARD_FRAME_POINTER_REGNUM);
+		SET_HARD_REG_BIT (res->regs, HARD_FRAME_POINTER_REGNUM);
-#endif
 	    }
 	  for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
 	    if (global_regs[i])
 	      SET_HARD_REG_BIT (res->regs, i);
 		 link = XEXP (link, 1))
 	      if (GET_CODE (XEXP (link, 0)) == USE)
 		{
 		  for (i = 1; i < seq_size; i++)
 		    {
-		      rtx slot_pat = PATTERN (XVECEXP (sequence, 0, i));
+		      rtx slot_pat = PATTERN (sequence->element (i));
 		      if (GET_CODE (slot_pat) == SET
 			  && rtx_equal_p (SET_DEST (slot_pat),
 					  XEXP (XEXP (link, 0), 0)))
 			break;
 		    }
 		}
 	  }
 	}
 /* ... fall through to other INSN processing ...  */
+gcc_fallthrough ();
 case INSN:
 case JUMP_INSN:
-#ifdef INSN_REFERENCES_ARE_DELAYED
+if (GET_CODE (PATTERN (x)) == COND_EXEC)
+/* In addition to the usual references, also consider all outputs
+	 as referenced, to compensate for mark_set_resources treating
+	 them as killed.  This is similar to ZERO_EXTRACT / STRICT_LOW_PART
+	 handling, execpt that we got a partial incidence instead of a partial
+	 width.  */
+mark_set_resources (x, res, 0,
+			  include_delayed_effects
+			  ? MARK_SRC_DEST_CALL : MARK_SRC_DEST);
 if (! include_delayed_effects
-	  && INSN_REFERENCES_ARE_DELAYED (x))
+	  && INSN_REFERENCES_ARE_DELAYED (as_a <rtx_insn *> (x)))
 	return;
-#endif
 /* No special processing, just speed up.  */
 mark_referenced_resources (PATTERN (x), res, include_delayed_effects);
 return;
 /* A subroutine of mark_target_live_regs.  Search forward from TARGET
 looking for registers that are set before they are used.  These are dead.
 Stop after passing a few conditional jumps, and/or a small
 number of unconditional branches.  */
-static rtx
+static rtx_insn *
-find_dead_or_set_registers (rtx target, struct resources *res,
+find_dead_or_set_registers (rtx_insn *target, struct resources *res,
 			    rtx *jump_target, int jump_count,
 			    struct resources set, struct resources needed)
 {
 HARD_REG_SET scratch;
-rtx insn, next;
+rtx_insn *insn;
-rtx jump_insn = 0;
+rtx_insn *next_insn;
+rtx_insn *jump_insn = 0;
 int i;
-for (insn = target; insn; insn = next)
+for (insn = target; insn; insn = next_insn)
 {
-rtx this_jump_insn = insn;
+rtx_insn *this_insn = insn;
-next = NEXT_INSN (insn);
+next_insn = NEXT_INSN (insn);
 /* If this instruction can throw an exception, then we don't
 	 know where we might end up next.  That means that we have to
 	 assume that whatever we have already marked as live really is
 	 live.  */
 	      /* All other USE insns are to be ignored.  */
 	      continue;
 	    }
 	  else if (GET_CODE (PATTERN (insn)) == CLOBBER)
 	    continue;
-	  else if (GET_CODE (PATTERN (insn)) == SEQUENCE)
+	  else if (rtx_sequence *seq =
+		     dyn_cast <rtx_sequence *> (PATTERN (insn)))
 	    {
 	      /* An unconditional jump can be used to fill the delay slot
 		 of a call, so search for a JUMP_INSN in any position.  */
-	      for (i = 0; i < XVECLEN (PATTERN (insn), 0); i++)
+	      for (i = 0; i < seq->len (); i++)
 		{
-		  this_jump_insn = XVECEXP (PATTERN (insn), 0, i);
+		  this_insn = seq->insn (i);
-		  if (JUMP_P (this_jump_insn))
+		  if (JUMP_P (this_insn))
 		    break;
 		}
 	    }
 	default:
 	  break;
 	}
-if (JUMP_P (this_jump_insn))
+if (rtx_jump_insn *this_jump_insn =
+	    dyn_cast <rtx_jump_insn *> (this_insn))
 	{
 	  if (jump_count++ < 10)
 	    {
 	      if (any_uncondjump_p (this_jump_insn)
-		  || GET_CODE (PATTERN (this_jump_insn)) == RETURN)
+		  || ANY_RETURN_P (PATTERN (this_jump_insn)))
 		{
-		  next = JUMP_LABEL (this_jump_insn);
+		  rtx lab_or_return = this_jump_insn->jump_label ();
+		  if (ANY_RETURN_P (lab_or_return))
+		    next_insn = NULL;
+		  else
+		    next_insn = as_a <rtx_insn *> (lab_or_return);
 		  if (jump_insn == 0)
 		    {
 		      jump_insn = insn;
 		      if (jump_target)
 			*jump_target = JUMP_LABEL (this_jump_insn);
 		     and then inverting the INSN_FROM_TARGET_P bits again.  */
 		  if (GET_CODE (PATTERN (insn)) == SEQUENCE
 		      && INSN_ANNULLED_BRANCH_P (this_jump_insn))
 		    {
-		      for (i = 1; i < XVECLEN (PATTERN (insn), 0); i++)
+		      rtx_sequence *seq = as_a <rtx_sequence *> (PATTERN (insn));
-			INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i))
+		      for (i = 1; i < seq->len (); i++)
-			  = ! INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i));
+			INSN_FROM_TARGET_P (seq->element (i))
+			  = ! INSN_FROM_TARGET_P (seq->element (i));
 		      target_set = set;
 		      mark_set_resources (insn, &target_set, 0,
 					  MARK_SRC_DEST_CALL);
-		      for (i = 1; i < XVECLEN (PATTERN (insn), 0); i++)
+		      for (i = 1; i < seq->len (); i++)
-			INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i))
+			INSN_FROM_TARGET_P (seq->element (i))
-			  = ! INSN_FROM_TARGET_P (XVECEXP (PATTERN (insn), 0, i));
+			  = ! INSN_FROM_TARGET_P (seq->element (i));
 		      mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
 		    }
 		  else
 		    {
 		  fallthrough_res = *res;
 		  COPY_HARD_REG_SET (scratch, set.regs);
 		  AND_COMPL_HARD_REG_SET (scratch, needed.regs);
 		  AND_COMPL_HARD_REG_SET (fallthrough_res.regs, scratch);
-		  find_dead_or_set_registers (JUMP_LABEL (this_jump_insn),
+		  if (!ANY_RETURN_P (this_jump_insn->jump_label ()))
-					      &target_res, 0, jump_count,
+		    find_dead_or_set_registers
-					      target_set, needed);
+			  (this_jump_insn->jump_target (),
-		  find_dead_or_set_registers (next,
+			   &target_res, 0, jump_count, target_set, needed);
+		  find_dead_or_set_registers (next_insn,
 					      &fallthrough_res, 0, jump_count,
 					      set, needed);
 		  IOR_HARD_REG_SET (fallthrough_res.regs, target_res.regs);
 		  AND_HARD_REG_SET (res->regs, fallthrough_res.regs);
 		  break;
 {
 case NOTE:
 case BARRIER:
 case CODE_LABEL:
 case USE:
-case CONST_INT:
+CASE_CONST_ANY:
-case CONST_DOUBLE:
-case CONST_FIXED:
-case CONST_VECTOR:
 case LABEL_REF:
 case SYMBOL_REF:
 case CONST:
 case PC:
 /* These don't set any resources.  */
 	 that aren't saved across calls, global registers and anything
 	 explicitly CLOBBERed immediately after the CALL_INSN.  */
 if (mark_type == MARK_SRC_DEST_CALL)
 	{
+	  rtx_call_insn *call_insn = as_a <rtx_call_insn *> (x);
 	  rtx link;
+	  HARD_REG_SET regs;
 	  res->cc = res->memory = 1;
-	  IOR_HARD_REG_SET (res->regs, regs_invalidated_by_call);
+	  get_call_reg_set_usage (call_insn, &regs, regs_invalidated_by_call);
+	  IOR_HARD_REG_SET (res->regs, regs);
-	  for (link = CALL_INSN_FUNCTION_USAGE (x);
+	  for (link = CALL_INSN_FUNCTION_USAGE (call_insn);
 	       link; link = XEXP (link, 1))
 	    if (GET_CODE (XEXP (link, 0)) == CLOBBER)
 	      mark_set_resources (SET_DEST (XEXP (link, 0)), res, 1,
 				  MARK_SRC_DEST);
 	  /* Check for a REG_SETJMP.  If it exists, then we must
 	     assume that this call can clobber any register.  */
-	  if (find_reg_note (x, REG_SETJMP, NULL))
+	  if (find_reg_note (call_insn, REG_SETJMP, NULL))
 	    SET_HARD_REG_SET (res->regs);
 	}
 /* ... and also what its RTL says it modifies, if anything.  */
+gcc_fallthrough ();
 case JUMP_INSN:
 case INSN:
 	/* An insn consisting of just a CLOBBER (or USE) is just for flow
 	   and doesn't actually do anything, so we ignore it.  */
-#ifdef INSN_SETS_ARE_DELAYED
 if (mark_type != MARK_SRC_DEST_CALL
-	  && INSN_SETS_ARE_DELAYED (x))
+	  && INSN_SETS_ARE_DELAYED (as_a <rtx_insn *> (x)))
 	return;
-#endif
 x = PATTERN (x);
 if (GET_CODE (x) != USE && GET_CODE (x) != CLOBBER)
 	goto restart;
 return;
 case CLOBBER:
 mark_set_resources (XEXP (x, 0), res, 1, MARK_SRC_DEST);
 return;
 case SEQUENCE:
-for (i = 0; i < XVECLEN (x, 0); i++)
+{
-	if (! (INSN_ANNULLED_BRANCH_P (XVECEXP (x, 0, 0))
+rtx_sequence *seq = as_a <rtx_sequence *> (x);
-	       && INSN_FROM_TARGET_P (XVECEXP (x, 0, i))))
+rtx control = seq->element (0);
-	  mark_set_resources (XVECEXP (x, 0, i), res, 0, mark_type);
+bool annul_p = JUMP_P (control) && INSN_ANNULLED_BRANCH_P (control);
+mark_set_resources (control, res, 0, mark_type);
+for (i = seq->len () - 1; i >= 0; --i)
+	  {
+	    rtx elt = seq->element (i);
+	    if (!annul_p && INSN_FROM_TARGET_P (elt))
+	      mark_set_resources (elt, res, 0, mark_type);
+	  }
+}
 return;
 case POST_INC:
 case PRE_INC:
 case POST_DEC:
 case MEM:
 if (in_dest)
 	{
 	  res->memory = 1;
-	  res->unch_memory |= MEM_READONLY_P (x);
 	  res->volatil |= MEM_VOLATILE_P (x);
 	}
 mark_set_resources (XEXP (x, 0), res, 0, MARK_SRC_DEST);
 return;
 /* Return TRUE if INSN is a return, possibly with a filled delay slot.  */
 static bool
 return_insn_p (const_rtx insn)
 {
-if (JUMP_P (insn) && GET_CODE (PATTERN (insn)) == RETURN)
+if (JUMP_P (insn) && ANY_RETURN_P (PATTERN (insn)))
 return true;
 if (NONJUMP_INSN_P (insn) && GET_CODE (PATTERN (insn)) == SEQUENCE)
 return return_insn_p (XVECEXP (PATTERN (insn), 0, 0));
 Because we can be called many times on the same target, save our results
 in a hash table indexed by INSN_UID.  This is only done if the function
 init_resource_info () was invoked before we are called.  */
 void
-mark_target_live_regs (rtx insns, rtx target, struct resources *res)
+mark_target_live_regs (rtx_insn *insns, rtx target_maybe_return, struct resources *res)
 {
 int b = -1;
 unsigned int i;
 struct target_info *tinfo = NULL;
-rtx insn;
+rtx_insn *insn;
-rtx jump_insn = 0;
 rtx jump_target;
 HARD_REG_SET scratch;
 struct resources set, needed;
 /* Handle end of function.  */
-if (target == 0)
+if (target_maybe_return == 0 || ANY_RETURN_P (target_maybe_return))
 {
 *res = end_of_function_needs;
 return;
 }
+/* We've handled the case of RETURN/SIMPLE_RETURN; we should now have an
+instruction.  */
+rtx_insn *target = as_a <rtx_insn *> (target_maybe_return);
 /* Handle return insn.  */
-else if (return_insn_p (target))
+if (return_insn_p (target))
 {
 *res = end_of_function_needs;
 mark_referenced_resources (target, res, false);
 return;
 }
 /* We have to assume memory is needed, but the CC isn't.  */
 res->memory = 1;
-res->volatil = res->unch_memory = 0;
+res->volatil = 0;
 res->cc = 0;
 /* See if we have computed this value already.  */
 if (target_hash_table != NULL)
 {
 /* Start by getting the basic block number.  If we have saved
 	 information, we can get it from there unless the insn at the
 	 start of the basic block has been deleted.  */
 if (tinfo && tinfo->block != -1
-	  && ! INSN_DELETED_P (BB_HEAD (BASIC_BLOCK (tinfo->block))))
+	  && ! BB_HEAD (BASIC_BLOCK_FOR_FN (cfun, tinfo->block))->deleted ())
 	b = tinfo->block;
 }
 if (b == -1)
 b = find_basic_block (target, MAX_DELAY_SLOT_LIVE_SEARCH);
 them with anything set or killed between its start and the insn before
 TARGET; this custom life analysis is really about registers so we need
 to use the LR problem.  Otherwise, we must assume everything is live.  */
 if (b != -1)
 {
-regset regs_live = DF_LR_IN (BASIC_BLOCK (b));
+regset regs_live = DF_LR_IN (BASIC_BLOCK_FOR_FN (cfun, b));
-rtx start_insn, stop_insn;
+rtx_insn *start_insn, *stop_insn;
 /* Compute hard regs live at start of block.  */
 REG_SET_TO_HARD_REG_SET (current_live_regs, regs_live);
 /* Get starting and ending insn, handling the case where each might
 	 be a SEQUENCE.  */
-start_insn = (b == ENTRY_BLOCK_PTR->next_bb->index ?
+start_insn = (b == ENTRY_BLOCK_PTR_FOR_FN (cfun)->next_bb->index ?
-		    insns : BB_HEAD (BASIC_BLOCK (b)));
+		    insns : BB_HEAD (BASIC_BLOCK_FOR_FN (cfun, b)));
 stop_insn = target;
 if (NONJUMP_INSN_P (start_insn)
 	  && GET_CODE (PATTERN (start_insn)) == SEQUENCE)
-	start_insn = XVECEXP (PATTERN (start_insn), 0, 0);
+	start_insn = as_a <rtx_sequence *> (PATTERN (start_insn))->insn (0);
 if (NONJUMP_INSN_P (stop_insn)
 	  && GET_CODE (PATTERN (stop_insn)) == SEQUENCE)
 	stop_insn = next_insn (PREV_INSN (stop_insn));
 for (insn = start_insn; insn != stop_insn;
 	   insn = next_insn_no_annul (insn))
 	{
 	  rtx link;
-	  rtx real_insn = insn;
+	  rtx_insn *real_insn = insn;
 	  enum rtx_code code = GET_CODE (insn);
 	  if (DEBUG_INSN_P (insn))
 	    continue;
 	      && INSN_FROM_TARGET_P (insn))
 	    continue;
 	  /* If this insn is a USE made by update_block, we care about the
 	     underlying insn.  */
-	  if (code == INSN && GET_CODE (PATTERN (insn)) == USE
+	  if (code == INSN
+	      && GET_CODE (PATTERN (insn)) == USE
 	      && INSN_P (XEXP (PATTERN (insn), 0)))
-	      real_insn = XEXP (PATTERN (insn), 0);
+	    real_insn = as_a <rtx_insn *> (XEXP (PATTERN (insn), 0));
 	  if (CALL_P (real_insn))
 	    {
-	      /* CALL clobbers all call-used regs that aren't fixed except
+	      /* Values in call-clobbered registers survive a COND_EXEC CALL
-		 sp, ap, and fp.  Do this before setting the result of the
+		 if that is not executed; this matters for resoure use because
-		 call live.  */
+		 they may be used by a complementarily (or more strictly)
-	      AND_COMPL_HARD_REG_SET (current_live_regs,
+		 predicated instruction, or if the CALL is NORETURN.  */
-				      regs_invalidated_by_call);
+	      if (GET_CODE (PATTERN (real_insn)) != COND_EXEC)
+		{
+		  HARD_REG_SET regs_invalidated_by_this_call;
+		  get_call_reg_set_usage (real_insn,
+					  &regs_invalidated_by_this_call,
+					  regs_invalidated_by_call);
+		  /* CALL clobbers all call-used regs that aren't fixed except
+		     sp, ap, and fp.  Do this before setting the result of the
+		     call live.  */
+		  AND_COMPL_HARD_REG_SET (current_live_regs,
+					  regs_invalidated_by_this_call);
+		}
 	      /* A CALL_INSN sets any global register live, since it may
 		 have been modified by the call.  */
 	      for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
 		if (global_regs[i])
 SET_HARD_REG_SET (res->regs);
 CLEAR_RESOURCE (&set);
 CLEAR_RESOURCE (&needed);
-jump_insn = find_dead_or_set_registers (target, res, &jump_target, 0,
+rtx_insn *jump_insn = find_dead_or_set_registers (target, res, &jump_target,
-					  set, needed);
+						    0, set, needed);
 /* If we hit an unconditional branch, we have another way of finding out
 what is live: we can see what is live at the branch target and include
 anything used but not set before the branch.  We add the live
 resources found using the test below to those found until now.  */
 if (jump_insn)
 {
 struct resources new_resources;
-rtx stop_insn = next_active_insn (jump_insn);
+rtx_insn *stop_insn = next_active_insn (jump_insn);
-mark_target_live_regs (insns, next_active_insn (jump_target),
+if (!ANY_RETURN_P (jump_target))
-			     &new_resources);
+	jump_target = next_active_insn (as_a<rtx_insn *> (jump_target));
+mark_target_live_regs (insns, jump_target, &new_resources);
 CLEAR_RESOURCE (&set);
 CLEAR_RESOURCE (&needed);
 /* Include JUMP_INSN in the needed registers.  */
 for (insn = target; insn != stop_insn; insn = next_active_insn (insn))
 /* Initialize the resources required by mark_target_live_regs ().
 This should be invoked before the first call to mark_target_live_regs.  */
 void
-init_resource_info (rtx epilogue_insn)
+init_resource_info (rtx_insn *epilogue_insn)
 {
 int i;
 basic_block bb;
 /* Indicate what resources are required to be valid at the end of the current
-function.  The condition code never is and memory always is.  If the
+function.  The condition code never is and memory always is.
-frame pointer is needed, it is and so is the stack pointer unless
+The stack pointer is needed unless EXIT_IGNORE_STACK is true
-EXIT_IGNORE_STACK is nonzero.  If the frame pointer is not needed, the
+and there is an epilogue that restores the original stack pointer
-stack pointer is.  Registers used to return the function value are
+from the frame pointer.  Registers used to return the function value
-needed.  Registers holding global variables are needed.  */
+are needed.  Registers holding global variables are needed.  */
 end_of_function_needs.cc = 0;
 end_of_function_needs.memory = 1;
-end_of_function_needs.unch_memory = 0;
 CLEAR_HARD_REG_SET (end_of_function_needs.regs);
 if (frame_pointer_needed)
 {
 SET_HARD_REG_BIT (end_of_function_needs.regs, FRAME_POINTER_REGNUM);
-#if !HARD_FRAME_POINTER_IS_FRAME_POINTER
+if (!HARD_FRAME_POINTER_IS_FRAME_POINTER)
-SET_HARD_REG_BIT (end_of_function_needs.regs, HARD_FRAME_POINTER_REGNUM);
+	SET_HARD_REG_BIT (end_of_function_needs.regs,
-#endif
+			  HARD_FRAME_POINTER_REGNUM);
-if (! EXIT_IGNORE_STACK
+}
-	  || current_function_sp_is_unchanging)
+if (!(frame_pointer_needed
-	SET_HARD_REG_BIT (end_of_function_needs.regs, STACK_POINTER_REGNUM);
+	&& EXIT_IGNORE_STACK
-}
+	&& epilogue_insn
-else
+	&& !crtl->sp_is_unchanging))
 SET_HARD_REG_BIT (end_of_function_needs.regs, STACK_POINTER_REGNUM);
 if (crtl->return_rtx != 0)
 mark_referenced_resources (crtl->return_rtx,
 			       &end_of_function_needs, true);
 for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
-if (global_regs[i]
+if (global_regs[i] || EPILOGUE_USES (i))
-#ifdef EPILOGUE_USES
-	|| EPILOGUE_USES (i)
-#endif
-	)
 SET_HARD_REG_BIT (end_of_function_needs.regs, i);
 /* The registers required to be live at the end of the function are
 represented in the flow information as being dead just prior to
 reaching the end of the function.  For example, the return of a value
 	break;
 }
 /* Allocate and initialize the tables used by mark_target_live_regs.  */
 target_hash_table = XCNEWVEC (struct target_info *, TARGET_HASH_PRIME);
-bb_ticks = XCNEWVEC (int, last_basic_block);
+bb_ticks = XCNEWVEC (int, last_basic_block_for_fn (cfun));
 /* Set the BLOCK_FOR_INSN of each label that starts a basic block.  */
-FOR_EACH_BB (bb)
+FOR_EACH_BB_FN (bb, cfun)
 if (LABEL_P (BB_HEAD (bb)))
 BLOCK_FOR_INSN (BB_HEAD (bb)) = bb;
 }
 /* Free up the resources allocated to mark_target_live_regs ().  This
 {
 free (bb_ticks);
 bb_ticks = NULL;
 }
-FOR_EACH_BB (bb)
+FOR_EACH_BB_FN (bb, cfun)
 if (LABEL_P (BB_HEAD (bb)))
 BLOCK_FOR_INSN (BB_HEAD (bb)) = NULL;
 }
 /* Clear any hashed information that we have stored for INSN.  */
 void
-clear_hashed_info_for_insn (rtx insn)
+clear_hashed_info_for_insn (rtx_insn *insn)
 {
 struct target_info *tinfo;
 if (target_hash_table != NULL)
 {
 }
 /* Increment the tick count for the basic block that contains INSN.  */
 void
-incr_ticks_for_insn (rtx insn)
+incr_ticks_for_insn (rtx_insn *insn)
 {
 int b = find_basic_block (insn, MAX_DELAY_SLOT_LIVE_SEARCH);
 if (b != -1)
 bb_ticks[b]++;

Mercurial > hg > CbC > CbC_gcc

comparison gcc/resource.c @ 111:04ced10e8804