From 82082f658e42c072e780b50744bbf93e8b1ee949 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
Date: Thu, 22 Sep 2016 13:16:11 +0000
Subject: use rtx_insn * more

gcc/ChangeLog:

2016-09-22  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* config/arc/arc-protos.h (arc_label_align): Change type of
	variables from rtx to rtx_insn *.
	* config/arc/arc.c (arc_label_align): Likewise.
	* config/arm/arm.c (any_sibcall_could_use_r3): Likewise.
	* config/bfin/bfin.c (workaround_speculation): Likewise.
	* config/c6x/c6x.c (find_next_cycle_insn): Likewise.
	(find_last_same_clock): Likewise.
	(reorg_split_calls): Likewise.
	* config/cris/cris-protos.h (cris_cc0_user_requires_cmp): Likewise.
	* config/cris/cris.c (cris_cc0_user_requires_cmp): Likewise.
	* config/h8300/h8300-protos.h (same_cmp_preceding_p): Likewise.
	(same_cmp_following_p): Likewise.
	* config/h8300/h8300.c (same_cmp_preceding_p): Likewise.
	(same_cmp_following_p): Likwise.
	* config/m32r/m32r.c (m32r_expand_epilogue): Likewise.
	* config/nds32/nds32-protos.h (nds32_target_alignment): Likewise.
	* config/nds32/nds32.c (nds32_target_alignment): Likewise.
	* config/rl78/rl78.c (rl78_alloc_physical_registers_op2):
	* Likewise.
	(rl78_alloc_physical_registers_cmp): Likewise.
	(rl78_alloc_physical_registers_umul): Likewise.
	(rl78_calculate_death_notes): Likewise.
	* config/s390/s390-protos.h (s390_label_align): Likewise.
	* config/s390/s390.c (s390_label_align): Likewise.
	* config/sh/sh.c (barrier_align): Likewise.
	* config/sparc/sparc-protos.h (emit_cbcond_nop): Likewise.
	* config/sparc/sparc.c (sparc_asm_function_epilogue): Likewise.
	(emit_cbcond_nop): Likewise.

From-SVN: r240356
---
 gcc/ChangeLog                   | 31 +++++++++++++++++++++++++++++++
 gcc/config/arc/arc-protos.h     |  2 +-
 gcc/config/arc/arc.c            |  2 +-
 gcc/config/arm/arm.c            |  2 +-
 gcc/config/bfin/bfin.c          |  2 +-
 gcc/config/c6x/c6x.c            | 19 +++++++++----------
 gcc/config/cris/cris-protos.h   |  2 +-
 gcc/config/cris/cris.c          |  2 +-
 gcc/config/h8300/h8300-protos.h |  4 ++--
 gcc/config/h8300/h8300.c        |  4 ++--
 gcc/config/m32r/m32r.c          |  2 +-
 gcc/config/nds32/nds32-protos.h |  2 +-
 gcc/config/nds32/nds32.c        |  2 +-
 gcc/config/rl78/rl78.c          | 11 ++++++-----
 gcc/config/s390/s390-protos.h   |  2 +-
 gcc/config/s390/s390.c          |  2 +-
 gcc/config/sh/sh.c              |  2 +-
 gcc/config/sparc/sparc-protos.h |  2 +-
 gcc/config/sparc/sparc.c        |  8 +++-----
 19 files changed, 66 insertions(+), 37 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f8ea8fa..80db88e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,34 @@
+2016-09-22  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* config/arc/arc-protos.h (arc_label_align): Change type of
+	variables from rtx to rtx_insn *.
+	* config/arc/arc.c (arc_label_align): Likewise.
+	* config/arm/arm.c (any_sibcall_could_use_r3): Likewise.
+	* config/bfin/bfin.c (workaround_speculation): Likewise.
+	* config/c6x/c6x.c (find_next_cycle_insn): Likewise.
+	(find_last_same_clock): Likewise.
+	(reorg_split_calls): Likewise.
+	* config/cris/cris-protos.h (cris_cc0_user_requires_cmp): Likewise.
+	* config/cris/cris.c (cris_cc0_user_requires_cmp): Likewise.
+	* config/h8300/h8300-protos.h (same_cmp_preceding_p): Likewise.
+	(same_cmp_following_p): Likewise.
+	* config/h8300/h8300.c (same_cmp_preceding_p): Likewise.
+	(same_cmp_following_p): Likwise.
+	* config/m32r/m32r.c (m32r_expand_epilogue): Likewise.
+	* config/nds32/nds32-protos.h (nds32_target_alignment): Likewise.
+	* config/nds32/nds32.c (nds32_target_alignment): Likewise.
+	* config/rl78/rl78.c (rl78_alloc_physical_registers_op2):
+	* Likewise.
+	(rl78_alloc_physical_registers_cmp): Likewise.
+	(rl78_alloc_physical_registers_umul): Likewise.
+	(rl78_calculate_death_notes): Likewise.
+	* config/s390/s390-protos.h (s390_label_align): Likewise.
+	* config/s390/s390.c (s390_label_align): Likewise.
+	* config/sh/sh.c (barrier_align): Likewise.
+	* config/sparc/sparc-protos.h (emit_cbcond_nop): Likewise.
+	* config/sparc/sparc.c (sparc_asm_function_epilogue): Likewise.
+	(emit_cbcond_nop): Likewise.
+
 2016-09-22  Martin Liska  <mliska@suse.cz>
 
 	PR ipa/77653
diff --git a/gcc/config/arc/arc-protos.h b/gcc/config/arc/arc-protos.h
index 8630e2d..73aacbc 100644
--- a/gcc/config/arc/arc-protos.h
+++ b/gcc/config/arc/arc-protos.h
@@ -109,7 +109,7 @@ extern rtx arc_regno_use_in (unsigned int, rtx);
 extern int arc_attr_type (rtx_insn *);
 extern bool arc_scheduling_not_expected (void);
 extern bool arc_sets_cc_p (rtx_insn *insn);
-extern int arc_label_align (rtx label);
+extern int arc_label_align (rtx_insn *label);
 extern bool arc_need_delay (rtx_insn *insn);
 extern bool arc_text_label (rtx_insn *insn);
 
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index c0aa075..2b25b0b 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -9243,7 +9243,7 @@ arc_scheduling_not_expected (void)
    long.)  */
 
 int
-arc_label_align (rtx label)
+arc_label_align (rtx_insn *label)
 {
   int loop_align = LOOP_ALIGN (LABEL);
 
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 1183d45..594dc17 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -20858,7 +20858,7 @@ any_sibcall_could_use_r3 (void)
   FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR_FOR_FN (cfun)->preds)
     if (e->flags & EDGE_SIBCALL)
       {
-	rtx call = BB_END (e->src);
+	rtx_insn *call = BB_END (e->src);
 	if (!CALL_P (call))
 	  call = prev_nonnote_nondebug_insn (call);
 	gcc_assert (CALL_P (call) && SIBLING_CALL_P (call));
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index e1e3945..a91e47e 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -4452,7 +4452,7 @@ workaround_speculation (void)
 	      || cbranch_predicted_taken_p (insn)))
 	{
 	  rtx_insn *target = JUMP_LABEL_AS_INSN (insn);
-	  rtx label = target;
+	  rtx_insn *label = target;
 	  rtx_insn *next_tgt;
 
 	  cycles_since_jump = 0;
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index cd7c1bb..df6cb78 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -4807,10 +4807,10 @@ convert_to_callp (rtx_insn *insn)
 /* Scan forwards from INSN until we find the next insn that has mode TImode
    (indicating it starts a new cycle), and occurs in cycle CLOCK.
    Return it if we find such an insn, NULL_RTX otherwise.  */
-static rtx
-find_next_cycle_insn (rtx insn, int clock)
+static rtx_insn *
+find_next_cycle_insn (rtx_insn *insn, int clock)
 {
-  rtx t = insn;
+  rtx_insn *t = insn;
   if (GET_MODE (t) == TImode)
     t = next_real_insn (t);
   while (t && GET_MODE (t) != TImode)
@@ -4818,7 +4818,7 @@ find_next_cycle_insn (rtx insn, int clock)
 
   if (t && insn_get_clock (t) == clock)
     return t;
-  return NULL_RTX;
+  return NULL;
 }
 
 /* If COND_INSN has a COND_EXEC condition, wrap the same condition
@@ -4836,10 +4836,10 @@ duplicate_cond (rtx pat, rtx cond_insn)
 
 /* Walk forward from INSN to find the last insn that issues in the same clock
    cycle.  */
-static rtx
-find_last_same_clock (rtx insn)
+static rtx_insn *
+find_last_same_clock (rtx_insn *insn)
 {
-  rtx retval = insn;
+  rtx_insn *retval = insn;
   rtx_insn *t = next_real_insn (insn);
 
   while (t && GET_MODE (t) != TImode)
@@ -4935,12 +4935,11 @@ reorg_split_calls (rtx *call_labels)
 		 no insn setting/using B3 is scheduled in the delay slots of
 		 a call.  */
 	      int this_clock = insn_get_clock (insn);
-	      rtx last_same_clock;
-	      rtx after1;
+	      rtx_insn *after1;
 
 	      call_labels[INSN_UID (insn)] = label;
 
-	      last_same_clock = find_last_same_clock (insn);
+	      rtx_insn *last_same_clock = find_last_same_clock (insn);
 
 	      if (can_use_callp (insn))
 		{
diff --git a/gcc/config/cris/cris-protos.h b/gcc/config/cris/cris-protos.h
index 9068166..5e0ae61 100644
--- a/gcc/config/cris/cris-protos.h
+++ b/gcc/config/cris/cris-protos.h
@@ -27,7 +27,7 @@ extern void cris_notice_update_cc (rtx, rtx_insn *);
 extern bool cris_reload_address_legitimized (rtx, machine_mode, int, int, int);
 extern int cris_side_effect_mode_ok (enum rtx_code, rtx *, int, int,
                                      int, int, int);
-extern bool cris_cc0_user_requires_cmp (rtx);
+extern bool cris_cc0_user_requires_cmp (rtx_insn *);
 extern rtx cris_return_addr_rtx (int, rtx);
 extern rtx cris_split_movdx (rtx *);
 extern int cris_legitimate_pic_operand (rtx);
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 2038193..1026aad 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -2409,7 +2409,7 @@ cris_side_effect_mode_ok (enum rtx_code code, rtx *ops,
    insn for other reasons.  */
 
 bool
-cris_cc0_user_requires_cmp (rtx insn)
+cris_cc0_user_requires_cmp (rtx_insn *insn)
 {
   rtx_insn *cc0_user = NULL;
   rtx body;
diff --git a/gcc/config/h8300/h8300-protos.h b/gcc/config/h8300/h8300-protos.h
index 721b6c7..a4895ff 100644
--- a/gcc/config/h8300/h8300-protos.h
+++ b/gcc/config/h8300/h8300-protos.h
@@ -56,8 +56,8 @@ extern void split_adds_subs (machine_mode, rtx[]);
 extern int h8300_eightbit_constant_address_p (rtx);
 extern int h8300_tiny_constant_address_p (rtx);
 extern int byte_accesses_mergeable_p (rtx, rtx);
-extern int same_cmp_preceding_p (rtx);
-extern int same_cmp_following_p (rtx);
+extern int same_cmp_preceding_p (rtx_insn *);
+extern int same_cmp_following_p (rtx_insn *);
 
 /* Used in builtins.c */
 extern rtx h8300_return_addr_rtx (int, rtx);
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index db8eeab..9433567 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -5730,7 +5730,7 @@ byte_accesses_mergeable_p (rtx addr1, rtx addr2)
    before I3.  I3 is assumed to be a comparison insn.  */
 
 int
-same_cmp_preceding_p (rtx i3)
+same_cmp_preceding_p (rtx_insn *i3)
 {
   rtx_insn *i1, *i2;
 
@@ -5750,7 +5750,7 @@ same_cmp_preceding_p (rtx i3)
    after I1.  I1 is assumed to be a comparison insn.  */
 
 int
-same_cmp_following_p (rtx i1)
+same_cmp_following_p (rtx_insn *i1)
 {
   rtx_insn *i2, *i3;
 
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 943f8c7..dda3961 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -1789,7 +1789,7 @@ m32r_expand_epilogue (void)
 
   if (total_size == 0)
     {
-      rtx insn = get_last_insn ();
+      rtx_insn *insn = get_last_insn ();
 
       /* If the last insn was a BARRIER, we don't have to write any code
 	 because a jump (aka return) was put there.  */
diff --git a/gcc/config/nds32/nds32-protos.h b/gcc/config/nds32/nds32-protos.h
index d66749d..aef022b 100644
--- a/gcc/config/nds32/nds32-protos.h
+++ b/gcc/config/nds32/nds32-protos.h
@@ -126,7 +126,7 @@ extern int nds32_can_use_return_insn (void);
 
 /* Auxiliary functions to decide output alignment or not.  */
 
-extern int nds32_target_alignment (rtx);
+extern int nds32_target_alignment (rtx_insn *);
 
 /* Auxiliary functions to expand builtin functions.  */
 
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index 8dbeba5..7b0d747 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -3489,7 +3489,7 @@ nds32_adjust_insn_length (rtx_insn *insn, int length)
 
 /* Return align 2 (log base 2) if the next instruction of LABEL is 4 byte.  */
 int
-nds32_target_alignment (rtx label)
+nds32_target_alignment (rtx_insn *label)
 {
   rtx_insn *insn;
 
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index ecbf6f9..a4e4be2 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -3153,8 +3153,8 @@ has_constraint (unsigned int opnum, enum constraint_num constraint)
 static void
 rl78_alloc_physical_registers_op2 (rtx_insn * insn)
 {
-  rtx prev;
-  rtx first;
+  rtx_insn *prev;
+  rtx_insn *first;
   bool hl_used;
   int tmp_id;
   rtx saved_op1;
@@ -3332,7 +3332,7 @@ rl78_alloc_physical_registers_cmp (rtx_insn * insn)
   int tmp_id;
   rtx saved_op1;
   rtx_insn *prev = prev_nonnote_nondebug_insn (insn);
-  rtx first;
+  rtx_insn *first;
 
   OP (1) = transcode_memory_rtx (OP (1), DE, insn);
   OP (2) = transcode_memory_rtx (OP (2), HL, insn);
@@ -3423,7 +3423,7 @@ static void
 rl78_alloc_physical_registers_umul (rtx_insn * insn)
 {
   rtx_insn *prev = prev_nonnote_nondebug_insn (insn);
-  rtx first;
+  rtx_insn *first;
   int tmp_id;
   rtx saved_op1;
 
@@ -3793,7 +3793,8 @@ static void
 rl78_calculate_death_notes (void)
 {
   char dead[FIRST_PSEUDO_REGISTER];
-  rtx insn, p, s, d;
+  rtx p, s, d;
+rtx_insn *insn;
   int i;
 
   memset (dead, 0, sizeof (dead));
diff --git a/gcc/config/s390/s390-protos.h b/gcc/config/s390/s390-protos.h
index 2ccf0bb..91dc0ff 100644
--- a/gcc/config/s390/s390-protos.h
+++ b/gcc/config/s390/s390-protos.h
@@ -133,7 +133,7 @@ extern void s390_split_access_reg (rtx, rtx *, rtx *);
 extern void print_operand_address (FILE *, rtx);
 extern void print_operand (FILE *, rtx, int);
 extern void s390_output_pool_entry (rtx, machine_mode, unsigned int);
-extern int s390_label_align (rtx);
+extern int s390_label_align (rtx_insn *);
 extern int s390_agen_dep_p (rtx_insn *, rtx_insn *);
 extern rtx_insn *s390_load_got (void);
 extern rtx s390_get_thread_pointer (void);
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 0a457fc..60e2070 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -1134,7 +1134,7 @@ static const struct attribute_spec s390_attribute_table[] = {
 /* Return the alignment for LABEL.  We default to the -falign-labels
    value except for the literal pool base label.  */
 int
-s390_label_align (rtx label)
+s390_label_align (rtx_insn *label)
 {
   rtx_insn *prev_insn = prev_active_insn (label);
   rtx set, src;
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 10b5a28..b3e949e 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -5694,7 +5694,7 @@ barrier_align (rtx_insn *barrier_or_label)
 	      ? 1 : align_jumps_log);
     }
 
-  rtx next = next_active_insn (barrier_or_label);
+  rtx_insn *next = next_active_insn (barrier_or_label);
 
   if (! next)
     return 0;
diff --git a/gcc/config/sparc/sparc-protos.h b/gcc/config/sparc/sparc-protos.h
index 4a93cc2..2308b91 100644
--- a/gcc/config/sparc/sparc-protos.h
+++ b/gcc/config/sparc/sparc-protos.h
@@ -84,7 +84,7 @@ extern int registers_ok_for_ldd_peep (rtx, rtx);
 extern int mems_ok_for_ldd_peep (rtx, rtx, rtx);
 extern rtx widen_mem_for_ldd_peep (rtx, rtx, machine_mode);
 extern int empty_delay_slot (rtx_insn *);
-extern int emit_cbcond_nop (rtx);
+extern int emit_cbcond_nop (rtx_insn *);
 extern int eligible_for_call_delay (rtx_insn *);
 extern int eligible_for_return_delay (rtx_insn *);
 extern int eligible_for_sibcall_delay (rtx_insn *);
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 1932b1b..5efed3d 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -3488,7 +3488,7 @@ empty_delay_slot (rtx_insn *insn)
    situation.  */
 
 int
-emit_cbcond_nop (rtx insn)
+emit_cbcond_nop (rtx_insn *insn)
 {
   rtx next = next_active_insn (insn);
 
@@ -5873,11 +5873,9 @@ sparc_asm_function_epilogue (FILE *file, HOST_WIDE_INT size ATTRIBUTE_UNUSED)
      backtraces in such cases.  This is pointless for sibling calls since
      the return address is explicitly adjusted.  */
 
-  rtx insn, last_real_insn;
+  rtx_insn *insn = get_last_insn ();
 
-  insn = get_last_insn ();
-
-  last_real_insn = prev_real_insn (insn);
+  rtx last_real_insn = prev_real_insn (insn);
   if (last_real_insn
       && NONJUMP_INSN_P (last_real_insn)
       && GET_CODE (PATTERN (last_real_insn)) == SEQUENCE)
-- 
cgit v1.1