use rtx_insn * a little more

gcc/ChangeLog:

2014-09-04  Trevor Saunders  <tsaunders@mozilla.com>

	* config/bfin/bfin.c, config/c6x/c6x.c, config/m32c/m32c.c,
	config/mn10300/mn10300.c, config/s390/s390.c, config/sh/sh.c,
	ifcvt.c, reorg.c: Change types of variables from rtx to rtx_insn *.

From-SVN: r214923

9 files changed, 24 insertions, 15 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 62d0562..f8178f4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2014-09-04  Trevor Saunders  <tsaunders@mozilla.com>
 
+	* config/bfin/bfin.c, config/c6x/c6x.c, config/m32c/m32c.c,
+	config/mn10300/mn10300.c, config/s390/s390.c, config/sh/sh.c,
+	ifcvt.c, reorg.c: Change types of variables from rtx to rtx_insn *.
+
+2014-09-04  Trevor Saunders  <tsaunders@mozilla.com>
+
 	* emit-rtl.c (get_first_nonnote_insn): Return rtx_insn * instead of
 	rtx.
 	(get_last_nonnote_insn): Likewise.
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 6547f83..f92b6d1 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -3443,7 +3443,8 @@ hwloop_optimize (hwloop_info loop)
   rtx loop_init, start_label, end_label;
   rtx iter_reg, scratchreg, scratch_init, scratch_init_insn;
   rtx lc_reg, lt_reg, lb_reg;
-  rtx seq, seq_end;
+  rtx seq_end;
+  rtx_insn *seq;
   int length;
   bool clobber0, clobber1;
 
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index 91d5155..79759df 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -4726,10 +4726,10 @@ c6x_gen_bundles (void)
 
 /* Emit a NOP instruction for CYCLES cycles after insn AFTER.  Return it.  */
 
-static rtx
+static rtx_insn *
 emit_nop_after (int cycles, rtx after)
 {
-  rtx insn;
+  rtx_insn *insn;
 
   /* mpydp has 9 delay slots, and we may schedule a stall for a cross-path
      operation.  We don't need the extra NOP since in this case, the hardware
@@ -5030,10 +5030,11 @@ static void
 reorg_emit_nops (rtx *call_labels)
 {
   bool first;
-  rtx prev, last_call;
+  rtx last_call;
+  rtx_insn *prev;
   int prev_clock, earliest_bb_end;
   int prev_implicit_nops;
-  rtx insn = get_insns ();
+  rtx_insn *insn = get_insns ();
 
   /* We look at one insn (or bundle inside a sequence) in each iteration, storing
      its issue time in PREV_CLOCK for the next iteration.  If there is a gap in
@@ -5045,7 +5046,7 @@ reorg_emit_nops (rtx *call_labels)
      a multi-cycle nop.  The code is scheduled such that subsequent insns will
      show the cycle gap, but we needn't insert a real NOP instruction.  */
   insn = next_real_insn (insn);
-  last_call = prev = NULL_RTX;
+  last_call = prev = NULL;
   prev_clock = -1;
   earliest_bb_end = 0;
   prev_implicit_nops = 0;
@@ -5053,7 +5054,7 @@ reorg_emit_nops (rtx *call_labels)
   while (insn)
     {
       int this_clock = -1;
-      rtx next;
+      rtx_insn *next;
       int max_cycles = 0;
 
       next = next_real_insn (insn);
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index 73d459f..b02c6ea 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -3819,7 +3819,8 @@ m32c_prepare_shift (rtx * operands, int scale, int shift_code)
 	 undefined to skip one of the comparisons.  */
 
       rtx count;
-      rtx label, insn, tempvar;
+      rtx label, tempvar;
+      rtx_insn *insn;
 
       emit_move_insn (operands[0], operands[1]);
 
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 9a4fcac..c4d74c1 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -3169,7 +3169,7 @@ mn10300_insert_setlb_lcc (rtx label, rtx branch)
 
   if (LABEL_NUSES (label) > 1)
     {
-      rtx insn;
+      rtx_insn *insn;
 
       /* This label is used both as an entry point to the loop
 	 and as a loop-back point for the loop.  We need to separate
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index f7a95dd..9e910cc 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -11039,7 +11039,7 @@ s390_fix_long_loop_prediction (rtx_insn *insn)
 {
   rtx set = single_set (insn);
   rtx code_label, label_ref, new_label;
-  rtx uncond_jump;
+  rtx_insn *uncond_jump;
   rtx_insn *cur_insn;
   rtx tmp;
   int distance;
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index de62f7a..849867a 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -4739,7 +4739,7 @@ dump_table (rtx_insn *start, rtx_insn *barrier)
     }
   if (TARGET_FMOVD && TARGET_ALIGN_DOUBLE && have_df)
     {
-      rtx align_insn = NULL_RTX;
+      rtx_insn *align_insn = NULL;
 
       scan = emit_label_after (gen_label_rtx (), scan);
       scan = emit_insn_after (gen_align_log (GEN_INT (3)), scan);
@@ -4768,7 +4768,7 @@ dump_table (rtx_insn *start, rtx_insn *barrier)
 					align_insn);
 		    }
 		  delete_insn (align_insn);
-		  align_insn = NULL_RTX;
+		  align_insn = NULL;
 		  continue;
 		}
 	      else
@@ -5737,7 +5737,7 @@ enum mdep_reorg_phase_e mdep_reorg_phase;
 static void
 gen_far_branch (struct far_branch *bp)
 {
-  rtx insn = bp->insert_place;
+  rtx_insn *insn = bp->insert_place;
   rtx_insn *jump;
   rtx_code_label *label = gen_label_rtx ();
   int ok;
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 9116204..3742759 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -2915,7 +2915,7 @@ cond_move_process_if_block (struct noce_if_info *if_info)
   basic_block then_bb = if_info->then_bb;
   basic_block else_bb = if_info->else_bb;
   basic_block join_bb = if_info->join_bb;
-  rtx jump = if_info->jump;
+  rtx_insn *jump = if_info->jump;
   rtx cond = if_info->cond;
   rtx_insn *seq, *loc_insn;
   rtx reg;
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 3d438e5..89d500d 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -1899,7 +1899,7 @@ get_label_before (rtx_insn *insn, rtx sibling)
 
   if (label == 0 || !LABEL_P (label))
     {
-      rtx prev = PREV_INSN (insn);
+      rtx_insn *prev = PREV_INSN (insn);
 
       label = gen_label_rtx ();
       emit_label_after (label, prev);