https://gcc.gnu.org/g:02891156756efe71ad4de49185d3325ce9c75357
commit r17-5851-g02891156756efe71ad4de49185d3325ce9c75357 Author: Trevor Saunders <[email protected]> Date: Sat Oct 24 18:39:50 2026 +0000 Make argument types rtx_insn * when they always are one gcc/ChangeLog: * builtins.cc (expand_builtin_setjmp_setup, expand_builtin_setjmp_receiver): Take an rtx_insn *. * builtins.h (expand_builtin_setjmp_setup, expand_builtin_setjmp_receiver): Likewise. * config/aarch64/aarch64.cc (aarch_pac_insn_p): Likewise. * config/alpha/alpha-protos.h (alpha_find_lo_sum_using_gp): Likewise. * config/alpha/alpha.cc (alpha_find_lo_sum_using_gp): Likewise. * config/arc/arc-protos.h (arc_write_ext_corereg): Likewise. * config/arc/arc.cc (arc_write_ext_corereg, branch_dest): Likewise. * config/arm/aarch-common-protos.h (arm_early_load_addr_dep, arm_early_load_addr_dep_ptr, arm_early_store_addr_dep, arm_early_store_addr_dep_ptr, arm_mac_accumulator_is_mul_result, arm_no_early_alu_shift_dep, arm_no_early_alu_shift_value_dep, arm_no_early_mul_dep, arm_no_early_store_addr_dep, aarch_pac_insn_p): Likewise. * config/arm/aarch-common.cc (arm_get_set_operands, arm_early_load_addr_dep, arm_early_load_addr_dep_ptr, arm_no_early_alu_shift_dep, arm_no_early_alu_shift_value_dep, arm_no_early_mul_dep, arm_no_early_store_addr_dep, arm_early_store_addr_dep, arm_early_store_addr_dep_ptr, arm_mac_accumulator_is_mul_result): Likewise. * config/arm/arm-protos.h (arm_split_constant, use_return_insn): Likewise. * config/arm/arm.cc (use_return_insn, arm_split_constant, is_indirect_tailcall_p, aarch_pac_insn_p): Likewise. (arm32_output_mi_thunk): Pass nullptr. * config/arm/arm.md (addsi3, subsi3, andsi3, iorsi3, xorsi3, movsi, define_split): Likewise. * config/arm/minipool.cc (minipool::get_label_padding): Take an rtx_insn *. * config/bfin/bfin-protos.h (output_push_multiple, output_pop_multiple): Likewise. * config/bfin/bfin.cc (output_push_multiple, output_pop_multiple, cbranch_predicted_taken_p): Likewise. * config/csky/csky.cc (get_csky_jump_table_size): Likewise. * config/frv/frv-protos.h (output_move_single, output_move_double, output_condmove_single, frv_acc_group): Likewise. * config/frv/frv.cc (output_move_single, output_move_double, output_condmove_single, frv_acc_group, frv_ifcvt_load_value, frv_ifcvt_rewrite_mem): Likewise. * config/i386/i386.cc (ix86_add_queued_cfa_restore_notes): Likewise. * config/m32r/m32r-protos.h (m32r_output_block_move): Likewise. * config/m32r/m32r.cc (m32r_is_insn, m32r_output_block_move): Likewise. * config/mcore/mcore.cc (is_cond_candidate): Likewise. * config/microblaze/microblaze.cc (get_branch_target): Likewise. * config/mips/mips-protos.h (mips_split_move, mips_split_move_insn_p, mips_split_move_insn, mips_split_call, mips_dspalu_bypass_p): Likewise. * config/mips/mips.cc (mips_split_move, mips_insn_split_type, mips_split_move_insn_p, mips_split_move_insn, mips_split_call, mips_dspalu_bypass_p): Likewise. * config/mn10300/mn10300-protos.h (mn10300_match_ccmode): Likewise. * config/mn10300/mn10300.cc (mn10300_match_ccmode): Likewise. * config/nds32/nds32-md-auxiliary.cc (nds32_output_call): Likewise. * config/nds32/nds32-pipelines-auxiliary.cc (bpick_ra_rb_dep_p, pbsada_insn_ra_rb_dep_reg_p, pbsada_insn_rt_dep_reg_p, wext_odd_dep_p): Likewise. * config/nds32/nds32-protos.h (nds32_output_call): Likewise. * config/nds32/nds32-relax-opt.cc (nds32_group_tls_insn): Likewise. * config/rs6000/rs6000-protos.h (rs6000_loop_align): Likewise. * config/rs6000/rs6000-string.cc (expand_strncmp_align_check): Likewise. * config/rs6000/rs6000.cc (rs6000_loop_align): Likewise. * config/rx/rx-protos.h (rx_match_ccmode): Likewise. * config/rx/rx.cc (rx_match_ccmode): Likewise. * config/s390/s390.cc (s390_add_pool_insn): Likewise. * config/sh/sh-protos.h (output_movedouble, shl_and_length, shl_and_scr_length, shl_sext_length, sh_contains_memref_p, sh_loads_bankedreg_p): Likewise. * config/sh/sh.cc (output_movedouble, shl_and_length, shl_and_scr_length, shl_sext_length, sh_contains_memref_p, sh_loads_bankedreg_p, branch_dest, extract_sfunc_addr, find_insn_regmode_weight): Likewise. * config/sh/sh_treg_combine.cc (reg_dead_after_insn, reg_unused_after_insn, trace_reg_uses_1, trace_reg_uses): Likewise. * config/sparc/sparc.cc (eligible_for_restore_insn, emit_and_preserve): Likewise. * config/stormy16/stormy16-protos.h (xstormy16_output_addr_vec): Likewise. * config/stormy16/stormy16.cc (xstormy16_output_addr_vec): Likewise. * config/vax/vax-protos.h (vax_output_int_move): Likewise. * config/vax/vax.cc (vax_output_int_move, vax_add_reg_cfa_offset, split_quadword_operands): Likewise. * config/visium/visium.cc (empty_asm_p, visium_add_queued_cfa_restore_notes): Likewise. * df-problems.cc (simulate_backwards_to_point): Likewise. * df.h (simulate_backwards_to_point): Likewise. * dse.cc (get_call_args): Likewise. * dwarf2out.cc (reg_loc_descriptor, based_loc_descr, compute_frame_pointer_to_fb_displacement): Pass nullptr. * except.cc (copy_reg_eh_region_note_forward, copy_reg_eh_region_note_backward): Take an rtx_insn *. * ifcvt.cc (cond_exec_process_insns): Likewise. * lower-subreg.cc (resolve_subreg_use): Likewise. (resolve_reg_notes, resolve_simple_move): Pass nullptr. * postreload-gcse.cc (gcse_after_reload_main): Take an rtx_insn *. * reload.cc (get_secondary_mem, make_memloc): Pass nullptr. * reload.h (eliminate_regs): Take an rtx_insn *. * reload1.cc (eliminate_regs): Likewise. (reload, reload_as_needed, delete_output_reload): Pass nullptr. * reorg.cc (fix_reg_dead_note, label_before_next_insn): Take an rtx_insn *. * rtl.h (copy_reg_eh_region_note_forward, copy_reg_eh_region_note_backward): Likewise. * sched-int.h (insn_luid): Likewise. * sel-sched-ir.cc (create_insn_rtx_from_pattern): Likewise. (speculate_expr, create_copy_of_insn_rtx): Pass nullptr. * sel-sched-ir.h (create_insn_rtx_from_pattern): Take an rtx_insn *. * sel-sched.cc (create_insn_rtx_with_rhs, create_insn_rtx_with_lhs, create_speculation_check): Pass nullptr. * var-tracking.cc (vt_initialize): Likewise. Diff: --- gcc/builtins.cc | 4 ++-- gcc/builtins.h | 4 ++-- gcc/config/aarch64/aarch64.cc | 2 +- gcc/config/alpha/alpha-protos.h | 2 +- gcc/config/alpha/alpha.cc | 2 +- gcc/config/arc/arc-protos.h | 2 +- gcc/config/arc/arc.cc | 6 +++--- gcc/config/arm/aarch-common-protos.h | 20 ++++++++++---------- gcc/config/arm/aarch-common.cc | 20 ++++++++++---------- gcc/config/arm/arm-protos.h | 4 ++-- gcc/config/arm/arm.cc | 12 ++++++------ gcc/config/arm/arm.md | 14 +++++++------- gcc/config/arm/minipool.cc | 4 ++-- gcc/config/bfin/bfin-protos.h | 4 ++-- gcc/config/bfin/bfin.cc | 6 +++--- gcc/config/csky/csky.cc | 2 +- gcc/config/frv/frv-protos.h | 8 ++++---- gcc/config/frv/frv.cc | 16 ++++++++-------- gcc/config/i386/i386.cc | 2 +- gcc/config/m32r/m32r-protos.h | 2 +- gcc/config/m32r/m32r.cc | 6 +++--- gcc/config/mcore/mcore.cc | 4 ++-- gcc/config/microblaze/microblaze.cc | 2 +- gcc/config/mips/mips-protos.h | 10 +++++----- gcc/config/mips/mips.cc | 13 +++++++------ gcc/config/mn10300/mn10300-protos.h | 2 +- gcc/config/mn10300/mn10300.cc | 2 +- gcc/config/nds32/nds32-md-auxiliary.cc | 4 ++-- gcc/config/nds32/nds32-pipelines-auxiliary.cc | 8 ++++---- gcc/config/nds32/nds32-protos.h | 2 +- gcc/config/nds32/nds32-relax-opt.cc | 2 +- gcc/config/rs6000/rs6000-protos.h | 2 +- gcc/config/rs6000/rs6000-string.cc | 3 ++- gcc/config/rs6000/rs6000.cc | 2 +- gcc/config/rx/rx-protos.h | 2 +- gcc/config/rx/rx.cc | 2 +- gcc/config/s390/s390.cc | 2 +- gcc/config/sh/sh-protos.h | 12 ++++++------ gcc/config/sh/sh.cc | 22 +++++++++++----------- gcc/config/sh/sh_treg_combine.cc | 8 ++++---- gcc/config/sparc/sparc.cc | 4 ++-- gcc/config/stormy16/stormy16-protos.h | 2 +- gcc/config/stormy16/stormy16.cc | 3 ++- gcc/config/vax/vax-protos.h | 2 +- gcc/config/vax/vax.cc | 6 +++--- gcc/config/visium/visium.cc | 4 ++-- gcc/df-problems.cc | 2 +- gcc/df.h | 2 +- gcc/dse.cc | 2 +- gcc/dwarf2out.cc | 6 +++--- gcc/except.cc | 6 ++++-- gcc/ifcvt.cc | 2 +- gcc/lower-subreg.cc | 12 ++++++------ gcc/postreload-gcse.cc | 2 +- gcc/reload.cc | 4 ++-- gcc/reload.h | 2 +- gcc/reload1.cc | 8 ++++---- gcc/reorg.cc | 6 +++--- gcc/rtl.h | 4 ++-- gcc/sched-int.h | 2 +- gcc/sel-sched-ir.cc | 6 +++--- gcc/sel-sched-ir.h | 2 +- gcc/sel-sched.cc | 6 +++--- gcc/var-tracking.cc | 6 +++--- 64 files changed, 176 insertions(+), 171 deletions(-) diff --git a/gcc/builtins.cc b/gcc/builtins.cc index 9a8e499ddb19..220010902cdd 100644 --- a/gcc/builtins.cc +++ b/gcc/builtins.cc @@ -883,7 +883,7 @@ static alias_set_type setjmp_alias_set = -1; exception handling code. */ void -expand_builtin_setjmp_setup (rtx buf_addr, rtx receiver_label) +expand_builtin_setjmp_setup (rtx buf_addr, rtx_insn *receiver_label) { machine_mode sa_mode = STACK_SAVEAREA_MODE (SAVE_NONLOCAL); rtx stack_save; @@ -930,7 +930,7 @@ expand_builtin_setjmp_setup (rtx buf_addr, rtx receiver_label) If RECEIVER_LABEL is NULL, instead construct a nonlocal goto handler. */ void -expand_builtin_setjmp_receiver (rtx receiver_label) +expand_builtin_setjmp_receiver (rtx_insn *receiver_label) { rtx chain; diff --git a/gcc/builtins.h b/gcc/builtins.h index 97b79908d0dd..76d2bc73956c 100644 --- a/gcc/builtins.h +++ b/gcc/builtins.h @@ -113,8 +113,8 @@ struct c_strlen_data extern tree c_strlen (tree, int, c_strlen_data * = NULL, unsigned = 1); extern rtx c_readstr (const char *, fixed_size_mode, bool = true); -extern void expand_builtin_setjmp_setup (rtx, rtx); -extern void expand_builtin_setjmp_receiver (rtx); +extern void expand_builtin_setjmp_setup (rtx, rtx_insn *); +extern void expand_builtin_setjmp_receiver (rtx_insn *); extern void expand_builtin_update_setjmp_buf (rtx); extern tree mathfn_built_in (tree, enum built_in_function fn); extern tree mathfn_built_in (tree, combined_fn); diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index ddc8dc9f66e8..5232c6a6d696 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -9643,7 +9643,7 @@ aarch64_gcs_enabled (void) /* Check if X (or any sub-rtx of X) is a PACIASP/PACIBSP instruction. */ bool -aarch_pac_insn_p (rtx x) +aarch_pac_insn_p (rtx_insn *x) { if (!INSN_P (x)) return false; diff --git a/gcc/config/alpha/alpha-protos.h b/gcc/config/alpha/alpha-protos.h index bb81d856d0dd..a496f9cff53d 100644 --- a/gcc/config/alpha/alpha-protos.h +++ b/gcc/config/alpha/alpha-protos.h @@ -87,7 +87,7 @@ extern rtx alpha_va_arg (tree, tree); extern void alpha_start_function (FILE *, const char *, tree); extern void alpha_end_function (FILE *, const char *, tree); -extern bool alpha_find_lo_sum_using_gp (rtx); +extern bool alpha_find_lo_sum_using_gp (rtx_insn *); extern int alpha_store_data_bypass_p (rtx_insn *, rtx_insn *); diff --git a/gcc/config/alpha/alpha.cc b/gcc/config/alpha/alpha.cc index ab29b254d300..bcf756cfd034 100644 --- a/gcc/config/alpha/alpha.cc +++ b/gcc/config/alpha/alpha.cc @@ -8312,7 +8312,7 @@ vms_output_aligned_decl_common(FILE *file, tree decl, const char *name, #endif bool -alpha_find_lo_sum_using_gp (rtx insn) +alpha_find_lo_sum_using_gp (rtx_insn *insn) { subrtx_iterator::array_type array; FOR_EACH_SUBRTX (iter, array, PATTERN (insn), NONCONST) diff --git a/gcc/config/arc/arc-protos.h b/gcc/config/arc/arc-protos.h index 380f2c397771..81a763b91fba 100644 --- a/gcc/config/arc/arc-protos.h +++ b/gcc/config/arc/arc-protos.h @@ -75,7 +75,7 @@ extern rtx disi_highpart (rtx); extern int arc_adjust_insn_length (rtx_insn *, int, bool); extern int arc_corereg_hazard (rtx, rtx); extern int arc_hazard (rtx_insn *, rtx_insn *); -extern int arc_write_ext_corereg (rtx); +extern int arc_write_ext_corereg (rtx_insn *); extern rtx gen_acc1 (void); extern rtx gen_acc2 (void); extern bool arc_branch_size_unknown_p (void); diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc index acecb9923556..30353c82d6ba 100644 --- a/gcc/config/arc/arc.cc +++ b/gcc/config/arc/arc.cc @@ -198,7 +198,7 @@ static void arc_encode_section_info (tree decl, rtx rtl, int first); static void arc_init_builtins (void); static rtx arc_expand_builtin (tree, rtx, rtx, machine_mode, int); -static int branch_dest (rtx); +static int branch_dest (rtx_insn *); static void arc_output_pic_addr_const (FILE *, rtx, int); static bool arc_function_ok_for_sibcall (tree, tree); @@ -5630,7 +5630,7 @@ arc_frame_pointer_required (void) /* Return the destination address of a branch. */ static int -branch_dest (rtx branch) +branch_dest (rtx_insn *branch) { rtx pat = PATTERN (branch); rtx dest = (GET_CODE (pat) == PARALLEL @@ -9584,7 +9584,7 @@ arc_predicate_delay_insns (void) /* Return nonzreo iff INSN writes to an extension core register. */ int -arc_write_ext_corereg (rtx insn) +arc_write_ext_corereg (rtx_insn *insn) { subrtx_iterator::array_type array; FOR_EACH_SUBRTX (iter, array, PATTERN (insn), NONCONST) diff --git a/gcc/config/arm/aarch-common-protos.h b/gcc/config/arm/aarch-common-protos.h index 10de8fafcbda..93e25d026cdc 100644 --- a/gcc/config/arm/aarch-common-protos.h +++ b/gcc/config/arm/aarch-common-protos.h @@ -31,21 +31,21 @@ extern bool aarch_rev16_shleft_mask_imm_p (rtx, machine_mode); extern bool aarch_rev16_shright_mask_imm_p (rtx, machine_mode); extern bool aarch_mm_needs_acquire (rtx); extern bool aarch_mm_needs_release (rtx); -extern int arm_early_load_addr_dep (rtx, rtx); -extern int arm_early_load_addr_dep_ptr (rtx, rtx); -extern int arm_early_store_addr_dep (rtx, rtx); -extern int arm_early_store_addr_dep_ptr (rtx, rtx); -extern int arm_mac_accumulator_is_mul_result (rtx, rtx); +extern int arm_early_load_addr_dep (rtx_insn *, rtx_insn *); +extern int arm_early_load_addr_dep_ptr (rtx_insn *, rtx_insn *); +extern int arm_early_store_addr_dep (rtx_insn *, rtx_insn *); +extern int arm_early_store_addr_dep_ptr (rtx_insn *, rtx_insn *); +extern int arm_mac_accumulator_is_mul_result (rtx_insn *, rtx_insn *); extern int arm_mac_accumulator_is_result (rtx, rtx); -extern int arm_no_early_alu_shift_dep (rtx, rtx); -extern int arm_no_early_alu_shift_value_dep (rtx, rtx); -extern int arm_no_early_mul_dep (rtx, rtx); -extern int arm_no_early_store_addr_dep (rtx, rtx); +extern int arm_no_early_alu_shift_dep (rtx_insn *, rtx_insn *); +extern int arm_no_early_alu_shift_value_dep (rtx_insn *, rtx_insn *); +extern int arm_no_early_mul_dep (rtx_insn *, rtx_insn *); +extern int arm_no_early_store_addr_dep (rtx_insn *, rtx_insn *); extern bool arm_rtx_shift_left_p (rtx); extern void aarch_bti_arch_check (void); extern bool aarch_bti_enabled (void); extern bool aarch_bti_j_insn_p (rtx_insn *); -extern bool aarch_pac_insn_p (rtx); +extern bool aarch_pac_insn_p (rtx_insn *); extern rtx aarch_gen_bti_c (void); extern rtx aarch_gen_bti_j (void); extern bool aarch_fun_is_indirect_return (rtx_insn *); diff --git a/gcc/config/arm/aarch-common.cc b/gcc/config/arm/aarch-common.cc index 197952ee7dfc..e80bc196103c 100644 --- a/gcc/config/arm/aarch-common.cc +++ b/gcc/config/arm/aarch-common.cc @@ -105,7 +105,7 @@ arm_find_shift_sub_rtx (rtx pattern) Return nonzero if we found the SET RTX we expected. */ static int -arm_get_set_operands (rtx producer, rtx consumer, +arm_get_set_operands (rtx_insn *producer, rtx_insn *consumer, rtx *set_source, rtx *set_destination) { rtx set_producer = arm_find_sub_rtx_with_code (PATTERN (producer), @@ -224,7 +224,7 @@ aarch_mm_needs_release (rtx const_int) /* Return nonzero if the CONSUMER instruction (a load) does need PRODUCER's value to calculate the address. */ int -arm_early_load_addr_dep (rtx producer, rtx consumer) +arm_early_load_addr_dep (rtx_insn *producer, rtx_insn *consumer) { rtx value, addr; @@ -238,7 +238,7 @@ arm_early_load_addr_dep (rtx producer, rtx consumer) a Pmode PRODUCER's value to calculate the address. */ int -arm_early_load_addr_dep_ptr (rtx producer, rtx consumer) +arm_early_load_addr_dep_ptr (rtx_insn *producer, rtx_insn *consumer) { rtx value = arm_find_sub_rtx_with_code (PATTERN (producer), SET, false); rtx addr = arm_find_sub_rtx_with_code (PATTERN (consumer), SET, false); @@ -256,7 +256,7 @@ arm_early_load_addr_dep_ptr (rtx producer, rtx consumer) have an early register shift value or amount dependency on the result of PRODUCER. */ int -arm_no_early_alu_shift_dep (rtx producer, rtx consumer) +arm_no_early_alu_shift_dep (rtx_insn *producer, rtx_insn *consumer) { rtx value, op; rtx early_op; @@ -274,7 +274,7 @@ arm_no_early_alu_shift_dep (rtx producer, rtx consumer) have an early register shift value dependency on the result of PRODUCER. */ int -arm_no_early_alu_shift_value_dep (rtx producer, rtx consumer) +arm_no_early_alu_shift_value_dep (rtx_insn *producer, rtx_insn *consumer) { rtx value, op; rtx early_op; @@ -294,7 +294,7 @@ arm_no_early_alu_shift_value_dep (rtx producer, rtx consumer) have an early register mult dependency on the result of PRODUCER. */ int -arm_no_early_mul_dep (rtx producer, rtx consumer) +arm_no_early_mul_dep (rtx_insn *producer, rtx_insn *consumer) { rtx value, op; @@ -316,7 +316,7 @@ arm_no_early_mul_dep (rtx producer, rtx consumer) PRODUCER's value to calculate the address. */ int -arm_no_early_store_addr_dep (rtx producer, rtx consumer) +arm_no_early_store_addr_dep (rtx_insn *producer, rtx_insn *consumer) { rtx value = arm_find_sub_rtx_with_code (PATTERN (producer), SET, false); rtx addr = arm_find_sub_rtx_with_code (PATTERN (consumer), SET, false); @@ -337,7 +337,7 @@ arm_no_early_store_addr_dep (rtx producer, rtx consumer) PRODUCER's value to calculate the address. */ int -arm_early_store_addr_dep (rtx producer, rtx consumer) +arm_early_store_addr_dep (rtx_insn *producer, rtx_insn *consumer) { return !arm_no_early_store_addr_dep (producer, consumer); } @@ -346,7 +346,7 @@ arm_early_store_addr_dep (rtx producer, rtx consumer) a Pmode PRODUCER's value to calculate the address. */ int -arm_early_store_addr_dep_ptr (rtx producer, rtx consumer) +arm_early_store_addr_dep_ptr (rtx_insn *producer, rtx_insn *consumer) { rtx value = arm_find_sub_rtx_with_code (PATTERN (producer), SET, false); rtx addr = arm_find_sub_rtx_with_code (PATTERN (consumer), SET, false); @@ -500,7 +500,7 @@ aarch_accumulator_forwarding (rtx_insn *producer, rtx_insn *consumer) has an accumulator dependency on the result of the producer (a multiplication instruction) and no other dependency on that result. */ int -arm_mac_accumulator_is_mul_result (rtx producer, rtx consumer) +arm_mac_accumulator_is_mul_result (rtx_insn *producer, rtx_insn *consumer) { rtx mul = PATTERN (producer); rtx mac = PATTERN (consumer); diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h index b607cdb3fcc0..2fd54f683fc7 100644 --- a/gcc/config/arm/arm-protos.h +++ b/gcc/config/arm/arm-protos.h @@ -28,7 +28,7 @@ rtl_opt_pass *make_pass_insert_bti (gcc::context *ctxt); extern enum unwind_info_type arm_except_unwind_info (struct gcc_options *); -extern int use_return_insn (int, rtx); +extern int use_return_insn (int, rtx_insn *); extern bool use_simple_return_p (void); extern enum reg_class arm_regno_class (int); extern bool arm_check_builtin_call (location_t, vec<location_t>, tree, tree, @@ -79,7 +79,7 @@ extern int const_ok_for_op (HOST_WIDE_INT, enum rtx_code); extern int const_ok_for_dimode_op (HOST_WIDE_INT, enum rtx_code); extern void thumb1_gen_const_int_rtl (rtx, HOST_WIDE_INT); extern void thumb1_gen_const_int_print (rtx, HOST_WIDE_INT); -extern int arm_split_constant (RTX_CODE, machine_mode, rtx, +extern int arm_split_constant (RTX_CODE, machine_mode, rtx_insn *, HOST_WIDE_INT, rtx, rtx, int); extern int legitimate_pic_operand_p (rtx); extern rtx legitimize_pic_address (rtx, machine_mode, rtx, rtx, bool); diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index a33898590d06..b7b81b703f0c 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -4394,7 +4394,7 @@ static inline bool reg_needs_saving_p (unsigned reg) call. SIBLING is the call insn, so we can examine its register usage. */ int -use_return_insn (int iscond, rtx sibling) +use_return_insn (int iscond, rtx_insn *sibling) { int regno; unsigned int func_type; @@ -4716,7 +4716,7 @@ const_ok_for_dimode_op (HOST_WIDE_INT i, enum rtx_code code) /* ??? Tweak this for thumb2. */ int -arm_split_constant (enum rtx_code code, machine_mode mode, rtx insn, +arm_split_constant (enum rtx_code code, machine_mode mode, rtx_insn *insn, HOST_WIDE_INT val, rtx target, rtx source, int subtargets) { rtx cond; @@ -21998,7 +21998,7 @@ thumb_force_lr_save (void) we do have an indirect tailcall happening in this particular case. */ static bool -is_indirect_tailcall_p (rtx call) +is_indirect_tailcall_p (rtx_insn *call) { rtx pat = PATTERN (call); @@ -28295,7 +28295,7 @@ arm32_output_mi_thunk (FILE *file, tree, HOST_WIDE_INT delta, /* Add DELTA to THIS_RTX. */ if (delta != 0) - arm_split_constant (PLUS, Pmode, NULL_RTX, + arm_split_constant (PLUS, Pmode, nullptr, delta, this_rtx, this_rtx, false); /* Add *(*THIS_RTX + VCALL_OFFSET) to THIS_RTX. */ @@ -28304,7 +28304,7 @@ arm32_output_mi_thunk (FILE *file, tree, HOST_WIDE_INT delta, /* Load *THIS_RTX. */ emit_move_insn (temp, gen_rtx_MEM (Pmode, this_rtx)); /* Compute *THIS_RTX + VCALL_OFFSET. */ - arm_split_constant (PLUS, Pmode, NULL_RTX, vcall_offset, temp, temp, + arm_split_constant (PLUS, Pmode, nullptr, vcall_offset, temp, temp, false); /* Compute *(*THIS_RTX + VCALL_OFFSET). */ emit_move_insn (temp, gen_rtx_MEM (Pmode, temp)); @@ -32272,7 +32272,7 @@ aarch_bti_j_insn_p (rtx_insn *insn) /* Check if X (or any sub-rtx of X) is a PACIASP/PACIBSP instruction. */ bool -aarch_pac_insn_p (rtx x) +aarch_pac_insn_p (rtx_insn *x) { if (!x || !INSN_P (x)) return false; diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index 785d341aa2aa..e593cac0b336 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -901,7 +901,7 @@ " if (TARGET_32BIT && CONST_INT_P (operands[2])) { - arm_split_constant (PLUS, SImode, NULL_RTX, + arm_split_constant (PLUS, SImode, nullptr, INTVAL (operands[2]), operands[0], operands[1], optimize && can_create_pseudo_p ()); DONE; @@ -1995,7 +1995,7 @@ operands[1] = force_reg (SImode, operands[1]); else { - arm_split_constant (MINUS, SImode, NULL_RTX, + arm_split_constant (MINUS, SImode, nullptr, INTVAL (operands[1]), operands[0], operands[2], optimize && can_create_pseudo_p ()); @@ -2946,7 +2946,7 @@ operands[2] = force_reg (SImode, operands[2]); else { - arm_split_constant (AND, SImode, NULL_RTX, + arm_split_constant (AND, SImode, nullptr, INTVAL (operands[2]), operands[0], operands[1], optimize && can_create_pseudo_p ()); @@ -3702,7 +3702,7 @@ operands[2] = force_reg (SImode, operands[2]); else { - arm_split_constant (IOR, SImode, NULL_RTX, + arm_split_constant (IOR, SImode, nullptr, INTVAL (operands[2]), operands[0], operands[1], optimize && can_create_pseudo_p ()); @@ -3809,7 +3809,7 @@ operands[2] = force_reg (SImode, operands[2]); else { - arm_split_constant (XOR, SImode, NULL_RTX, + arm_split_constant (XOR, SImode, nullptr, INTVAL (operands[2]), operands[0], operands[1], optimize && can_create_pseudo_p ()); @@ -6477,7 +6477,7 @@ } else { - arm_split_constant (SET, SImode, NULL_RTX, + arm_split_constant (SET, SImode, nullptr, INTVAL (operands[1]), operands[0], NULL_RTX, optimize && can_create_pseudo_p ()); DONE; @@ -6565,7 +6565,7 @@ || const_ok_for_arm (~INTVAL (operands[1]))))" [(clobber (const_int 0))] " - arm_split_constant (SET, SImode, NULL_RTX, + arm_split_constant (SET, SImode, nullptr, INTVAL (operands[1]), operands[0], NULL_RTX, 0); DONE; " diff --git a/gcc/config/arm/minipool.cc b/gcc/config/arm/minipool.cc index a540b548c85e..137998163831 100644 --- a/gcc/config/arm/minipool.cc +++ b/gcc/config/arm/minipool.cc @@ -280,7 +280,7 @@ class minipool void assign_offsets (Mfix *); void dump (rtx_insn *); Mfix *create_fix_barrier (Mfix *, minipool_address); - HOST_WIDE_INT get_label_padding (rtx label) const; + HOST_WIDE_INT get_label_padding (rtx_insn *label) const; HOST_WIDE_INT get_alignment_size (void) const; minipool_address forwards (void) const { return m_max_address; } @@ -825,7 +825,7 @@ subpool::debug (void) const /* Return the maximum amount of padding that will be inserted before label LABEL. */ HOST_WIDE_INT -minipool::get_label_padding (rtx label) const +minipool::get_label_padding (rtx_insn *label) const { HOST_WIDE_INT align; diff --git a/gcc/config/bfin/bfin-protos.h b/gcc/config/bfin/bfin-protos.h index 772498306a52..d43d60b3b60e 100644 --- a/gcc/config/bfin/bfin-protos.h +++ b/gcc/config/bfin/bfin-protos.h @@ -106,8 +106,8 @@ extern void bfin_expand_prologue (void); extern void bfin_expand_epilogue (int, int, bool); extern int analyze_push_multiple_operation (rtx); extern int analyze_pop_multiple_operation (rtx); -extern void output_push_multiple (rtx, rtx *); -extern void output_pop_multiple (rtx, rtx *); +extern void output_push_multiple (rtx_insn *, rtx *); +extern void output_pop_multiple (rtx_insn *, rtx *); extern int bfin_hard_regno_rename_ok (unsigned int, unsigned int); extern rtx bfin_return_addr_rtx (int); extern void bfin_hardware_loop (void); diff --git a/gcc/config/bfin/bfin.cc b/gcc/config/bfin/bfin.cc index 81fa48eacdec..f81114b0bf5e 100644 --- a/gcc/config/bfin/bfin.cc +++ b/gcc/config/bfin/bfin.cc @@ -2450,7 +2450,7 @@ branch_dest (rtx_insn *branch) it's a branch that's predicted taken. */ static int -cbranch_predicted_taken_p (rtx insn) +cbranch_predicted_taken_p (rtx_insn *insn) { rtx x = find_reg_note (insn, REG_BR_PROB, 0); @@ -3147,7 +3147,7 @@ analyze_pop_multiple_operation (rtx op) operands in OPERANDS. */ void -output_push_multiple (rtx insn, rtx *operands) +output_push_multiple (rtx_insn *insn, rtx *operands) { char buf[80]; int ok; @@ -3171,7 +3171,7 @@ output_push_multiple (rtx insn, rtx *operands) operands in OPERANDS. */ void -output_pop_multiple (rtx insn, rtx *operands) +output_pop_multiple (rtx_insn *insn, rtx *operands) { char buf[80]; int ok; diff --git a/gcc/config/csky/csky.cc b/gcc/config/csky/csky.cc index 485154e8d5c6..3549c6ac5b23 100644 --- a/gcc/config/csky/csky.cc +++ b/gcc/config/csky/csky.cc @@ -962,7 +962,7 @@ push_csky_minipool_barrier (rtx_insn *insn, HOST_WIDE_INT address) /* Compute the size of a vector jump table. */ static HOST_WIDE_INT -get_csky_jump_table_size (rtx insn) +get_csky_jump_table_size (rtx_insn *insn) { /* ADDR_VECs only take room if read-only data does into the text section. */ diff --git a/gcc/config/frv/frv-protos.h b/gcc/config/frv/frv-protos.h index 49220cb74d9b..e455a2bb1cb4 100644 --- a/gcc/config/frv/frv-protos.h +++ b/gcc/config/frv/frv-protos.h @@ -48,10 +48,10 @@ extern const char *frv_asm_output_opcode extern void frv_final_prescan_insn (rtx_insn *, rtx *, int); extern void frv_emit_move (machine_mode, rtx, rtx); extern int frv_emit_movsi (rtx, rtx); -extern const char *output_move_single (rtx *, rtx); -extern const char *output_move_double (rtx *, rtx); +extern const char *output_move_single (rtx *, rtx_insn *); +extern const char *output_move_double (rtx *, rtx_insn *); extern const char *output_condmove_single - (rtx *, rtx); + (rtx *, rtx_insn *); extern int frv_emit_cond_branch (rtx *); extern int frv_emit_scc (rtx *); extern rtx_insn *frv_split_scc (rtx, rtx, rtx, rtx, HOST_WIDE_INT); @@ -82,7 +82,7 @@ extern machine_mode frv_select_cc_mode (enum rtx_code, rtx, rtx); extern int frv_trampoline_size (void); extern int direct_return_p (void); extern int frv_issue_rate (void); -extern int frv_acc_group (rtx); +extern int frv_acc_group (rtx_insn *); #ifdef TREE_CODE extern int frv_adjust_field_align (tree, int); diff --git a/gcc/config/frv/frv.cc b/gcc/config/frv/frv.cc index 43e9620c9c59..e1307fcf01fd 100644 --- a/gcc/config/frv/frv.cc +++ b/gcc/config/frv/frv.cc @@ -321,8 +321,8 @@ static rtx frv_expand_noargs_builtin (enum insn_code); static void frv_split_iacc_move (rtx, rtx); static rtx frv_emit_comparison (enum rtx_code, rtx, rtx); static void frv_ifcvt_add_insn (rtx, rtx_insn *, int); -static rtx frv_ifcvt_rewrite_mem (rtx, machine_mode, rtx); -static rtx frv_ifcvt_load_value (rtx, rtx); +static rtx frv_ifcvt_rewrite_mem (rtx, machine_mode, rtx_insn *); +static rtx frv_ifcvt_load_value (rtx, rtx_insn *); static unsigned int frv_insn_unit (rtx_insn *); static bool frv_issues_to_branch_unit_p (rtx_insn *); static int frv_cond_flags (rtx); @@ -4166,7 +4166,7 @@ frv_emit_movsi (rtx dest, rtx src) /* Return a string to output a single word move. */ const char * -output_move_single (rtx operands[], rtx insn) +output_move_single (rtx operands[], rtx_insn *insn) { rtx dest = operands[0]; rtx src = operands[1]; @@ -4380,7 +4380,7 @@ output_move_single (rtx operands[], rtx insn) /* Return a string to output a double word move. */ const char * -output_move_double (rtx operands[], rtx insn) +output_move_double (rtx operands[], rtx_insn *insn) { rtx dest = operands[0]; rtx src = operands[1]; @@ -4511,7 +4511,7 @@ output_move_double (rtx operands[], rtx insn) Operand3 -- source */ const char * -output_condmove_single (rtx operands[], rtx insn) +output_condmove_single (rtx operands[], rtx_insn *insn) { rtx dest = operands[2]; rtx src = operands[3]; @@ -5640,7 +5640,7 @@ frv_ifcvt_modify_multiple_tests (ce_if_block *ce_info, that use constants to ones that just use registers. */ static rtx -frv_ifcvt_load_value (rtx value, rtx insn ATTRIBUTE_UNUSED) +frv_ifcvt_load_value (rtx value, rtx_insn *insn ATTRIBUTE_UNUSED) { int num_alloc = frv_ifcvt.cur_scratch_regs; int i; @@ -5710,7 +5710,7 @@ frv_ifcvt_load_value (rtx value, rtx insn ATTRIBUTE_UNUSED) into a temporary register, or the new MEM if we were successful. */ static rtx -frv_ifcvt_rewrite_mem (rtx mem, machine_mode mode, rtx insn) +frv_ifcvt_rewrite_mem (rtx mem, machine_mode mode, rtx_insn *insn) { rtx addr = XEXP (mem, 0); @@ -6862,7 +6862,7 @@ frv_issue_rate (void) /* Return the value of INSN's acc_group attribute. */ int -frv_acc_group (rtx insn) +frv_acc_group (rtx_insn *insn) { /* This distinction only applies to the FR550 packing constraints. */ if (frv_cpu_type == FRV_CPU_FR550) diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index 7759eac846cb..52fa3821a21f 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -7847,7 +7847,7 @@ ix86_add_cfa_restore_note (rtx_insn *insn, rtx reg, HOST_WIDE_INT cfa_offset) /* Add queued REG_CFA_RESTORE notes if any to INSN. */ static void -ix86_add_queued_cfa_restore_notes (rtx insn) +ix86_add_queued_cfa_restore_notes (rtx_insn *insn) { rtx last; if (!queued_cfa_restores) diff --git a/gcc/config/m32r/m32r-protos.h b/gcc/config/m32r/m32r-protos.h index e1b539b44432..e61a55bca1a9 100644 --- a/gcc/config/m32r/m32r-protos.h +++ b/gcc/config/m32r/m32r-protos.h @@ -39,7 +39,7 @@ extern int m32r_address_code (rtx); extern void m32r_initialize_trampoline (rtx, rtx, rtx); extern int zero_and_one (rtx, rtx); extern char * emit_cond_move (rtx *, rtx); -extern void m32r_output_block_move (rtx, rtx *); +extern void m32r_output_block_move (rtx_insn *, rtx *); extern int m32r_expand_block_move (rtx *); extern int m32r_not_same_reg (rtx, rtx); extern int m32r_hard_regno_rename_ok (unsigned int, unsigned int); diff --git a/gcc/config/m32r/m32r.cc b/gcc/config/m32r/m32r.cc index 023c469782c6..3de06d7e7ed9 100644 --- a/gcc/config/m32r/m32r.cc +++ b/gcc/config/m32r/m32r.cc @@ -65,7 +65,7 @@ static char m32r_punct_chars[256]; static void m32r_option_override (void); static void init_reg_tables (void); static void block_move_call (rtx, rtx, rtx); -static int m32r_is_insn (rtx); +static int m32r_is_insn (rtx_insn *); static bool m32r_legitimate_address_p (machine_mode, rtx, bool, code_helper = ERROR_MARK); static rtx m32r_legitimize_address (rtx, rtx, machine_mode); @@ -1319,7 +1319,7 @@ m32r_setup_incoming_varargs (cumulative_args_t cum, /* Return true if INSN is real instruction bearing insn. */ static int -m32r_is_insn (rtx insn) +m32r_is_insn (rtx_insn *insn) { return (NONDEBUG_INSN_P (insn) && GET_CODE (PATTERN (insn)) != USE @@ -2613,7 +2613,7 @@ m32r_expand_block_move (rtx operands[]) operands[4] is a temp register. */ void -m32r_output_block_move (rtx insn ATTRIBUTE_UNUSED, rtx operands[]) +m32r_output_block_move (rtx_insn *insn ATTRIBUTE_UNUSED, rtx operands[]) { HOST_WIDE_INT bytes = INTVAL (operands[2]); int first_time; diff --git a/gcc/config/mcore/mcore.cc b/gcc/config/mcore/mcore.cc index e5ee2c1fc743..b90ca730a1ae 100644 --- a/gcc/config/mcore/mcore.cc +++ b/gcc/config/mcore/mcore.cc @@ -102,7 +102,7 @@ static void layout_mcore_frame (struct mcore_frame *); static void mcore_setup_incoming_varargs (cumulative_args_t, const function_arg_info &, int *, int); -static cond_type is_cond_candidate (rtx); +static cond_type is_cond_candidate (rtx_insn *); static rtx_insn *emit_new_cond_insn (rtx_insn *, int); static rtx_insn *conditionalize_block (rtx_insn *); static void conditionalize_optimization (void); @@ -2277,7 +2277,7 @@ mcore_output_jump_label_table (void) /* Check whether insn is a candidate for a conditional. */ static cond_type -is_cond_candidate (rtx insn) +is_cond_candidate (rtx_insn *insn) { /* The only things we conditionalize are those that can be directly changed into a conditional. Only bother with SImode items. If diff --git a/gcc/config/microblaze/microblaze.cc b/gcc/config/microblaze/microblaze.cc index c89cba77994d..398c8ffa7eaa 100644 --- a/gcc/config/microblaze/microblaze.cc +++ b/gcc/config/microblaze/microblaze.cc @@ -3829,7 +3829,7 @@ microblaze_legitimate_constant_p (machine_mode mode ATTRIBUTE_UNUSED, rtx x) } static rtx -get_branch_target (rtx branch) +get_branch_target (rtx_insn *branch) { if (CALL_P (branch)) { diff --git a/gcc/config/mips/mips-protos.h b/gcc/config/mips/mips-protos.h index 472baac8fdea..d02d60c38e09 100644 --- a/gcc/config/mips/mips-protos.h +++ b/gcc/config/mips/mips-protos.h @@ -214,9 +214,9 @@ extern bool mips_legitimize_move (machine_mode, rtx, rtx); extern rtx mips_subword (rtx, bool); extern bool mips_split_move_p (rtx, rtx, enum mips_split_type); -extern void mips_split_move (rtx, rtx, enum mips_split_type, rtx); -extern bool mips_split_move_insn_p (rtx, rtx, rtx); -extern void mips_split_move_insn (rtx, rtx, rtx); +extern void mips_split_move (rtx, rtx, enum mips_split_type, rtx_insn *); +extern bool mips_split_move_insn_p (rtx, rtx, rtx_insn *); +extern void mips_split_move_insn (rtx, rtx, rtx_insn *); extern void mips_split_128bit_move (rtx, rtx); extern bool mips_split_128bit_move_p (rtx, rtx); extern void mips_split_msa_copy_d (rtx, rtx, rtx, rtx (*)(rtx, rtx, rtx)); @@ -237,7 +237,7 @@ extern void mips_expand_conditional_trap (rtx); extern bool mips_use_pic_fn_addr_reg_p (const_rtx); extern rtx_insn *mips_expand_call (enum mips_call_type, rtx, rtx, rtx, rtx, bool); -extern void mips_split_call (rtx, rtx); +extern void mips_split_call (rtx_insn *, rtx); extern bool mips_get_pic_call_symbol (rtx *, int); extern void mips_set_return_address (rtx, rtx); extern bool mips_move_by_pieces_p (unsigned HOST_WIDE_INT, unsigned int); @@ -322,7 +322,7 @@ extern const char *mips_output_probe_stack_range (rtx, rtx); extern bool mips_hard_regno_rename_ok (unsigned int, unsigned int); extern bool mips_linked_madd_p (rtx_insn *, rtx_insn *); extern bool mips_store_data_bypass_p (rtx_insn *, rtx_insn *); -extern int mips_dspalu_bypass_p (rtx, rtx); +extern int mips_dspalu_bypass_p (rtx_insn *, rtx_insn *); extern rtx mips_prefetch_cookie (rtx, rtx); extern rtx mips_loongson_ext2_prefetch_cookie (rtx, rtx); diff --git a/gcc/config/mips/mips.cc b/gcc/config/mips/mips.cc index b7101c68daac..3136eca06760 100644 --- a/gcc/config/mips/mips.cc +++ b/gcc/config/mips/mips.cc @@ -5027,7 +5027,8 @@ mips_split_move_p (rtx dest, rtx src, enum mips_split_type split_type) split, if we know it, NULL otherwise. */ void -mips_split_move (rtx dest, rtx src, enum mips_split_type split_type, rtx insn_) +mips_split_move (rtx dest, rtx src, enum mips_split_type split_type, + rtx_insn *insn_) { rtx low_dest; @@ -5118,7 +5119,7 @@ mips_split_move (rtx dest, rtx src, enum mips_split_type split_type, rtx insn_) /* Return the split type for instruction INSN. */ static enum mips_split_type -mips_insn_split_type (rtx insn) +mips_insn_split_type (rtx_insn *insn) { basic_block bb = BLOCK_FOR_INSN (insn); if (bb) @@ -5329,7 +5330,7 @@ mips_split_msa_fill_d (rtx dest, rtx src) /* Return true if a move from SRC to DEST in INSN should be split. */ bool -mips_split_move_insn_p (rtx dest, rtx src, rtx insn) +mips_split_move_insn_p (rtx dest, rtx src, rtx_insn *insn) { return mips_split_move_p (dest, src, mips_insn_split_type (insn)); } @@ -5338,7 +5339,7 @@ mips_split_move_insn_p (rtx dest, rtx src, rtx insn) holds. */ void -mips_split_move_insn (rtx dest, rtx src, rtx insn) +mips_split_move_insn (rtx dest, rtx src, rtx_insn *insn) { mips_split_move (dest, src, mips_insn_split_type (insn), insn); } @@ -8308,7 +8309,7 @@ mips_expand_call (enum mips_call_type type, rtx result, rtx addr, CALL_PATTERN is the pattern of the new call. */ void -mips_split_call (rtx insn, rtx call_pattern) +mips_split_call (rtx_insn *insn, rtx call_pattern) { emit_call_insn (call_pattern); if (!find_reg_note (insn, REG_NORETURN, 0)) @@ -10035,7 +10036,7 @@ enum insn_code dspalu_bypass_table[][2] = }; int -mips_dspalu_bypass_p (rtx out_insn, rtx in_insn) +mips_dspalu_bypass_p (rtx_insn *out_insn, rtx_insn *in_insn) { int i; int num_bypass = ARRAY_SIZE (dspalu_bypass_table); diff --git a/gcc/config/mn10300/mn10300-protos.h b/gcc/config/mn10300/mn10300-protos.h index e0f4d56ad3d5..80be5ac2793d 100644 --- a/gcc/config/mn10300/mn10300-protos.h +++ b/gcc/config/mn10300/mn10300-protos.h @@ -34,7 +34,7 @@ extern unsigned int mn10300_store_multiple_regs (rtx); extern int mn10300_symbolic_operand (rtx, machine_mode); extern void mn10300_split_cbranch (machine_mode, rtx, rtx); extern int mn10300_split_and_operand_count (rtx); -extern bool mn10300_match_ccmode (rtx, machine_mode); +extern bool mn10300_match_ccmode (rtx_insn *, machine_mode); #endif /* RTX_CODE */ extern bool mn10300_regno_in_class_p (unsigned, int, bool); diff --git a/gcc/config/mn10300/mn10300.cc b/gcc/config/mn10300/mn10300.cc index 57c7a5cc5679..8ee9a3179bb6 100644 --- a/gcc/config/mn10300/mn10300.cc +++ b/gcc/config/mn10300/mn10300.cc @@ -2880,7 +2880,7 @@ mn10300_split_cbranch (machine_mode cmp_mode, rtx cmp_op, rtx label_ref) /* A helper function for matching parallels that set the flags. */ bool -mn10300_match_ccmode (rtx insn, machine_mode cc_mode) +mn10300_match_ccmode (rtx_insn *insn, machine_mode cc_mode) { rtx op1, flags; machine_mode flags_mode; diff --git a/gcc/config/nds32/nds32-md-auxiliary.cc b/gcc/config/nds32/nds32-md-auxiliary.cc index d8378b9af789..9b054edc3abe 100644 --- a/gcc/config/nds32/nds32-md-auxiliary.cc +++ b/gcc/config/nds32/nds32-md-auxiliary.cc @@ -3015,8 +3015,8 @@ nds32_symbol_binds_local_p (const_rtx x) } const char * -nds32_output_call (rtx insn, rtx *operands, rtx symbol, const char *long_call, - const char *call, bool align_p) +nds32_output_call (rtx_insn *insn, rtx *operands, rtx symbol, + const char *long_call, const char *call, bool align_p) { char pattern[100]; bool noreturn_p; diff --git a/gcc/config/nds32/nds32-pipelines-auxiliary.cc b/gcc/config/nds32/nds32-pipelines-auxiliary.cc index 13be995b3c63..5bd40a205cdb 100644 --- a/gcc/config/nds32/nds32-pipelines-auxiliary.cc +++ b/gcc/config/nds32/nds32-pipelines-auxiliary.cc @@ -291,7 +291,7 @@ extract_nth_access_reg (rtx_insn *insn, int index) /* Determine if the latency is occurred when the consumer PBSADA_INSN uses the value of DEF_REG in its Ra or Rb fields. */ bool -pbsada_insn_ra_rb_dep_reg_p (rtx pbsada_insn, rtx def_reg) +pbsada_insn_ra_rb_dep_reg_p (rtx_insn *pbsada_insn, rtx def_reg) { rtx unspec_rtx = SET_SRC (PATTERN (pbsada_insn)); gcc_assert (GET_CODE (unspec_rtx) == UNSPEC); @@ -309,7 +309,7 @@ pbsada_insn_ra_rb_dep_reg_p (rtx pbsada_insn, rtx def_reg) /* Determine if the latency is occurred when the consumer PBSADA_INSN uses the value of DEF_REG in its Rt field. */ bool -pbsada_insn_rt_dep_reg_p (rtx pbsada_insn, rtx def_reg) +pbsada_insn_rt_dep_reg_p (rtx_insn *pbsada_insn, rtx def_reg) { rtx pbsada_rt = SET_DEST (PATTERN (pbsada_insn)); @@ -350,7 +350,7 @@ movd44_even_dep_p (rtx_insn *insn, rtx def_reg) /* Check if INSN is a wext insn consuming DEF_REG. */ bool -wext_odd_dep_p (rtx insn, rtx def_reg) +wext_odd_dep_p (rtx_insn *insn, rtx def_reg) { rtx shift_rtx = XEXP (SET_SRC (PATTERN (insn)), 0); rtx use_reg = XEXP (shift_rtx, 0); @@ -397,7 +397,7 @@ wext_odd_dep_p (rtx insn, rtx def_reg) /* Check if INSN is a bpick insn consuming DEF_REG. */ bool -bpick_ra_rb_dep_p (rtx insn, rtx def_reg) +bpick_ra_rb_dep_p (rtx_insn *insn, rtx def_reg) { rtx ior_rtx = SET_SRC (PATTERN (insn)); rtx and1_rtx = XEXP (ior_rtx, 0); diff --git a/gcc/config/nds32/nds32-protos.h b/gcc/config/nds32/nds32-protos.h index 42d15d9d7839..396e006df35a 100644 --- a/gcc/config/nds32/nds32-protos.h +++ b/gcc/config/nds32/nds32-protos.h @@ -252,7 +252,7 @@ extern const char *nds32_output_cbranchsi4_greater_less_zero (rtx_insn *, rtx *) extern const char *nds32_output_unpkd8 (rtx, rtx, rtx, rtx, bool); -extern const char *nds32_output_call (rtx, rtx *, rtx, +extern const char *nds32_output_call (rtx_insn *, rtx *, rtx, const char *, const char *, bool); extern const char *nds32_output_tls_desc (rtx *); extern const char *nds32_output_tls_ie (rtx *); diff --git a/gcc/config/nds32/nds32-relax-opt.cc b/gcc/config/nds32/nds32-relax-opt.cc index 594fb7b8b873..0ce43df5bb7d 100644 --- a/gcc/config/nds32/nds32-relax-opt.cc +++ b/gcc/config/nds32/nds32-relax-opt.cc @@ -389,7 +389,7 @@ nds32_group_insns (rtx_insn *sethi) /* Convert relax group id in rtl. */ static void -nds32_group_tls_insn (rtx insn) +nds32_group_tls_insn (rtx_insn *insn) { rtx pat = PATTERN (insn); rtx unspec_relax_group = XEXP (XVECEXP (pat, 0, 1), 0); diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h index 5efca2d58348..cc5818d668da 100644 --- a/gcc/config/rs6000/rs6000-protos.h +++ b/gcc/config/rs6000/rs6000-protos.h @@ -154,7 +154,7 @@ extern void rs6000_emit_parity (rtx, rtx); extern rtx rs6000_machopic_legitimize_pic_address (rtx, machine_mode, rtx); extern rtx rs6000_allocate_stack_temp (machine_mode, bool, bool); -extern align_flags rs6000_loop_align (rtx); +extern align_flags rs6000_loop_align (rtx_insn *); extern void rs6000_split_logical (rtx [], enum rtx_code, bool, bool, bool); extern bool rs6000_function_pcrel_p (struct function *); extern bool rs6000_pcrel_p (void); diff --git a/gcc/config/rs6000/rs6000-string.cc b/gcc/config/rs6000/rs6000-string.cc index 08313089ef69..2f49b94c3d1b 100644 --- a/gcc/config/rs6000/rs6000-string.cc +++ b/gcc/config/rs6000/rs6000-string.cc @@ -2088,7 +2088,8 @@ expand_block_compare (rtx operands[]) SRC_ADDR is the string address to be examined. BYTES is the max number of bytes to compare. */ static void -expand_strncmp_align_check (rtx strncmp_label, rtx src_addr, HOST_WIDE_INT bytes) +expand_strncmp_align_check (rtx_code_label *strncmp_label, rtx src_addr, + HOST_WIDE_INT bytes) { rtx lab_ref = gen_rtx_LABEL_REF (VOIDmode, strncmp_label); rtx src_pgoff = gen_reg_rtx (GET_MODE (src_addr)); diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index 31f3d45eb819..77c032e6be19 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -4976,7 +4976,7 @@ rs6000_option_override (void) /* Implement LOOP_ALIGN. */ align_flags -rs6000_loop_align (rtx label) +rs6000_loop_align (rtx_insn *label) { basic_block bb; int ninsns; diff --git a/gcc/config/rx/rx-protos.h b/gcc/config/rx/rx-protos.h index 5a36ef269483..8dce64f6f96d 100644 --- a/gcc/config/rx/rx-protos.h +++ b/gcc/config/rx/rx-protos.h @@ -57,7 +57,7 @@ extern char * rx_gen_move_template (rtx *, bool); extern bool rx_is_legitimate_constant (machine_mode, rtx); extern bool rx_is_restricted_memory_address (rtx, machine_mode); -extern bool rx_match_ccmode (rtx, machine_mode); +extern bool rx_match_ccmode (rtx_insn *, machine_mode); extern rtx rx_maybe_pidify_operand (rtx, int); extern void rx_notice_update_cc (rtx, rtx); extern void rx_split_cbranch (machine_mode, enum rtx_code, diff --git a/gcc/config/rx/rx.cc b/gcc/config/rx/rx.cc index f157bce71bca..4a38a6fef28a 100644 --- a/gcc/config/rx/rx.cc +++ b/gcc/config/rx/rx.cc @@ -3317,7 +3317,7 @@ rx_split_cbranch (machine_mode cc_mode, enum rtx_code cmp1, /* A helper function for matching parallels that set the flags. */ bool -rx_match_ccmode (rtx insn, machine_mode cc_mode) +rx_match_ccmode (rtx_insn *insn, machine_mode cc_mode) { rtx op1, flags; machine_mode flags_mode; diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc index c69301bf44ea..a7ba415f930f 100644 --- a/gcc/config/s390/s390.cc +++ b/gcc/config/s390/s390.cc @@ -9830,7 +9830,7 @@ s390_end_pool (struct constant_pool *pool, rtx_insn *insn) /* Add INSN to the list of insns covered by POOL. */ static void -s390_add_pool_insn (struct constant_pool *pool, rtx insn) +s390_add_pool_insn (struct constant_pool *pool, rtx_insn *insn) { bitmap_set_bit (pool->insns, INSN_UID (insn)); } diff --git a/gcc/config/sh/sh-protos.h b/gcc/config/sh/sh-protos.h index 7379649150f7..786fe368a622 100644 --- a/gcc/config/sh/sh-protos.h +++ b/gcc/config/sh/sh-protos.h @@ -45,7 +45,7 @@ extern const char *output_branch (int, rtx_insn *, rtx *); extern const char *output_ieee_ccmpeq (rtx_insn *, rtx *); extern const char *output_branchy_insn (enum rtx_code, const char *, rtx_insn *, rtx *); -extern const char *output_movedouble (rtx, rtx[], machine_mode); +extern const char *output_movedouble (rtx_insn *, rtx[], machine_mode); extern const char *output_movepcrel (rtx, rtx[], machine_mode); extern const char *output_far_jump (rtx_insn *, rtx); @@ -78,11 +78,11 @@ extern void gen_shifty_hi_op (int, rtx *); extern bool expand_ashiftrt (rtx *); extern bool sh_dynamicalize_shift_p (rtx); extern int shl_and_kind (rtx, rtx, int *); -extern int shl_and_length (rtx); -extern int shl_and_scr_length (rtx); +extern int shl_and_length (rtx_insn *); +extern int shl_and_scr_length (rtx_insn *); extern bool gen_shl_and (rtx, rtx, rtx, rtx); extern int shl_sext_kind (rtx, rtx, int *); -extern int shl_sext_length (rtx); +extern int shl_sext_length (rtx_insn *); extern bool gen_shl_sext (rtx, rtx, rtx, rtx); extern int regs_used (rtx, int); extern void fixup_addr_diff_vecs (rtx_insn *); @@ -354,8 +354,8 @@ extern void sh_init_cumulative_args (CUMULATIVE_ARGS *, tree, rtx, tree, signed int, machine_mode); extern rtx sh_dwarf_register_span (rtx); -extern bool sh_contains_memref_p (rtx); -extern bool sh_loads_bankedreg_p (rtx); +extern bool sh_contains_memref_p (rtx_insn *); +extern bool sh_loads_bankedreg_p (rtx_insn *); extern int sh2a_get_function_vector_number (rtx); extern bool sh2a_is_function_vector_call (rtx); extern void sh_fix_range (const char *); diff --git a/gcc/config/sh/sh.cc b/gcc/config/sh/sh.cc index 02c0c75df99d..c583baedd90b 100644 --- a/gcc/config/sh/sh.cc +++ b/gcc/config/sh/sh.cc @@ -174,7 +174,7 @@ char sh_additional_register_names[ADDREGNAMES_SIZE] \ int assembler_dialect; static void split_branches (rtx_insn *); -static int branch_dest (rtx); +static int branch_dest (rtx_insn *); static void print_slot (rtx_sequence *); static rtx_code_label *add_constant (rtx, machine_mode, rtx); static void dump_table (rtx_insn *, rtx_insn *); @@ -223,7 +223,7 @@ static int sh_adjust_cost (rtx_insn *, int, rtx_insn *, int, unsigned int); static int sh_issue_rate (void); static int sh_dfa_new_cycle (FILE *, int, rtx_insn *, int, int, int *sort_p); static short find_set_regmode_weight (rtx, machine_mode); -static short find_insn_regmode_weight (rtx, machine_mode); +static short find_insn_regmode_weight (rtx_insn *, machine_mode); static void find_regmode_weight (basic_block, machine_mode); static int find_r0_life_regions (basic_block); static void sh_md_init_global (FILE *, int, int); @@ -2485,7 +2485,7 @@ sh_emit_compare_and_set (rtx *operands, machine_mode mode) Since the SH cannot move a DI or DF in one instruction, we have to take care when we see overlapping source and dest registers. */ const char * -output_movedouble (rtx insn ATTRIBUTE_UNUSED, rtx operands[], +output_movedouble (rtx_insn *insn ATTRIBUTE_UNUSED, rtx operands[], machine_mode mode) { rtx dst = operands[0]; @@ -4043,7 +4043,7 @@ shl_and_kind (rtx left_rtx, rtx mask_rtx, int *attrp) /* This is used in length attributes of the unnamed instructions corresponding to shl_and_kind return values of 1 and 2. */ int -shl_and_length (rtx insn) +shl_and_length (rtx_insn *insn) { rtx set_src, left_rtx, mask_rtx; int attributes[3]; @@ -4057,7 +4057,7 @@ shl_and_length (rtx insn) /* This is used in length attribute of the and_shl_scratch instruction. */ int -shl_and_scr_length (rtx insn) +shl_and_scr_length (rtx_insn *insn) { rtx set_src = SET_SRC (XVECEXP (PATTERN (insn), 0, 0)); int len = ashl_lshr_seq[INTVAL (XEXP (set_src, 1)) & 31].insn_count; @@ -4299,7 +4299,7 @@ shl_sext_kind (rtx left_rtx, rtx size_rtx, int *costp) /* Function to be used in the length attribute of the instructions implementing this pattern. */ int -shl_sext_length (rtx insn) +shl_sext_length (rtx_insn *insn) { rtx set_src, left_rtx, size_rtx; int cost; @@ -8733,7 +8733,7 @@ tls_symbolic_operand (rtx op, machine_mode mode ATTRIBUTE_UNUSED) /* Return the destination address of a branch. */ static int -branch_dest (rtx branch) +branch_dest (rtx_insn *branch) { rtx dest = SET_SRC (PATTERN (branch)); @@ -9660,7 +9660,7 @@ find_set_regmode_weight (rtx x, machine_mode mode) /* Get regmode weight for insn. */ static short -find_insn_regmode_weight (rtx insn, machine_mode mode) +find_insn_regmode_weight (rtx_insn *insn, machine_mode mode) { /* Increment weight for each register born here. */ rtx x = PATTERN (insn); @@ -11045,7 +11045,7 @@ sh_expand_t_scc (rtx operands[]) /* INSN is an sfunc; return the rtx that describes the address used. */ static rtx -extract_sfunc_addr (rtx insn) +extract_sfunc_addr (rtx_insn *insn) { rtx pattern = PATTERN (insn); const int len = XVECLEN (pattern, 0); @@ -11205,7 +11205,7 @@ sh_gen_truncate (machine_mode mode, rtx x, int need_sign_ext) Return true iff INSN contains a MEM. */ bool -sh_contains_memref_p (rtx insn) +sh_contains_memref_p (rtx_insn *insn) { subrtx_iterator::array_type array; FOR_EACH_SUBRTX (iter, array, PATTERN (insn), NONCONST) @@ -11216,7 +11216,7 @@ sh_contains_memref_p (rtx insn) /* Return true iff INSN loads a banked register. */ bool -sh_loads_bankedreg_p (rtx insn) +sh_loads_bankedreg_p (rtx_insn *insn) { if (GET_CODE (PATTERN (insn)) == SET) { diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc index 26a3182a955b..ea5b92c263ae 100644 --- a/gcc/config/sh/sh_treg_combine.cc +++ b/gcc/config/sh/sh_treg_combine.cc @@ -313,13 +313,13 @@ find_set_of_reg_bb (rtx reg, rtx_insn *insn) } static bool -reg_dead_after_insn (const_rtx reg, const_rtx insn) +reg_dead_after_insn (const_rtx reg, const rtx_insn *insn) { return find_regno_note (insn, REG_DEAD, REGNO (reg)) != NULL_RTX; } static bool -reg_unused_after_insn (const_rtx reg, const_rtx insn) +reg_unused_after_insn (const_rtx reg, const rtx_insn *insn) { return find_regno_note (insn, REG_UNUSED, REGNO (reg)) != NULL_RTX; } @@ -344,7 +344,7 @@ is_adjacent_bb (basic_block a, basic_block b) // Internal function of trace_reg_uses. static void trace_reg_uses_1 (rtx reg, rtx_insn *start_insn, basic_block bb, int& count, - std::vector<basic_block>& visited_bb, rtx abort_at_insn) + std::vector<basic_block>& visited_bb, rtx_insn *abort_at_insn) { if (bb == NULL) return; @@ -401,7 +401,7 @@ trace_reg_uses_1 (rtx reg, rtx_insn *start_insn, basic_block bb, int& count, // that insn. If the insn 'abort_at_insn' uses the specified reg, it is also // counted. static int -trace_reg_uses (rtx reg, rtx_insn *start_insn, rtx abort_at_insn) +trace_reg_uses (rtx reg, rtx_insn *start_insn, rtx_insn *abort_at_insn) { log_msg ("\ntrace_reg_uses\nreg = "); log_rtx (reg); diff --git a/gcc/config/sparc/sparc.cc b/gcc/config/sparc/sparc.cc index 108dc71b8bc6..ae98509bddf1 100644 --- a/gcc/config/sparc/sparc.cc +++ b/gcc/config/sparc/sparc.cc @@ -4035,7 +4035,7 @@ emit_cbcond_nop (rtx_insn *insn) instruction. */ static int -eligible_for_restore_insn (rtx trial, bool return_p) +eligible_for_restore_insn (rtx_insn *trial, bool return_p) { rtx pat = PATTERN (trial); rtx src = SET_SRC (pat); @@ -12339,7 +12339,7 @@ sparc_register_move_cost (machine_mode mode ATTRIBUTE_UNUSED, function calls, with the possible exception of calls to the GOT helper. */ static void -emit_and_preserve (rtx seq, rtx reg, rtx reg2) +emit_and_preserve (rtx_insn *seq, rtx reg, rtx reg2) { /* We must preserve the lowest 16 words for the register save area. */ HOST_WIDE_INT offset = 16*UNITS_PER_WORD; diff --git a/gcc/config/stormy16/stormy16-protos.h b/gcc/config/stormy16/stormy16-protos.h index 3bd771efd6a8..cb0a7af39240 100644 --- a/gcc/config/stormy16/stormy16-protos.h +++ b/gcc/config/stormy16/stormy16-protos.h @@ -45,7 +45,7 @@ extern char *xstormy16_output_cbranch_hi (rtx, const char *, int, rtx_insn *); extern char *xstormy16_output_cbranch_si (rtx, const char *, int, rtx_insn *); extern void xstormy16_expand_casesi (rtx, rtx, rtx, rtx, rtx); -extern void xstormy16_output_addr_vec (FILE *, rtx, rtx); +extern void xstormy16_output_addr_vec (FILE *, rtx_insn *, rtx); extern void xstormy16_expand_call (rtx, rtx, rtx); extern void xstormy16_expand_iorqi3 (rtx *); extern void xstormy16_expand_andqi3 (rtx *); diff --git a/gcc/config/stormy16/stormy16.cc b/gcc/config/stormy16/stormy16.cc index a262e1210858..536c58d89446 100644 --- a/gcc/config/stormy16/stormy16.cc +++ b/gcc/config/stormy16/stormy16.cc @@ -2051,7 +2051,8 @@ xstormy16_expand_casesi (rtx index, rtx lower_bound, rtx range, all reach. */ void -xstormy16_output_addr_vec (FILE *file, rtx label ATTRIBUTE_UNUSED, rtx table) +xstormy16_output_addr_vec (FILE *file, rtx_insn *label ATTRIBUTE_UNUSED, + rtx table) { int vlen, idx; diff --git a/gcc/config/vax/vax-protos.h b/gcc/config/vax/vax-protos.h index d5822d8305ff..3176174a7004 100644 --- a/gcc/config/vax/vax-protos.h +++ b/gcc/config/vax/vax-protos.h @@ -29,7 +29,7 @@ extern void print_operand_address (FILE *, rtx); extern void print_operand (FILE *, rtx, int); extern void vax_expand_addsub_di_operands (rtx *, enum rtx_code); extern bool vax_maybe_split_dimode_move (rtx *); -extern const char * vax_output_int_move (rtx, rtx *, machine_mode); +extern const char * vax_output_int_move (rtx_insn *, rtx *, machine_mode); extern const char * vax_output_int_add (rtx_insn *, rtx *, machine_mode); extern const char * vax_output_int_subtract (rtx_insn *, rtx *, machine_mode); #endif /* RTX_CODE */ diff --git a/gcc/config/vax/vax.cc b/gcc/config/vax/vax.cc index 66eb2e050641..2515e8d0087c 100644 --- a/gcc/config/vax/vax.cc +++ b/gcc/config/vax/vax.cc @@ -164,7 +164,7 @@ vax_option_override (void) } static void -vax_add_reg_cfa_offset (rtx insn, int offset, rtx src) +vax_add_reg_cfa_offset (rtx_insn *insn, int offset, rtx src) { rtx x; @@ -272,7 +272,7 @@ vax_init_libfuncs (void) /* This is like nonimmediate_operand with a restriction on the type of MEM. */ static void -split_quadword_operands (rtx insn, enum rtx_code code, rtx * operands, +split_quadword_operands (rtx_insn *insn, enum rtx_code code, rtx * operands, rtx * low, int n) { int i; @@ -1250,7 +1250,7 @@ vax_maybe_split_dimode_move (rtx *operands) } const char * -vax_output_int_move (rtx insn ATTRIBUTE_UNUSED, rtx *operands, +vax_output_int_move (rtx_insn *insn ATTRIBUTE_UNUSED, rtx *operands, machine_mode mode) { rtx hi[3], lo[3]; diff --git a/gcc/config/visium/visium.cc b/gcc/config/visium/visium.cc index 2f1e3fd7c0c6..538676d94be9 100644 --- a/gcc/config/visium/visium.cc +++ b/gcc/config/visium/visium.cc @@ -1095,7 +1095,7 @@ gr5_hazard_bypass_p (rtx_insn *out_insn, rtx_insn *in_insn) /* Return true if INSN is an empty asm instruction. */ static bool -empty_asm_p (rtx insn) +empty_asm_p (rtx_insn *insn) { rtx body = PATTERN (insn); const char *templ; @@ -3980,7 +3980,7 @@ visium_add_cfa_restore_note (rtx reg) /* Add queued REG_CFA_RESTORE notes to INSN, if any. */ static void -visium_add_queued_cfa_restore_notes (rtx insn) +visium_add_queued_cfa_restore_notes (rtx_insn *insn) { rtx last; if (!cfa_restores) diff --git a/gcc/df-problems.cc b/gcc/df-problems.cc index f9769f8a4894..49861a7766af 100644 --- a/gcc/df-problems.cc +++ b/gcc/df-problems.cc @@ -4118,7 +4118,7 @@ find_memory_stores (rtx x, const_rtx pat ATTRIBUTE_UNUSED, lifetimes, up to insn POINT. The result is stored in LIVE. */ void -simulate_backwards_to_point (basic_block bb, regset live, rtx point) +simulate_backwards_to_point (basic_block bb, regset live, rtx_insn *point) { rtx_insn *insn; bitmap_copy (live, df_get_live_out (bb)); diff --git a/gcc/df.h b/gcc/df.h index f11bb95415b8..e086a2890c6c 100644 --- a/gcc/df.h +++ b/gcc/df.h @@ -1057,7 +1057,7 @@ extern void df_simulate_one_insn_backwards (basic_block, rtx_insn *, bitmap); extern void df_simulate_finalize_backwards (basic_block, bitmap); extern void df_simulate_initialize_forwards (basic_block, bitmap); extern void df_simulate_one_insn_forwards (basic_block, rtx_insn *, bitmap); -extern void simulate_backwards_to_point (basic_block, regset, rtx); +extern void simulate_backwards_to_point (basic_block, regset, rtx_insn *); extern bool can_move_insns_across (rtx_insn *, rtx_insn *, rtx_insn *, rtx_insn *, basic_block, regset, diff --git a/gcc/dse.cc b/gcc/dse.cc index 68e6dd136f91..8e88cde0f42c 100644 --- a/gcc/dse.cc +++ b/gcc/dse.cc @@ -2435,7 +2435,7 @@ check_mem_read_use (rtx *loc, void *data) So far it only handles arguments passed in registers. */ static bool -get_call_args (rtx call_insn, tree fn, rtx *args, int nargs) +get_call_args (rtx_insn *call_insn, tree fn, rtx *args, int nargs) { CUMULATIVE_ARGS args_so_far_v; cumulative_args_t args_so_far; diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index e8a6019f72e0..9964fdc8da8f 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -14632,7 +14632,7 @@ reg_loc_descriptor (rtx rtl, enum var_init_status initialized) if ((rtl == arg_pointer_rtx || rtl == frame_pointer_rtx) && (ira_use_lra_p ? lra_eliminate_regs (rtl, VOIDmode, NULL_RTX) - : eliminate_regs (rtl, VOIDmode, NULL_RTX)) != rtl) + : eliminate_regs (rtl, VOIDmode, nullptr)) != rtl) { dw_loc_descr_ref result = NULL; @@ -15198,7 +15198,7 @@ based_loc_descr (rtx reg, poly_int64 offset, { rtx elim = (ira_use_lra_p ? lra_eliminate_regs (reg, VOIDmode, NULL_RTX) - : eliminate_regs (reg, VOIDmode, NULL_RTX)); + : eliminate_regs (reg, VOIDmode, nullptr)); if (elim != reg) { @@ -21617,7 +21617,7 @@ compute_frame_pointer_to_fb_displacement (poly_int64 offset) elim = (ira_use_lra_p ? lra_eliminate_regs (reg, VOIDmode, NULL_RTX) - : eliminate_regs (reg, VOIDmode, NULL_RTX)); + : eliminate_regs (reg, VOIDmode, nullptr)); elim = strip_offset_and_add (elim, &offset); frame_pointer_fb_offset = -offset; diff --git a/gcc/except.cc b/gcc/except.cc index 1a7ff2b21ced..d00f033af514 100644 --- a/gcc/except.cc +++ b/gcc/except.cc @@ -1768,7 +1768,8 @@ insn_could_throw_p (const rtx_insn *insn) to look for a note, or the note itself. */ void -copy_reg_eh_region_note_forward (rtx note_or_insn, rtx_insn *first, rtx last) +copy_reg_eh_region_note_forward (rtx note_or_insn, rtx_insn *first, + rtx_insn *last) { rtx_insn *insn; rtx note = note_or_insn; @@ -1792,7 +1793,8 @@ copy_reg_eh_region_note_forward (rtx note_or_insn, rtx_insn *first, rtx last) /* Likewise, but iterate backward. */ void -copy_reg_eh_region_note_backward (rtx note_or_insn, rtx_insn *last, rtx first) +copy_reg_eh_region_note_backward (rtx note_or_insn, rtx_insn *last, + rtx_insn *first) { rtx_insn *insn; rtx note = note_or_insn; diff --git a/gcc/ifcvt.cc b/gcc/ifcvt.cc index fad341ead6cf..eb3a958074d0 100644 --- a/gcc/ifcvt.cc +++ b/gcc/ifcvt.cc @@ -351,7 +351,7 @@ rtx_interchangeable_p (const_rtx a, const_rtx b) static bool cond_exec_process_insns (ce_if_block *ce_info ATTRIBUTE_UNUSED, - rtx_insn *start, rtx end, rtx test, + rtx_insn *start, rtx_insn *end, rtx test, profile_probability prob_val, bool mod_ok) { bool must_be_last = false; diff --git a/gcc/lower-subreg.cc b/gcc/lower-subreg.cc index e4d613c5d227..6d8d6f9103b3 100644 --- a/gcc/lower-subreg.cc +++ b/gcc/lower-subreg.cc @@ -794,7 +794,7 @@ simplify_gen_subreg_concatn (machine_mode outermode, rtx op, /* Look for SUBREGs in *LOC which need to be decomposed. */ static bool -resolve_subreg_use (rtx *loc, rtx insn) +resolve_subreg_use (rtx *loc, rtx_insn *insn) { subrtx_ptr_iterator::array_type array; FOR_EACH_SUBRTX_PTR (iter, array, loc, NONCONST) @@ -841,7 +841,7 @@ resolve_reg_notes (rtx_insn *insn) if (note) { int old_count = num_validated_changes (); - if (resolve_subreg_use (&XEXP (note, 0), NULL_RTX)) + if (resolve_subreg_use (&XEXP (note, 0), nullptr)) remove_note (insn, note); else if (old_count != num_validated_changes ()) @@ -1025,7 +1025,7 @@ resolve_simple_move (rtx set, rtx_insn *insn) /* It's possible for the code to use a subreg of a decomposed register while forming an address. We need to handle that before - passing the address to emit_move_insn. We pass NULL_RTX as the + passing the address to emit_move_insn. We pass nullptr as the insn parameter to resolve_subreg_use because we cannot validate the insn yet. */ if (MEM_P (src) || MEM_P (dest)) @@ -1033,9 +1033,9 @@ resolve_simple_move (rtx set, rtx_insn *insn) int acg; if (MEM_P (src)) - resolve_subreg_use (&XEXP (src, 0), NULL_RTX); + resolve_subreg_use (&XEXP (src, 0), nullptr); if (MEM_P (dest)) - resolve_subreg_use (&XEXP (dest, 0), NULL_RTX); + resolve_subreg_use (&XEXP (dest, 0), nullptr); acg = apply_change_group (); gcc_assert (acg); } @@ -1175,7 +1175,7 @@ resolve_simple_move (rtx set, rtx_insn *insn) insns = end_sequence (); - copy_reg_eh_region_note_forward (insn, insns, NULL_RTX); + copy_reg_eh_region_note_forward (insn, insns, nullptr); emit_insn_before (insns, insn); diff --git a/gcc/postreload-gcse.cc b/gcc/postreload-gcse.cc index 2203c60ae912..5cf9191e932d 100644 --- a/gcc/postreload-gcse.cc +++ b/gcc/postreload-gcse.cc @@ -1349,7 +1349,7 @@ delete_redundant_insns (void) due to spilling. */ static void -gcse_after_reload_main (rtx f ATTRIBUTE_UNUSED) +gcse_after_reload_main (rtx_insn *f ATTRIBUTE_UNUSED) { /* Disable computing transparentness if it is too expensive. */ bool do_transp diff --git a/gcc/reload.cc b/gcc/reload.cc index 284e90e40e47..71aa30598adc 100644 --- a/gcc/reload.cc +++ b/gcc/reload.cc @@ -588,7 +588,7 @@ get_secondary_mem (rtx x ATTRIBUTE_UNUSED, machine_mode mode, /* Get a version of the address doing any eliminations needed. If that didn't give us a new MEM, make a new one if it isn't valid. */ - loc = eliminate_regs (secondary_memlocs[(int) mode], VOIDmode, NULL_RTX); + loc = eliminate_regs (secondary_memlocs[(int) mode], VOIDmode, nullptr); mem_valid = strict_memory_address_addr_space_p (mode, XEXP (loc, 0), MEM_ADDR_SPACE (loc)); @@ -4818,7 +4818,7 @@ make_memloc (rtx ad, int regno) /* We must rerun eliminate_regs, in case the elimination offsets have changed. */ rtx tem - = XEXP (eliminate_regs (reg_equiv_memory_loc (regno), VOIDmode, NULL_RTX), + = XEXP (eliminate_regs (reg_equiv_memory_loc (regno), VOIDmode, nullptr), 0); /* If TEM might contain a pseudo, we must copy it to avoid diff --git a/gcc/reload.h b/gcc/reload.h index 7eb6fda5e14c..4a188626d388 100644 --- a/gcc/reload.h +++ b/gcc/reload.h @@ -425,7 +425,7 @@ extern void mark_home_live (int); /* Scan X and replace any eliminable registers (such as fp) with a replacement (such as sp), plus an offset. */ -extern rtx eliminate_regs (rtx, machine_mode, rtx); +extern rtx eliminate_regs (rtx, machine_mode, rtx_insn *); extern bool elimination_target_reg_p (rtx); /* Called from the register allocator to estimate costs of eliminating diff --git a/gcc/reload1.cc b/gcc/reload1.cc index 3f338bde16ab..75cb7900f931 100644 --- a/gcc/reload1.cc +++ b/gcc/reload1.cc @@ -926,7 +926,7 @@ reload (rtx_insn *first, int global) if (reg_renumber[i] < 0 && reg_equiv_memory_loc (i)) { rtx x = eliminate_regs (reg_equiv_memory_loc (i), VOIDmode, - NULL_RTX); + nullptr); if (strict_memory_address_addr_space_p (GET_MODE (regno_reg_rtx[i]), XEXP (x, 0), @@ -2941,7 +2941,7 @@ eliminate_regs_1 (rtx x, machine_mode mem_mode, rtx insn, } rtx -eliminate_regs (rtx x, machine_mode mem_mode, rtx insn) +eliminate_regs (rtx x, machine_mode mem_mode, rtx_insn *insn) { if (reg_eliminate == NULL) { @@ -4495,7 +4495,7 @@ reload_as_needed (int live_known) XEXP (XEXP (PATTERN (insn), 0), 0) = eliminate_regs (XEXP (XEXP (PATTERN (insn), 0), 0), GET_MODE (XEXP (PATTERN (insn), 0)), - NULL_RTX); + nullptr); /* If we need to do register elimination processing, do so. This might delete the insn, in which case we are done. */ @@ -8728,7 +8728,7 @@ delete_output_reload (rtx_insn *insn, int j, int last_reload_reg, if (substed) n_occurrences += count_occurrences (PATTERN (insn), eliminate_regs (substed, VOIDmode, - NULL_RTX), 0); + nullptr), 0); for (rtx i1 = reg_equiv_alt_mem_list (REGNO (reg)); i1; i1 = XEXP (i1, 1)) { gcc_assert (!rtx_equal_p (XEXP (i1, 0), substed)); diff --git a/gcc/reorg.cc b/gcc/reorg.cc index 1b6870b69f60..eee7ba364f66 100644 --- a/gcc/reorg.cc +++ b/gcc/reorg.cc @@ -212,7 +212,7 @@ static bool own_thread_p (rtx, rtx, bool); static void update_block (rtx_insn *, rtx_insn *); static bool reorg_redirect_jump (rtx_jump_insn *, rtx); static void update_reg_dead_notes (rtx_insn *, rtx_insn *); -static void fix_reg_dead_note (rtx_insn *, rtx); +static void fix_reg_dead_note (rtx_insn *, rtx_insn *); static void update_reg_unused_notes (rtx_insn *, rtx); static void fill_simple_delay_slots (bool); static void fill_slots_from_thread (rtx_jump_insn *, rtx, rtx, rtx, @@ -1704,7 +1704,7 @@ update_reg_dead_notes (rtx_insn *insn, rtx_insn *delayed_insn) confused into thinking the register is dead. */ static void -fix_reg_dead_note (rtx_insn *start_insn, rtx stop_insn) +fix_reg_dead_note (rtx_insn *start_insn, rtx_insn *stop_insn) { rtx link, next; rtx_insn *p; @@ -3024,7 +3024,7 @@ delete_jump (rtx_insn *insn) } static rtx_insn * -label_before_next_insn (rtx_insn *x, rtx scan_limit) +label_before_next_insn (rtx_insn *x, rtx_insn *scan_limit) { rtx_insn *insn = next_active_insn (x); while (insn) diff --git a/gcc/rtl.h b/gcc/rtl.h index 015d3742c224..a7f45462d3c1 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -3788,8 +3788,8 @@ extern bool can_throw_external (const rtx_insn *); extern bool insn_could_throw_p (const rtx_insn *); extern bool insn_nothrow_p (const rtx_insn *); extern bool can_nonlocal_goto (const rtx_insn *); -extern void copy_reg_eh_region_note_forward (rtx, rtx_insn *, rtx); -extern void copy_reg_eh_region_note_backward (rtx, rtx_insn *, rtx); +extern void copy_reg_eh_region_note_forward (rtx, rtx_insn *, rtx_insn *); +extern void copy_reg_eh_region_note_backward (rtx, rtx_insn *, rtx_insn *); extern rtx replace_rtx (rtx, rtx, rtx, bool = false); extern void replace_label (rtx *, rtx_insn *, rtx_insn *, bool); extern void replace_label_in_insn (rtx_insn *, rtx_insn *, rtx_insn *, bool); diff --git a/gcc/sched-int.h b/gcc/sched-int.h index ce9ab3a2a31f..d64493d4801b 100644 --- a/gcc/sched-int.h +++ b/gcc/sched-int.h @@ -115,7 +115,7 @@ extern vec<int> sched_luids; /* The highest INSN_LUID. */ extern int sched_max_luid; -extern int insn_luid (rtx); +extern int insn_luid (rtx_insn *); /* This list holds ripped off notes from the current block. These notes will be attached to the beginning of the block when its scheduling is diff --git a/gcc/sel-sched-ir.cc b/gcc/sel-sched-ir.cc index c84a0a967771..79e31bbae55c 100644 --- a/gcc/sel-sched-ir.cc +++ b/gcc/sel-sched-ir.cc @@ -1980,7 +1980,7 @@ speculate_expr (expr_t expr, ds_t ds) case 1: { rtx_insn *spec_insn_rtx = - create_insn_rtx_from_pattern (spec_pat, NULL_RTX); + create_insn_rtx_from_pattern (spec_pat, nullptr); vinsn_t spec_vinsn = create_vinsn_from_insn_rtx (spec_insn_rtx, false); change_vinsn_in_expr (expr, spec_vinsn); @@ -5715,7 +5715,7 @@ sel_unregister_cfg_hooks (void) /* Emit an insn rtx based on PATTERN. If a jump insn is wanted, LABEL is where this jump should be directed. */ rtx_insn * -create_insn_rtx_from_pattern (rtx pattern, rtx label) +create_insn_rtx_from_pattern (rtx pattern, rtx_insn *label) { rtx_insn *insn_rtx; @@ -5770,7 +5770,7 @@ create_copy_of_insn_rtx (rtx_insn *insn_rtx) gcc_assert (NONJUMP_INSN_P (insn_rtx)); res = create_insn_rtx_from_pattern (copy_rtx (PATTERN (insn_rtx)), - NULL_RTX); + nullptr); /* Locate the end of existing REG_NOTES in NEW_RTX. */ rtx *ptail = ®_NOTES (res); diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h index d6af054dfb73..d4a66437806a 100644 --- a/gcc/sel-sched-ir.h +++ b/gcc/sel-sched-ir.h @@ -1593,7 +1593,7 @@ extern void sel_register_cfg_hooks (void); extern void sel_unregister_cfg_hooks (void); /* Expression transformation routines. */ -extern rtx_insn *create_insn_rtx_from_pattern (rtx, rtx); +extern rtx_insn *create_insn_rtx_from_pattern (rtx, rtx_insn *); extern vinsn_t create_vinsn_from_insn_rtx (rtx_insn *, bool); extern rtx_insn *create_copy_of_insn_rtx (rtx_insn *); extern void change_vinsn_in_expr (expr_t, vinsn_t); diff --git a/gcc/sel-sched.cc b/gcc/sel-sched.cc index 5f5ac727c8fe..e79b087045fc 100644 --- a/gcc/sel-sched.cc +++ b/gcc/sel-sched.cc @@ -840,7 +840,7 @@ create_insn_rtx_with_rhs (vinsn_t vi, rtx rhs_rtx) lhs_rtx = copy_rtx (VINSN_LHS (vi)); pattern = gen_rtx_SET (lhs_rtx, rhs_rtx); - insn_rtx = create_insn_rtx_from_pattern (pattern, NULL_RTX); + insn_rtx = create_insn_rtx_from_pattern (pattern, nullptr); return insn_rtx; } @@ -921,7 +921,7 @@ create_insn_rtx_with_lhs (vinsn_t vi, rtx lhs_rtx) rhs_rtx = copy_rtx (VINSN_RHS (vi)); pattern = gen_rtx_SET (lhs_rtx, rhs_rtx); - insn_rtx = create_insn_rtx_from_pattern (pattern, NULL_RTX); + insn_rtx = create_insn_rtx_from_pattern (pattern, nullptr); return insn_rtx; } @@ -1816,7 +1816,7 @@ create_speculation_check (expr_t c_expr, ds_t check_ds, insn_t orig_insn) rtx twin_rtx; twin_rtx = copy_rtx (PATTERN (EXPR_INSN_RTX (c_expr))); - twin_rtx = create_insn_rtx_from_pattern (twin_rtx, NULL_RTX); + twin_rtx = create_insn_rtx_from_pattern (twin_rtx, nullptr); sel_gen_recovery_insn_from_rtx_after (twin_rtx, INSN_EXPR (orig_insn), INSN_SEQNO (insn), diff --git a/gcc/var-tracking.cc b/gcc/var-tracking.cc index 8fea25a77bde..a24de59c2a35 100644 --- a/gcc/var-tracking.cc +++ b/gcc/var-tracking.cc @@ -10145,7 +10145,7 @@ vt_initialize (void) #endif elim = (ira_use_lra_p ? lra_eliminate_regs (reg, VOIDmode, NULL_RTX) - : eliminate_regs (reg, VOIDmode, NULL_RTX)); + : eliminate_regs (reg, VOIDmode, nullptr)); if (elim != reg) { if (GET_CODE (elim) == PLUS) @@ -10167,7 +10167,7 @@ vt_initialize (void) #endif elim = (ira_use_lra_p ? lra_eliminate_regs (reg, VOIDmode, NULL_RTX) - : eliminate_regs (reg, VOIDmode, NULL_RTX)); + : eliminate_regs (reg, VOIDmode, nullptr)); if (elim != reg) { if (GET_CODE (elim) == PLUS) @@ -10201,7 +10201,7 @@ vt_initialize (void) #endif elim = (ira_use_lra_p ? lra_eliminate_regs (reg, VOIDmode, NULL_RTX) - : eliminate_regs (reg, VOIDmode, NULL_RTX)); + : eliminate_regs (reg, VOIDmode, nullptr)); if (elim != reg) { if (GET_CODE (elim) == PLUS)
