This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[vta,vta4.4] introduce NONDEBUG_INSN_P


Ian had suggested me to introduce NONDEBUG_INSN_P, to avoid the
verbosity of a number of occurrences of INSN_P && !DEBUG_INSN_P.

This patch implements this change.  I'm installing it in the VTA branch,
as posted below, and in the VTA4.4 branch, with the following changes:

	* gcse.c (alloc_gcse_mem): Likewise.
	* rtl-factoring.c (ABSTRACTABLE_INSN_P): Likewise.
	(prev_insn_in_block, collect_pattern_seqs): Likewise.
	(clear_regs_live_in_seq): Likewise.
	* regrename.c (copyprop_hardreg_forward_1): Likewise.
        
(the last one was moved to regcprop.c in 4.5)

Index: gcc/gcse.c
===================================================================
--- gcc/gcse.c.orig	2009-05-09 02:53:13.000000000 -0300
+++ gcc/gcse.c	2009-06-05 03:34:38.000000000 -0300
@@ -948,7 +948,7 @@ alloc_gcse_mem (void)
   FOR_EACH_BB (bb)
     FOR_BB_INSNS (bb, insn)
       {
-	if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	if (NONDEBUG_INSN_P (insn))
 	  uid_cuid[INSN_UID (insn)] = i++;
 	else
 	  uid_cuid[INSN_UID (insn)] = i;
Index: gcc/regrename.c
===================================================================
--- gcc/regrename.c.orig	2009-03-01 04:20:03.000000000 -0300
+++ gcc/regrename.c	2009-06-05 03:36:02.000000000 -0300
@@ -1616,7 +1616,7 @@ copyprop_hardreg_forward_1 (basic_block 
 	    }
 	}
 
-      if (DEBUG_INSN_P (insn) || ! INSN_P (insn))
+      if (!NONDEBUG_INSN_P (insn))
 	{
 	  if (insn == BB_END (bb))
 	    break;
Index: gcc/rtl-factoring.c
===================================================================
--- gcc/rtl-factoring.c.orig	2009-03-01 04:34:30.000000000 -0300
+++ gcc/rtl-factoring.c	2009-06-05 03:41:48.000000000 -0300
@@ -132,7 +132,7 @@ along with GCC; see the file COPYING3.  
 
 /* Predicate yielding nonzero iff X is an abstractable insn.  Non-jump insns are
    abstractable.  */
-#define ABSTRACTABLE_INSN_P(X) (INSN_P (X) && !DEBUG_INSN_P (X) && !JUMP_P (X))
+#define ABSTRACTABLE_INSN_P(X) (NONDEBUG_INSN_P (X) && !JUMP_P (X))
 
 /* First parameter of the htab_create function call.  */
 #define HASH_INIT 1023
@@ -295,7 +295,7 @@ prev_insn_in_block (rtx insn)
   while (insn != BB_HEAD (bb))
     {
       insn = PREV_INSN (insn);
-      if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+      if (NONDEBUG_INSN_P (insn))
         return insn;
     }
   return NULL_RTX;
@@ -481,7 +481,7 @@ collect_pattern_seqs (void)
     for (insn = BB_END (bb); ; insn = prev)
       {
 	prev = PREV_INSN (insn);
-	if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	if (NONDEBUG_INSN_P (insn))
 	  {
 	    int reg;
 	    for (reg = FIRST_STACK_REG; reg <= LAST_STACK_REG; reg++)
@@ -519,7 +519,7 @@ collect_pattern_seqs (void)
 
     for (insn = BB_HEAD (bb); insn != next_tail; insn = NEXT_INSN (insn))
       {
-	if (INSN_P (insn) && !DEBUG_INSN_P (insn)
+	if (NONDEGUG_INSN_P (insn)
 	    && reg_mentioned_p (cc0_rtx, PATTERN (insn)))
 	  bitmap_set_bit (&dont_collect, INSN_UID (insn));
       }
@@ -597,7 +597,7 @@ clear_regs_live_in_seq (HARD_REG_SET * r
       rtx prev = PREV_INSN (x);
       df_simulate_one_insn_backwards (bb, x, &live);
 
-      if (INSN_P (x) && !DEBUG_INSN_P (x))
+      if (NONDEBUG_INSN_P (x))
         {
           renumbered_reg_set_to_hard_reg_set (&hlive, &live);
           AND_COMPL_HARD_REG_SET (*regs, hlive);


for  gcc/ChangeLog.vta
from  Alexandre Oliva  <aoliva@redhat.com>

	* rtl.h (NONDEBUG_INSN_P): New.
	* caller-save (save_call_clobbered_regs): Use it instead of
	INSN_P && !DEBUG_INSN_P.
	* cfgloopanal.c (num_loop_insns): Likewise.
	(average_num_loop_insns): Likewise.
	* combine.c (create_log_links): Likewise.
	(combine_instructions, distribute_notes): Likewise.
	* gcse.c (compute_ld_motion_mems): Likewise.
	* haifa-sched.c (rank_for_schedule): Likewise.
	* ifcvt.c (dead_or_predicable): Likewise.
	* ira-build.c (create_bb_allocnos): Likewise.
	* ira-conflicts.c (add_copies): Likewise.
	* modulo-sched.c (const_iteration_count): Likewise.
	(sms_schedule): Likewise.
	* recog.c (peephole2_optimize): Likewise.
	* reload1.c (reload): Likewise.
	* rtlanal.c (reg_used_between_p): Likewise.
	* sched-deps.c (sched_analyze_insn): Likewise.
	* sel-sched-ir.c (sel_estimate_number_of_insns): Likewise.
	* config/rs6000/rs6000.c (is_microcoded_insn): Likewise.
	(is_cracked_insn, is_branch_slot_insn): Likewise.
	(is_nonpipeline_insn): Likewise.
	(get_next_active_insn): Drop redundant DEBUG_INSN_P.
	* emit-rtl.c (active_insn_p): Likewise.
	* auto-inc-dec.c (merge_in_block): Use NONDEBUG_INSN_P.
	* cfgcleanup.c (flow_find_cross_jump): Likewise.
	* df-problems.c (df_lr_bb_local_compute): Likewise.
	(df_simulate_one_insn_backwards): Likewise.
	* init-regs.c (initialize_uninitialized_regs): Likewise.
	* ira-costs.c (scan_one_insn): Likewise.
	(process_bb_node_for_hard_reg_moves): Likewise.
	* ira.c (memref_used_between_p): Likewise.
	* loop-invariant.c (find_invariants_bb): Likewise.
	* regstat.c (regstat_bb_compute_ri): Likewise.
	* ira-lives.c (process_bb_node_lives): Likewise.
	* regcprop.c (copyprop_hardreg_forward_1): Likewise.

Index: gcc/caller-save.c
===================================================================
--- gcc/caller-save.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/caller-save.c	2009-06-05 02:37:20.000000000 -0300
@@ -774,7 +774,7 @@ save_call_clobbered_regs (void)
 
       gcc_assert (!chain->is_caller_save_insn);
 
-      if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+      if (NONDEBUG_INSN_P (insn))
 	{
 	  /* If some registers have been saved, see if INSN references
 	     any of them.  We must restore them before the insn if so.  */
Index: gcc/cfgloopanal.c
===================================================================
--- gcc/cfgloopanal.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/cfgloopanal.c	2009-06-05 02:37:20.000000000 -0300
@@ -175,7 +175,7 @@ num_loop_insns (const struct loop *loop)
       bb = bbs[i];
       ninsns++;
       FOR_BB_INSNS (bb, insn)
-	if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	if (NONDEBUG_INSN_P (insn))
 	  ninsns++;
     }
   free(bbs);
@@ -199,7 +199,7 @@ average_num_loop_insns (const struct loo
 
       binsns = 0;
       FOR_BB_INSNS (bb, insn)
-	if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	if (NONDEBUG_INSN_P (insn))
 	  binsns++;
 
       ratio = loop->header->frequency == 0
Index: gcc/combine.c
===================================================================
--- gcc/combine.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/combine.c	2009-06-05 02:48:37.000000000 -0300
@@ -921,7 +921,7 @@ create_log_links (void)
     {
       FOR_BB_INSNS_REVERSE (bb, insn)
         {
-          if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+          if (!NONDEBUG_INSN_P (insn))
             continue;
 
 	  /* Log links are created only once.  */
@@ -1129,7 +1129,7 @@ combine_instructions (rtx f, unsigned in
 	   insn = next ? next : NEXT_INSN (insn))
 	{
 	  next = 0;
-	  if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	  if (NONDEBUG_INSN_P (insn))
 	    {
 	      /* See if we know about function return values before this
 		 insn based upon SUBREG flags.  */
@@ -12825,7 +12825,7 @@ distribute_notes (rtx notes, rtx from_in
 
 	      for (tem = PREV_INSN (tem); place == 0; tem = PREV_INSN (tem))
 		{
-		  if (! INSN_P (tem) || DEBUG_INSN_P (tem))
+		  if (!NONDEBUG_INSN_P (tem))
 		    {
 		      if (tem == BB_HEAD (bb))
 			break;
@@ -13026,7 +13026,7 @@ distribute_notes (rtx notes, rtx from_in
 			    for (tem = PREV_INSN (place); ;
 				 tem = PREV_INSN (tem))
 			      {
-				if (! INSN_P (tem) || DEBUG_INSN_P (tem))
+				if (!NONDEBUG_INSN_P (tem))
 				  {
 				    if (tem == BB_HEAD (bb))
 			 	      break;
Index: gcc/gcse.c
===================================================================
--- gcc/gcse.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/gcse.c	2009-06-05 02:37:20.000000000 -0300
@@ -4742,7 +4742,7 @@ compute_ld_motion_mems (void)
     {
       FOR_BB_INSNS (bb, insn)
 	{
-	  if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	  if (NONDEBUG_INSN_P (insn))
 	    {
 	      if (GET_CODE (PATTERN (insn)) == SET)
 		{
Index: gcc/haifa-sched.c
===================================================================
--- gcc/haifa-sched.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/haifa-sched.c	2009-06-05 02:53:29.000000000 -0300
@@ -980,12 +980,12 @@ rank_for_schedule (const void *x, const 
   if (DEBUG_INSN_P (last) && last != current_sched_info->prev_head)
     do
       last = PREV_INSN (last);
-    while ((DEBUG_INSN_P (last) || !INSN_P (last))
+    while (!NONDEBUG_INSN_P (last)
 	   && last != current_sched_info->prev_head);
 
   /* Compare insns based on their relation to the last scheduled
      non-debug insn.  */
-  if (INSN_P (last) && !DEBUG_INSN_P (last))
+  if (NONDEBUG_INSN_P (last))
     {
       dep_t dep1;
       dep_t dep2;
Index: gcc/ifcvt.c
===================================================================
--- gcc/ifcvt.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/ifcvt.c	2009-06-05 02:42:14.000000000 -0300
@@ -2488,7 +2488,7 @@ check_cond_move_block (basic_block bb, r
     {
       rtx set, dest, src;
 
-      if (!INSN_P (insn) || DEBUG_INSN_P (insn) || JUMP_P (insn))
+      if (!NONDEBUG_INSN_P (insn) || JUMP_P (insn))
 	continue;
       set = single_set (insn);
       if (!set)
@@ -2567,7 +2567,7 @@ cond_move_convert_if_block (struct noce_
       unsigned int regno;
 
       /* ??? Maybe emit conditional debug insn?  */
-      if (!INSN_P (insn) || DEBUG_INSN_P (insn) || JUMP_P (insn))
+      if (!NONDEBUG_INSN_P (insn) || JUMP_P (insn))
 	continue;
       set = single_set (insn);
       gcc_assert (set && REG_P (SET_DEST (set)));
@@ -3888,7 +3888,7 @@ dead_or_predicable (basic_block test_bb,
 	{
 	  if (CALL_P (insn))
 	    return FALSE;
-	  if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	  if (NONDEBUG_INSN_P (insn))
 	    {
 	      if (may_trap_p (PATTERN (insn)))
 		return FALSE;
@@ -3934,7 +3934,7 @@ dead_or_predicable (basic_block test_bb,
 
       FOR_BB_INSNS (merge_bb, insn)
 	{
-	  if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	  if (NONDEBUG_INSN_P (insn))
 	    {
 	      unsigned int uid = INSN_UID (insn);
 	      df_ref *def_rec;
Index: gcc/ira-build.c
===================================================================
--- gcc/ira-build.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/ira-build.c	2009-06-05 02:37:20.000000000 -0300
@@ -1491,7 +1491,7 @@ create_bb_allocnos (ira_loop_tree_node_t
   curr_bb = bb = bb_node->bb;
   ira_assert (bb != NULL);
   FOR_BB_INSNS_REVERSE (bb, insn)
-    if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+    if (NONDEBUG_INSN_P (insn))
       create_insn_allocnos (PATTERN (insn), false);
   /* It might be a allocno living through from one subloop to
      another.  */
Index: gcc/ira-conflicts.c
===================================================================
--- gcc/ira-conflicts.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/ira-conflicts.c	2009-06-05 02:37:20.000000000 -0300
@@ -524,7 +524,7 @@ add_copies (ira_loop_tree_node_t loop_tr
   if (bb == NULL)
     return;
   FOR_BB_INSNS (bb, insn)
-    if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+    if (NONDEBUG_INSN_P (insn))
       add_insn_allocno_copies (insn);
 }
 
Index: gcc/modulo-sched.c
===================================================================
--- gcc/modulo-sched.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/modulo-sched.c	2009-06-05 02:42:14.000000000 -0300
@@ -348,7 +348,7 @@ const_iteration_count (rtx count_reg, ba
   get_ebb_head_tail (pre_header, pre_header, &head, &tail);
 
   for (insn = tail; insn != PREV_INSN (head); insn = PREV_INSN (insn))
-    if (INSN_P (insn) && !DEBUG_INSN_P (insn) && single_set (insn) &&
+    if (NONDEBUG_INSN_P (insn) && single_set (insn) &&
 	rtx_equal_p (count_reg, SET_DEST (single_set (insn))))
       {
 	rtx pat = single_set (insn);
@@ -1019,7 +1019,7 @@ sms_schedule (void)
 
         if (CALL_P (insn)
             || BARRIER_P (insn)
-            || (INSN_P (insn) && !DEBUG_INSN_P (insn) && !JUMP_P (insn)
+            || (NONDEBUG_INSN_P (insn) && !JUMP_P (insn)
                 && !single_set (insn) && GET_CODE (PATTERN (insn)) != USE)
             || (FIND_REG_INC_NOTE (insn, NULL_RTX) != 0)
             || (INSN_P (insn) && (set = single_set (insn))
@@ -1037,7 +1037,7 @@ sms_schedule (void)
 		fprintf (dump_file, "SMS loop-with-barrier\n");
               else if (FIND_REG_INC_NOTE (insn, NULL_RTX) != 0)
                 fprintf (dump_file, "SMS reg inc\n");
-              else if ((INSN_P (insn) && !DEBUG_INSN_P (insn) && !JUMP_P (insn)
+              else if ((NONDEBUG_INSN_P (insn) && !JUMP_P (insn)
                 && !single_set (insn) && GET_CODE (PATTERN (insn)) != USE))
                 fprintf (dump_file, "SMS loop-with-not-single-set\n");
               else
@@ -1751,7 +1751,7 @@ sms_schedule_by_order (ddg_ptr g, int mi
   	  ddg_node_ptr u_node = &ps->g->nodes[u];
 	  rtx insn = u_node->insn;
 
-	  if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+	  if (!NONDEBUG_INSN_P (insn))
 	    {
 	      RESET_BIT (tobe_scheduled, u);
 	      continue;
@@ -2740,7 +2740,7 @@ ps_has_conflicts (partial_schedule_ptr p
 	{
 	  rtx insn = crr_insn->node->insn;
 
-	  if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+	  if (!NONDEBUG_INSN_P (insn))
 	    continue;
 
 	  /* Check if there is room for the current insn.  */
Index: gcc/recog.c
===================================================================
--- gcc/recog.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/recog.c	2009-06-05 02:37:20.000000000 -0300
@@ -3096,7 +3096,7 @@ peephole2_optimize (void)
       for (insn = BB_END (bb); ; insn = prev)
 	{
 	  prev = PREV_INSN (insn);
-	  if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+	  if (NONDEBUG_INSN_P (insn))
 	    {
 	      rtx attempt, before_try, x;
 	      int match_len;
Index: gcc/reload1.c
===================================================================
--- gcc/reload1.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/reload1.c	2009-06-05 02:37:20.000000000 -0300
@@ -800,7 +800,7 @@ reload (rtx first, int global)
 	  && GET_MODE (insn) != VOIDmode)
 	PUT_MODE (insn, VOIDmode);
 
-      if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+      if (NONDEBUG_INSN_P (insn))
 	scan_paradoxical_subregs (PATTERN (insn));
 
       if (set != 0 && REG_P (SET_DEST (set)))
Index: gcc/rtl.h
===================================================================
--- gcc/rtl.h.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/rtl.h	2009-06-05 02:37:20.000000000 -0300
@@ -388,6 +388,9 @@ struct GTY(()) rtvec_def {
 /* Predicate yielding nonzero iff X is a debug note/insn.  */
 #define DEBUG_INSN_P(X) (GET_CODE (X) == DEBUG_INSN)
 
+/* Predicate yielding nonzero iff X is an insn that is not a debug insn.  */
+#define NONDEBUG_INSN_P(X) (INSN_P (X) && !DEBUG_INSN_P (X))
+
 /* Nonzero if DEBUG_INSN_P may possibly hold.  */
 #define MAY_HAVE_DEBUG_INSNS (flag_var_tracking_assignments)
 
Index: gcc/rtlanal.c
===================================================================
--- gcc/rtlanal.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/rtlanal.c	2009-06-05 02:37:20.000000000 -0300
@@ -741,7 +741,7 @@ reg_used_between_p (const_rtx reg, const
     return 0;
 
   for (insn = NEXT_INSN (from_insn); insn != to_insn; insn = NEXT_INSN (insn))
-    if (INSN_P (insn) && !DEBUG_INSN_P (insn)
+    if (NONDEBUG_INSN_P (insn)
 	&& (reg_overlap_mentioned_p (reg, PATTERN (insn))
 	   || (CALL_P (insn) && find_reg_fusage (insn, USE, reg))))
       return 1;
Index: gcc/sched-deps.c
===================================================================
--- gcc/sched-deps.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/sched-deps.c	2009-06-05 02:37:20.000000000 -0300
@@ -2418,7 +2418,7 @@ sched_analyze_insn (struct deps *deps, r
 	 additional analysis can modify the generated code.  */
       prev = PREV_INSN (insn);
 
-      if (prev && INSN_P (prev) && !DEBUG_INSN_P (prev))
+      if (prev && NONDEBUG_INSN_P (prev))
 	add_dependence (insn, prev, REG_DEP_ANTI);
     }
   /* If the current insn is conditional, we can't free any
Index: gcc/sel-sched-ir.c
===================================================================
--- gcc/sel-sched-ir.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/sel-sched-ir.c	2009-06-05 02:37:20.000000000 -0300
@@ -3695,7 +3695,7 @@ sel_estimate_number_of_insns (basic_bloc
   insn_t insn = NEXT_INSN (BB_HEAD (bb)), next_tail = NEXT_INSN (BB_END (bb));
 
   for (; insn != next_tail; insn = NEXT_INSN (insn))
-    if (INSN_P (insn) && !DEBUG_INSN_P (insn))
+    if (NONDEBUG_INSN_P (insn))
       res++;
 
   return res;
Index: gcc/config/rs6000/rs6000.c
===================================================================
--- gcc/config/rs6000/rs6000.c.orig	2009-06-05 02:37:06.000000000 -0300
+++ gcc/config/rs6000/rs6000.c	2009-06-05 02:40:21.000000000 -0300
@@ -19081,7 +19081,7 @@ rs6000_adjust_cost (rtx insn, rtx link, 
 static bool
 is_microcoded_insn (rtx insn)
 {
-  if (!insn || !INSN_P (insn) || DEBUG_INSN_P (insn)
+  if (!insn || !NONDEBUG_INSN_P (insn)
       || GET_CODE (PATTERN (insn)) == USE
       || GET_CODE (PATTERN (insn)) == CLOBBER)
     return false;
@@ -19109,7 +19109,7 @@ is_microcoded_insn (rtx insn)
 static bool
 is_cracked_insn (rtx insn)
 {
-  if (!insn || !INSN_P (insn) || DEBUG_INSN_P (insn)
+  if (!insn || !NONDEBUG_INSN_P (insn)
       || GET_CODE (PATTERN (insn)) == USE
       || GET_CODE (PATTERN (insn)) == CLOBBER)
     return false;
@@ -19137,7 +19137,7 @@ is_cracked_insn (rtx insn)
 static bool
 is_branch_slot_insn (rtx insn)
 {
-  if (!insn || !INSN_P (insn) || DEBUG_INSN_P (insn)
+  if (!insn || !NONDEBUG_INSN_P (insn)
       || GET_CODE (PATTERN (insn)) == USE
       || GET_CODE (PATTERN (insn)) == CLOBBER)
     return false;
@@ -19296,7 +19296,7 @@ static bool
 is_nonpipeline_insn (rtx insn)
 {
   enum attr_type type;
-  if (!insn || !INSN_P (insn) || DEBUG_INSN_P (insn)
+  if (!insn || !NONDEBUG_INSN_P (insn)
       || GET_CODE (PATTERN (insn)) == USE
       || GET_CODE (PATTERN (insn)) == CLOBBER)
     return false;
@@ -19587,7 +19587,7 @@ get_next_active_insn (rtx insn, rtx tail
 
       if (CALL_P (insn)
 	  || JUMP_P (insn)
-	  || (NONJUMP_INSN_P (insn) && !DEBUG_INSN_P (insn)
+	  || (NONJUMP_INSN_P (insn)
 	      && GET_CODE (PATTERN (insn)) != USE
 	      && GET_CODE (PATTERN (insn)) != CLOBBER
 	      && INSN_CODE (insn) != CODE_FOR_stack_tie))
Index: gcc/auto-inc-dec.c
===================================================================
--- gcc/auto-inc-dec.c.orig	2009-05-12 03:28:20.000000000 -0300
+++ gcc/auto-inc-dec.c	2009-06-05 02:42:13.000000000 -0300
@@ -1379,7 +1379,7 @@ merge_in_block (int max_reg, basic_block
       unsigned int uid = INSN_UID (insn);
       bool insn_is_add_or_inc = true;
 
-      if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+      if (!NONDEBUG_INSN_P (insn))
 	continue;	
 
       /* This continue is deliberate.  We do not want the uses of the
Index: gcc/cfgcleanup.c
===================================================================
--- gcc/cfgcleanup.c.orig	2009-05-12 03:47:10.000000000 -0300
+++ gcc/cfgcleanup.c	2009-06-05 02:47:11.000000000 -0300
@@ -1086,10 +1086,10 @@ flow_find_cross_jump (int mode ATTRIBUTE
   while (true)
     {
       /* Ignore notes.  */
-      while ((!INSN_P (i1) || DEBUG_INSN_P (i1)) && i1 != BB_HEAD (bb1))
+      while (!NONDEBUG_INSN_P (i1) && i1 != BB_HEAD (bb1))
 	i1 = PREV_INSN (i1);
 
-      while ((!INSN_P (i2) || DEBUG_INSN_P (i2)) && i2 != BB_HEAD (bb2))
+      while (!NONDEBUG_INSN_P (i2) && i2 != BB_HEAD (bb2))
 	i2 = PREV_INSN (i2);
 
       if (i1 == BB_HEAD (bb1) || i2 == BB_HEAD (bb2))
@@ -1140,15 +1140,13 @@ flow_find_cross_jump (int mode ATTRIBUTE
      Two, it keeps line number notes as matched as may be.  */
   if (ninsns)
     {
-      while (last1 != BB_HEAD (bb1) && (!INSN_P (PREV_INSN (last1))
-					|| DEBUG_INSN_P (PREV_INSN (last1))))
+      while (last1 != BB_HEAD (bb1) && !NONDEBUG_INSN_P (PREV_INSN (last1)))
 	last1 = PREV_INSN (last1);
 
       if (last1 != BB_HEAD (bb1) && LABEL_P (PREV_INSN (last1)))
 	last1 = PREV_INSN (last1);
 
-      while (last2 != BB_HEAD (bb2) && (!INSN_P (PREV_INSN (last2))
-					|| DEBUG_INSN_P (PREV_INSN (last2))))
+      while (last2 != BB_HEAD (bb2) && !NONDEBUG_INSN_P (PREV_INSN (last2)))
 	last2 = PREV_INSN (last2);
 
       if (last2 != BB_HEAD (bb2) && LABEL_P (PREV_INSN (last2)))
Index: gcc/df-problems.c
===================================================================
--- gcc/df-problems.c.orig	2009-05-12 03:47:56.000000000 -0300
+++ gcc/df-problems.c	2009-06-05 02:48:38.000000000 -0300
@@ -877,7 +877,7 @@ df_lr_bb_local_compute (unsigned int bb_
     {
       unsigned int uid = INSN_UID (insn);
 
-      if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+      if (!NONDEBUG_INSN_P (insn))
 	continue;	
 
       for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
@@ -3869,7 +3869,7 @@ df_simulate_initialize_backwards (basic_
 void 
 df_simulate_one_insn_backwards (basic_block bb, rtx insn, bitmap live)
 {
-  if (! INSN_P (insn) || DEBUG_INSN_P (insn))
+  if (!NONDEBUG_INSN_P (insn))
     return;	
   
   df_simulate_defs (insn, live);
Index: gcc/init-regs.c
===================================================================
--- gcc/init-regs.c.orig	2009-05-12 03:46:25.000000000 -0300
+++ gcc/init-regs.c	2009-06-05 02:42:14.000000000 -0300
@@ -70,7 +70,7 @@ initialize_uninitialized_regs (void)
 	{
 	  unsigned int uid = INSN_UID (insn);
 	  df_ref *use_rec;
-	  if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+	  if (!NONDEBUG_INSN_P (insn))
 	    continue;
 
 	  for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++)
Index: gcc/ira-costs.c
===================================================================
--- gcc/ira-costs.c.orig	2009-05-12 03:47:40.000000000 -0300
+++ gcc/ira-costs.c	2009-06-05 02:48:38.000000000 -0300
@@ -995,7 +995,7 @@ scan_one_insn (rtx insn)
   rtx set, note;
   int i, k;
 
-  if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+  if (!NONDEBUG_INSN_P (insn))
     return insn;
 
   pat_code = GET_CODE (PATTERN (insn));
@@ -1384,7 +1384,7 @@ process_bb_node_for_hard_reg_moves (ira_
     freq = 1;
   FOR_BB_INSNS (bb, insn)
     {
-      if (! INSN_P (insn) || DEBUG_INSN_P (insn))
+      if (!NONDEBUG_INSN_P (insn))
 	continue;
       set = single_set (insn);
       if (set == NULL_RTX)
Index: gcc/ira.c
===================================================================
--- gcc/ira.c.orig	2009-05-12 03:47:37.000000000 -0300
+++ gcc/ira.c	2009-06-05 02:42:14.000000000 -0300
@@ -2201,7 +2201,7 @@ memref_used_between_p (rtx memref, rtx s
   for (insn = NEXT_INSN (start); insn != NEXT_INSN (end);
        insn = NEXT_INSN (insn))
     {
-      if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+      if (!NONDEBUG_INSN_P (insn))
 	continue;
       
       if (memref_referenced_p (memref, PATTERN (insn)))
Index: gcc/loop-invariant.c
===================================================================
--- gcc/loop-invariant.c.orig	2009-05-12 03:47:15.000000000 -0300
+++ gcc/loop-invariant.c	2009-06-05 02:42:14.000000000 -0300
@@ -912,7 +912,7 @@ find_invariants_bb (basic_block bb, bool
 
   FOR_BB_INSNS (bb, insn)
     {
-      if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+      if (!NONDEBUG_INSN_P (insn))
 	continue;
 
       find_invariants_insn (insn, always_reached, always_executed);
Index: gcc/regstat.c
===================================================================
--- gcc/regstat.c.orig	2008-12-10 05:32:38.000000000 -0200
+++ gcc/regstat.c	2009-06-05 02:42:14.000000000 -0300
@@ -166,7 +166,7 @@ regstat_bb_compute_ri (unsigned int bb_i
       struct df_mw_hardreg **mws_rec;
       rtx link;
  
-      if (!INSN_P (insn) || DEBUG_INSN_P (insn))
+      if (!NONDEBUG_INSN_P (insn))
 	continue;
 
       /* Increment the live_length for all of the registers that
Index: gcc/ira-lives.c
===================================================================
--- gcc/ira-lives.c.orig	2009-05-12 03:46:12.000000000 -0300
+++ gcc/ira-lives.c	2009-06-05 02:48:38.000000000 -0300
@@ -894,7 +894,7 @@ process_bb_node_lives (ira_loop_tree_nod
 	  df_ref *def_rec, *use_rec;
 	  bool call_p;
 	  
-	  if (! INSN_P (insn) || DEBUG_INSN_P (insn))
+	  if (!NONDEBUG_INSN_P (insn))
 	    continue;
 	  
 	  if (internal_flag_ira_verbose > 2 && ira_dump_file != NULL)
Index: gcc/emit-rtl.c
===================================================================
--- gcc/emit-rtl.c.orig	2009-05-18 21:54:16.000000000 -0300
+++ gcc/emit-rtl.c	2009-06-05 02:51:35.000000000 -0300
@@ -3198,7 +3198,6 @@ active_insn_p (const_rtx insn)
 {
   return (CALL_P (insn) || JUMP_P (insn)
 	  || (NONJUMP_INSN_P (insn)
-	      && !DEBUG_INSN_P (insn)
 	      && (! reload_completed
 		  || (GET_CODE (PATTERN (insn)) != USE
 		      && GET_CODE (PATTERN (insn)) != CLOBBER))));
Index: gcc/regcprop.c
===================================================================
--- gcc/regcprop.c.orig	2009-05-12 16:02:36.000000000 -0300
+++ gcc/regcprop.c	2009-06-05 02:56:37.000000000 -0300
@@ -654,7 +654,7 @@ copyprop_hardreg_forward_1 (basic_block 
 	    }
 	}
 
-      if (DEBUG_INSN_P (insn) || ! INSN_P (insn))
+      if (!NONDEBUG_INSN_P (insn))
 	{
 	  if (insn == BB_END (bb))
 	    break;
-- 
Alexandre Oliva, freedom fighter    http://FSFLA.org/~lxoliva/
You must be the change you wish to see in the world. -- Gandhi
Be Free! -- http://FSFLA.org/   FSF Latin America board member
Free Software Evangelist      Red Hat Brazil Compiler Engineer

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]