From 4dea3bff792b49a1eb72ee9ef15d7961fa9150c8 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 13 Jun 2018 13:43:32 +0000 Subject: emit-rtl.c: more typesafety This patch converts various rtx to rtx_insn * (or rtx_code_label *). It also convert the various "_loc" params from int to location_t gcc/ChangeLog: * config/arc/arc.c (hwloop_optimize): Strengthen local "end_label" from rtx to rtx_insn *. * config/bfin/bfin.c (hwloop_optimize): Likewise for local "label". (add_sched_insns_for_speculation): Likewise for local "target", converting usage of JUMP_LABEL to JUMP_LABEL_AS_INSN. * config/c6x/c6x.c (reorg_split_calls): Strengthen param "call_labels" from rtx_insn ** to rtx_code_label **. (reorg_emit_nops): Likewise. (c6x_reorg): Likewise for local "call_labels". * config/sh/sh-protos.h (get_dest_uid): Strengthen 1st param from rtx to rtx_insn *. * config/sh/sh.c (dump_table): Strengthen local "lab" from rtx to rtx_code_label *, adding safe_as_a casts to the loops over LABEL_REFS. (fixup_addr_diff_vecs): Add as_a to usage of braf_label. (barrier_align): Convert usage of JUMP_LABEL to JUMP_LABEL_AS_INSN. (get_dest_uid): Strengthen param "label" from rtx to rtx_insn *. (split_branches): Strengthen local "olabel" from rtx to rtx_insn *, adding a safe_as_a cast. * emit-rtl.c (next_real_insn): Strengthen param from "rtx" to "rtx_insn *". (add_insn_after): Likewise for first two params. (add_insn_before): Likewise. (remove_insn): Likewise for param. (emit_pattern_before_noloc): Likewise for second and third params. (emit_jump_insn_before_noloc): Convert NULL_RTX to NULL. (emit_call_insn_before_noloc): Likewise. (emit_debug_insn_before_noloc): Strengthen "before" param from "rtx" to "rtx_insn *". (emit_barrier_before): Likewise. (emit_label_before): Strengthen "label" param from "rtx" to "rtx_code_label *". Strengthen "before" param from "rtx" to "rtx_insn *". (emit_insn_after_1): Strengthen "after" param from "rtx" to "rtx_insn *". (emit_pattern_after_noloc): Likewise. (emit_insn_after_noloc): Likewise. (emit_jump_insn_after_noloc): Likewise. (emit_call_insn_after_noloc): Likewise. (emit_debug_insn_after_noloc): Likewise. (emit_barrier_after): Likewise. (emit_label_after): Likewise for both params. (emit_pattern_after_setloc): Likewise for "after" param. Convert "loc" param from "int" to "location_t". (emit_insn_after_setloc): Likewise. (emit_jump_insn_after_setloc): Likewise. (emit_call_insn_after_setloc): Likewise. (emit_debug_insn_after_setloc): Likewise. (emit_pattern_before_setloc): Likewise for "before" param. Convert "loc" param from "int" to "location_t". (emit_pattern_before): Convert NULL_RTX to NULL. (emit_insn_before_setloc): Convert "loc" param from "int" to "location_t". (emit_jump_insn_before_setloc): Likewise. (emit_call_insn_before_setloc): Likewise. (emit_debug_insn_before_setloc): Strengthen "before" param from rtx to rtx_insn *. Convert "loc" param from "int" to "location_t". * rtl.h (emit_insn_before_setloc, emit_jump_insn_before_setloc, emit_call_insn_before_setloc, emit_debug_insn_before_setloc): Convert 3rd param from "int" to "location_t". (emit_barrier_before, emit_barrier_after, next_real_insn): Strengthen param from rtx to rtx_insn *. (emit_label_before): Strengthen 1st param from "rtx" to "rtx_code_label *". Strengthen 2nd param from "rtx" to "rtx_insn *". (emit_insn_after_noloc, emit_jump_insn_after_noloc, emit_call_insn_after_noloc, emit_debug_insn_after_noloc): Strengthen 2nd param from "rtx" to "rtx_insn *". (emit_insn_after_setloc, emit_jump_insn_after_setloc) emit_call_insn_after_setloc, emit_debug_insn_after_setloc): Likewise. Convert 3rd param from "int" to "location_t". (emit_label_after): Strengthen 1st param from "rtx" to "rtx_code_label *". (next_real_insn, remove_insn): Strengthen param from "rtx" to "rtx_insn *". (add_insn_before, add_insn_after): Strengthen 1st and 2nd params from "rtx" to "rtx_insn *". From-SVN: r261547 --- gcc/config/c6x/c6x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc/config/c6x/c6x.c') diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c index f12edfd..38fbd7e 100644 --- a/gcc/config/c6x/c6x.c +++ b/gcc/config/c6x/c6x.c @@ -4835,7 +4835,7 @@ find_last_same_clock (rtx_insn *insn) the SEQUENCEs that represent execute packets. */ static void -reorg_split_calls (rtx_insn **call_labels) +reorg_split_calls (rtx_code_label **call_labels) { unsigned int reservation_mask = 0; rtx_insn *insn = get_insns (); @@ -5009,7 +5009,7 @@ reorg_split_calls (rtx_insn **call_labels) scheduling was run earlier. */ static void -reorg_emit_nops (rtx_insn **call_labels) +reorg_emit_nops (rtx_code_label **call_labels) { bool first; rtx last_call; @@ -5947,7 +5947,7 @@ c6x_reorg (void) } sched_no_dce = false; - rtx_insn **call_labels = XCNEWVEC (rtx_insn *, get_max_uid () + 1); + rtx_code_label **call_labels = XCNEWVEC (rtx_code_label *, get_max_uid () + 1); reorg_split_calls (call_labels); -- cgit v1.1