2002-01-02 Eric Christopher <echristo@redhat.com>

	* final.c (final_scan_insn): Change 0 -> NULL_RTX in
	FIND_REG_INC_NOTE call. Update copyright.
	* loop.c (canonicalize_condition): Ditto.
	* reorg.c (delete_scheduled_jump): Ditto.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48506 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 24 insertions, 17 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ebaa260fe6..ce9576fa467 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-02  Eric Christopher  <echristo@redhat.com>
+
+	* final.c (final_scan_insn): Change 0 -> NULL_RTX in
+	FIND_REG_INC_NOTE call. Update copyright.
+	* loop.c (canonicalize_condition): Ditto.
+	* reorg.c (delete_scheduled_jump): Ditto.
+
 2002-01-03  Kazu Hirata  <kazu@hxi.com>
 
 	* gcse.c: Fix formatting.
@@ -152,7 +159,7 @@
         (LOOP_MOVABLES): Fix typo.
         (LOOP_REGS): Likewise.
         (LOOP_IVS): Likewise.
-	
+
 2002-01-03  Graham Stott  <grahams@redhat.com>
 
 	* cppinit.c: Update copyright date.
@@ -344,7 +351,7 @@ Tue Jan  1 17:12:56 2002  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 2001-12-31  Richard Henderson  <rth@redhat.com>
 
 	* regrename.c (build_def_use): Don't rename asm operands that
-	were originally hard registers. 
+	were originally hard registers.
 	(copyprop_hardreg_forward_1): Likewise.
 	(find_oldest_value_reg): Copy ORIGINAL_REGNO from source.
 	* varasm.c (make_decl_rtl): Use gen_rtx_raw_REG.  Set ORIGINAL_REGNO.
@@ -462,7 +469,7 @@ Tue Jan  1 17:12:56 2002  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
         * config/i386/i386.c (ix86_asm_dialect): Fix enum type.
 
-        (override_options): Delete abs macro unused. 
+        (override_options): Delete abs macro unused.
 
         (output_pic_addr_const): Use ASM_ATT/ASM_INTEL enumerations
         when testing ASSEMBLER_DIALECT.
@@ -906,16 +913,16 @@ Fri Dec 21 17:30:15 2001  Jeffrey A Law  (law@redhat.com)
 	* builtin-attrs.def (__builtin_printf_unlocked,
 	__builtin_fprintf_unlocked, printf_unlocked, fprintf_unlocked):
 	Mark with the __printf__ attribute.
-	
+
 	* builtins.c (expand_builtin_fputs): Add an `unlocked' parameter
 	and set the replacement function depending on it.
 	(expand_builtin): Skip BUILT_IN_*_UNLOCKED when not optimizing.
 	Handle BUILT_IN_*_UNLOCKED when optimizing.
-	
+
 	* builtins.def (DEF_EXT_FALLBACK_BUILTIN,
 	DEF_EXT_FRONT_END_LIB_BUILTIN): New macros.
 	Declare the "unlocked" stdio functions.
-	
+
 	* c-common.c (c_expand_builtin_printf, c_expand_builtin_fprintf):
 	Add an `unlocked' parameter and set the replacement function
 	depending on it.
diff --git a/gcc/final.c b/gcc/final.c
index ffad9aef32c..60ed60960a7 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -1,6 +1,6 @@
 /* Convert RTL to assembler code and output it, for GNU compiler.
    Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -960,7 +960,7 @@ shorten_branches (first)
       else if (GET_CODE (insn) == CODE_LABEL)
 	{
 	  rtx next;
-	  
+
 	  /* Merge in alignments computed by compute_alignments.  */
 	  log = LABEL_TO_ALIGNMENT (insn);
 	  if (max_log < log)
@@ -2372,7 +2372,7 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes)
 			&& rtx_equal_p (SET_SRC (set), cc_status.value2)))
 		  {
 		    /* Don't delete insn if it has an addressing side-effect.  */
-		    if (! FIND_REG_INC_NOTE (insn, 0)
+		    if (! FIND_REG_INC_NOTE (insn, NULL_RTX)
 			/* or if anything in it is volatile.  */
 			&& ! volatile_refs_p (PATTERN (insn)))
 		      {
@@ -3041,7 +3041,7 @@ get_mem_expr_from_op (op, paddressp)
   expr = get_mem_expr_from_op (op, &inner_addressp);
   return inner_addressp ? 0 : expr;
 }
-  
+
 /* Output operand names for assembler instructions.  OPERANDS is the
    operand vector, OPORDER is the order to write the operands, and NOPS
    is the number of operands to write.  */
@@ -3175,7 +3175,7 @@ output_asm_insn (template, operands)
 		    output_operand_lossage ("unterminated assembly dialect alternative");
 		    break;
 		  }
-	      }	  
+	      }
 	    while (*p++ != '}');
 	    dialect = 0;
 	  }
diff --git a/gcc/loop.c b/gcc/loop.c
index 6ebd7d5574f..4200470e02d 100644
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -3830,7 +3830,7 @@ emit_prefetch_instructions (loop)
 	      || GET_CODE (iv->mult_val) != CONST_INT
 	      /* Don't handle reversed order prefetches, since they are usually
 		 ineffective.  Later we may be able to reverse such BIVs.  */
-	      || (PREFETCH_NO_REVERSE_ORDER 
+	      || (PREFETCH_NO_REVERSE_ORDER
 		  && (stride = INTVAL (iv->mult_val) * basestride) < 0)
 	      /* Prefetching of accesses with such an extreme stride is probably
 		 not worthwhile, either.  */
@@ -9087,7 +9087,7 @@ canonicalize_condition (insn, cond, reverse, earliest, want_reg)
 
       if ((prev = prev_nonnote_insn (prev)) == 0
 	  || GET_CODE (prev) != INSN
-	  || FIND_REG_INC_NOTE (prev, 0))
+	  || FIND_REG_INC_NOTE (prev, NULL_RTX))
 	break;
 
       set = set_of (op0, prev);
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 5132aef73c7..409ed7d66ea 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -1,6 +1,6 @@
 /* Perform instruction reorganizations for delay slot filling.
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu).
    Hacked by Michael Tiemann (tiemann@cygnus.com).
 
@@ -648,7 +648,7 @@ delete_scheduled_jump (insn)
 	  if (GET_CODE (trial) == NOTE)
 	    trial = prev_nonnote_insn (trial);
 	  if (sets_cc0_p (PATTERN (trial)) != 1
-	      || FIND_REG_INC_NOTE (trial, 0))
+	      || FIND_REG_INC_NOTE (trial, NULL_RTX))
 	    return;
 	  if (PREV_INSN (NEXT_INSN (trial)) == trial)
 	    delete_related_insns (trial);
@@ -2239,11 +2239,11 @@ fill_simple_delay_slots (non_jumps_p)
 
                int i = 2;
 
-	       try { 
+	       try {
                  f();
 	         i = 3;
                } catch (...) {}
-	       
+
                return i;
 
 	     Even though `i' is a local variable, we must be sure not