https://gcc.gnu.org/g:f1c2610b7bbba75c7f8cdff7b347f20aa7966960
commit r17-5848-gf1c2610b7bbba75c7f8cdff7b347f20aa7966960 Author: Trevor Saunders <[email protected]> Date: Sat Oct 24 08:17:21 2026 +0000 Use rtx_insn * for returns that are already an insn gcc/ChangeLog: * compare-elim.cc (try_validate_parallel): Return an rtx_insn *. * config/aarch64/aarch64.cc (aarch64_emit_move): Likewise. * config/alpha/alpha-protos.h (alpha_emit_unlikely_jump): Likewise. * config/alpha/alpha.cc (alpha_emit_unlikely_jump): Likewise. * config/arc/arc.cc (frame_insn, frame_move, frame_move_inc, frame_add, frame_stack_add): Likewise. * config/arm/arm.cc (emit_multi_reg_push): Likewise. * config/cris/cris-protos.h (cris_split_movdx, cris_emit_movem_store): Likewise. * config/cris/cris.cc (cris_split_movdx, cris_emit_movem_store): Likewise. * config/csky/csky.cc (emit_csky_regs_push): Likewise. * config/fr30/fr30-protos.h (fr30_move_double): Likewise. * config/fr30/fr30.cc (fr30_move_double): Likewise. * config/frv/frv-protos.h (frv_split_scc, frv_split_cond_move, frv_split_minmax, frv_split_abs): Likewise. * config/frv/frv.cc (frv_split_scc, frv_split_cond_move, frv_split_minmax, frv_split_abs): Likewise. * config/h8300/h8300.cc (push, pop): Likewise. * config/i386/i386.cc (pro_epilogue_adjust_stack): Likewise. * config/lm32/lm32.cc (emit_add): Likewise. * config/loongarch/loongarch-protos.h (loongarch_emit_move): Likewise. * config/loongarch/loongarch.cc (loongarch_emit_move): Likewise. * config/m32r/m32r-protos.h (gen_split_move_double): Likewise. * config/m32r/m32r.cc (gen_split_move_double): Likewise. * config/pru/pru.cc (pru_add3_frame_adjust, pru_add_to_sp): Likewise. * config/riscv/riscv-protos.h (riscv_emit_move): Likewise. * config/riscv/riscv.cc (riscv_emit_move): Likewise. * config/rs6000/rs6000-logue.cc (rs6000_emit_stack_reset): Likewise. * config/s390/s390.cc (save_fpr, restore_fpr, s390_prologue_plus_offset): Likewise. * config/sh/sh.cc (push, emit_load_ptr): Likewise. * config/sh/sh_treg_combine.cc (make_not_reg_insn): Likewise. * config/stormy16/stormy16.cc (emit_addhi3_postreload): Likewise. * config/visium/visium.cc (emit_frame_insn): Likewise. Diff: --- gcc/compare-elim.cc | 4 ++-- gcc/config/aarch64/aarch64.cc | 2 +- gcc/config/alpha/alpha-protos.h | 2 +- gcc/config/alpha/alpha.cc | 2 +- gcc/config/arc/arc.cc | 22 +++++++++++----------- gcc/config/arm/arm.cc | 10 +++++----- gcc/config/cris/cris-protos.h | 4 ++-- gcc/config/cris/cris.cc | 4 ++-- gcc/config/csky/csky.cc | 10 +++++----- gcc/config/fr30/fr30-protos.h | 2 +- gcc/config/fr30/fr30.cc | 2 +- gcc/config/frv/frv-protos.h | 8 ++++---- gcc/config/frv/frv.cc | 8 ++++---- gcc/config/h8300/h8300.cc | 16 ++++++++-------- gcc/config/i386/i386.cc | 2 +- gcc/config/lm32/lm32.cc | 4 ++-- gcc/config/loongarch/loongarch-protos.h | 2 +- gcc/config/loongarch/loongarch.cc | 2 +- gcc/config/m32r/m32r-protos.h | 2 +- gcc/config/m32r/m32r.cc | 2 +- gcc/config/pru/pru.cc | 4 ++-- gcc/config/riscv/riscv-protos.h | 2 +- gcc/config/riscv/riscv.cc | 2 +- gcc/config/rs6000/rs6000-logue.cc | 6 +++--- gcc/config/s390/s390.cc | 6 +++--- gcc/config/sh/sh.cc | 14 +++++++------- gcc/config/sh/sh_treg_combine.cc | 4 ++-- gcc/config/stormy16/stormy16.cc | 4 ++-- gcc/config/visium/visium.cc | 8 ++++---- 29 files changed, 80 insertions(+), 80 deletions(-) diff --git a/gcc/compare-elim.cc b/gcc/compare-elim.cc index 6218324e1ab6..85eac1462385 100644 --- a/gcc/compare-elim.cc +++ b/gcc/compare-elim.cc @@ -660,7 +660,7 @@ can_merge_compare_into_arith (rtx_insn *cmp_insn, rtx_insn *arith_insn) a recognizable pattern when emitted in parallel. Return that parallel if so. Otherwise return NULL. */ -static rtx +static rtx_insn * try_validate_parallel (rtx set_a, rtx set_b) { rtx par = gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set_a, set_b)); @@ -669,7 +669,7 @@ try_validate_parallel (rtx set_a, rtx set_b) if (insn_invalid_p (insn, false)) { crtl->emit.x_cur_insn_uid--; - return NULL_RTX; + return nullptr; } SET_PREV_INSN (insn) = NULL_RTX; diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index 6936ab79974c..ddc8dc9f66e8 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -3809,7 +3809,7 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, important because, unlike emit_move_insn, the move expanders know how to force Pmode objects into the constant pool even when the constant pool address is not itself legitimate. */ -static rtx +static rtx_insn * aarch64_emit_move (rtx dest, rtx src) { return (can_create_pseudo_p () diff --git a/gcc/config/alpha/alpha-protos.h b/gcc/config/alpha/alpha-protos.h index 66a1b5a6a6b0..bb81d856d0dd 100644 --- a/gcc/config/alpha/alpha-protos.h +++ b/gcc/config/alpha/alpha-protos.h @@ -74,7 +74,7 @@ extern rtx alpha_expand_zap_mask (HOST_WIDE_INT); extern void alpha_expand_builtin_vector_binop (rtx (*)(rtx, rtx, rtx), machine_mode, rtx, rtx, rtx); -extern rtx alpha_emit_unlikely_jump (rtx, rtx); +extern rtx_insn *alpha_emit_unlikely_jump (rtx, rtx); extern void alpha_expand_builtin_establish_vms_condition_handler (rtx, rtx); extern void alpha_expand_builtin_revert_vms_condition_handler (rtx); diff --git a/gcc/config/alpha/alpha.cc b/gcc/config/alpha/alpha.cc index cc2b1fe95e77..ab29b254d300 100644 --- a/gcc/config/alpha/alpha.cc +++ b/gcc/config/alpha/alpha.cc @@ -5120,7 +5120,7 @@ alpha_expand_builtin_vector_binop (rtx (*gen) (rtx, rtx, rtx), /* A subroutine of the atomic operation splitters. Jump to LABEL if COND is true. Mark the jump as unlikely to be taken. */ -rtx +rtx_insn * alpha_emit_unlikely_jump (rtx cond, rtx label) { rtx x = gen_rtx_IF_THEN_ELSE (VOIDmode, cond, label, pc_rtx); diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc index 14abb4d48535..39306aa84da1 100644 --- a/gcc/config/arc/arc.cc +++ b/gcc/config/arc/arc.cc @@ -588,7 +588,7 @@ static rtx arc_delegitimize_address (rtx); static bool arc_can_follow_jump (const rtx_insn *follower, const rtx_insn *followee); -static rtx frame_insn (rtx); +static rtx_insn *frame_insn (rtx); static void arc_function_arg_advance (cumulative_args_t, const function_arg_info &); static rtx arc_legitimize_address_0 (rtx, rtx, machine_mode mode); @@ -2491,17 +2491,17 @@ arc_address_cost (rtx addr, machine_mode, addr_space_t, bool speed) /* Emit instruction X with the frame related bit set. */ -static rtx +static rtx_insn * frame_insn (rtx x) { - x = emit_insn (x); - RTX_FRAME_RELATED_P (x) = 1; - return x; + rtx_insn *insn = emit_insn (x); + RTX_FRAME_RELATED_P (insn) = 1; + return insn; } /* Emit a frame insn to move SRC to DST. */ -static rtx +static rtx_insn * frame_move (rtx dst, rtx src) { rtx tmp = gen_rtx_SET (dst, src); @@ -2512,10 +2512,10 @@ frame_move (rtx dst, rtx src) /* Like frame_move, but add a REG_INC note for REG if ADDR contains an auto increment address, or is zero. */ -static rtx +static rtx_insn * frame_move_inc (rtx dst, rtx src, rtx reg, rtx addr) { - rtx insn = frame_move (dst, src); + rtx_insn *insn = frame_move (dst, src); if (!addr || GET_CODE (addr) == PRE_DEC || GET_CODE (addr) == POST_INC @@ -2526,18 +2526,18 @@ frame_move_inc (rtx dst, rtx src, rtx reg, rtx addr) /* Emit a frame insn which adjusts a frame address register REG by OFFSET. */ -static rtx +static rtx_insn * frame_add (rtx reg, HOST_WIDE_INT offset) { gcc_assert ((offset & 0x3) == 0); if (!offset) - return NULL_RTX; + return nullptr; return frame_move (reg, plus_constant (Pmode, reg, offset)); } /* Emit a frame insn which adjusts stack pointer by OFFSET. */ -static rtx +static rtx_insn * frame_stack_add (HOST_WIDE_INT offset) { return frame_add (stack_pointer_rtx, offset); diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index 47ad430c2771..3067e887314c 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -173,7 +173,7 @@ static int arm_memory_move_cost (machine_mode, reg_class_t, bool); static void emit_constant_insn (rtx cond, rtx pattern); static rtx_insn *emit_set_insn (rtx, rtx); static void arm_add_cfa_adjust_cfa_note (rtx, int, rtx, rtx); -static rtx emit_multi_reg_push (unsigned long, unsigned long); +static rtx_insn *emit_multi_reg_push (unsigned long, unsigned long); static void arm_emit_multi_reg_pop (unsigned long); static int vfp_emit_fstmd (int, int); static void arm_emit_vfp_multi_reg_pop (int, int, rtx); @@ -21340,7 +21340,7 @@ arm_emit_strd_push (unsigned long saved_regs_mask) of DWARF2 frame unwind information. DWARF_REGS_MASK is a subset of MASK for registers that should be annotated for DWARF2 frame unwind information. */ -static rtx +static rtx_insn * emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) { int num_regs = 0; @@ -21492,16 +21492,16 @@ emit_multi_reg_push (unsigned long mask, unsigned long dwarf_regs_mask) } } - par = emit_insn (par); + rtx_insn *insn = emit_insn (par); tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4 * num_regs)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, 0) = tmp; - add_reg_note (par, REG_FRAME_RELATED_EXPR, dwarf); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); - return par; + return insn; } /* Add a REG_CFA_ADJUST_CFA REG note to INSN. diff --git a/gcc/config/cris/cris-protos.h b/gcc/config/cris/cris-protos.h index bc5ee6022a01..b92df7851468 100644 --- a/gcc/config/cris/cris-protos.h +++ b/gcc/config/cris/cris-protos.h @@ -29,7 +29,7 @@ extern int cris_side_effect_mode_ok (enum rtx_code, rtx *, int, int, int, int, int); extern rtx cris_return_addr_rtx (int, rtx); extern rtx cris_eh_return_handler_rtx (); -extern rtx cris_split_movdx (rtx *); +extern rtx_insn *cris_split_movdx (rtx *); extern bool cris_base_p (const_rtx, bool); extern bool cris_base_or_autoincr_p (const_rtx, bool); extern bool cris_bdap_index_p (const_rtx, bool); @@ -41,7 +41,7 @@ extern bool cris_movem_load_rest_p (rtx); extern void cris_asm_output_symbol_ref (FILE *, rtx); extern void cris_asm_output_case_end (FILE *, int, rtx_insn *); extern rtx cris_gen_movem_load (rtx, rtx); -extern rtx cris_emit_movem_store (rtx, rtx, int, bool); +extern rtx_insn *cris_emit_movem_store (rtx, rtx, int, bool); extern rtx_insn *cris_emit_insn (rtx x); extern void cris_order_for_addsi3 (rtx *, int); extern void cris_emit_trap_for_misalignment (rtx); diff --git a/gcc/config/cris/cris.cc b/gcc/config/cris/cris.cc index af664087c015..e64ed29de202 100644 --- a/gcc/config/cris/cris.cc +++ b/gcc/config/cris/cris.cc @@ -2540,7 +2540,7 @@ cris_init_machine_status (void) /* Split a 2 word move (DI or presumably DF) into component parts. Originally a copy of gen_split_move_double in m32r.cc. */ -rtx +rtx_insn * cris_split_movdx (rtx *operands) { machine_mode mode = GET_MODE (operands[0]); @@ -3376,7 +3376,7 @@ cris_emit_insn (rtx x) /* Worker function for generating movem to mem. If FRAME_RELATED, notes are added that the dwarf2 machinery understands. */ -rtx +rtx_insn * cris_emit_movem_store (rtx dest, rtx nregs_rtx, int increment, bool frame_related) { diff --git a/gcc/config/csky/csky.cc b/gcc/config/csky/csky.cc index 23b9a586aba8..485154e8d5c6 100644 --- a/gcc/config/csky/csky.cc +++ b/gcc/config/csky/csky.cc @@ -5513,7 +5513,7 @@ expand_csky_stack_adjust (int offset) MASK for registers that should be annotated for DWARF2 frame unwind information. */ -static rtx +static rtx_insn * emit_csky_regs_push (unsigned long mask) { int num_regs = 0; @@ -5609,17 +5609,17 @@ emit_csky_regs_push (unsigned long mask) j++; } - par = emit_insn (par); + rtx_insn *insn = emit_insn (par); tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, -4 * num_regs)); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (dwarf, 0, 0) = tmp; - add_reg_note (par, REG_FRAME_RELATED_EXPR, dwarf); - RTX_FRAME_RELATED_P (par) = 1; + add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); + RTX_FRAME_RELATED_P (insn) = 1; - return par; + return insn; } diff --git a/gcc/config/fr30/fr30-protos.h b/gcc/config/fr30/fr30-protos.h index 393d929b965e..e922e98ef160 100644 --- a/gcc/config/fr30/fr30-protos.h +++ b/gcc/config/fr30/fr30-protos.h @@ -25,7 +25,7 @@ extern unsigned int fr30_compute_frame_size (int, int); extern int fr30_check_multiple_regs (rtx *, int, int); extern void fr30_print_operand (FILE *, rtx, int); extern void fr30_print_operand_address (FILE *, rtx); -extern rtx fr30_move_double (rtx *); +extern rtx_insn *fr30_move_double (rtx *); #ifdef HAVE_MACHINE_MODES extern int fr30_const_double_is_zero (rtx); #endif /* HAVE_MACHINE_MODES */ diff --git a/gcc/config/fr30/fr30.cc b/gcc/config/fr30/fr30.cc index d1d100791888..f2e22cfae1a8 100644 --- a/gcc/config/fr30/fr30.cc +++ b/gcc/config/fr30/fr30.cc @@ -878,7 +878,7 @@ fr30_const_double_is_zero (rtx operand) address of the second word into the second destination register before we can use it. */ -rtx +rtx_insn * fr30_move_double (rtx * operands) { rtx src = operands[1]; diff --git a/gcc/config/frv/frv-protos.h b/gcc/config/frv/frv-protos.h index 2e15d7492eb8..49220cb74d9b 100644 --- a/gcc/config/frv/frv-protos.h +++ b/gcc/config/frv/frv-protos.h @@ -54,11 +54,11 @@ extern const char *output_condmove_single (rtx *, rtx); extern int frv_emit_cond_branch (rtx *); extern int frv_emit_scc (rtx *); -extern rtx frv_split_scc (rtx, rtx, rtx, rtx, HOST_WIDE_INT); +extern rtx_insn *frv_split_scc (rtx, rtx, rtx, rtx, HOST_WIDE_INT); extern int frv_emit_cond_move (rtx, rtx, rtx, rtx); -extern rtx frv_split_cond_move (rtx *); -extern rtx frv_split_minmax (rtx *); -extern rtx frv_split_abs (rtx *); +extern rtx_insn *frv_split_cond_move (rtx *); +extern rtx_insn *frv_split_minmax (rtx *); +extern rtx_insn *frv_split_abs (rtx *); extern void frv_split_double_load (rtx, rtx); extern void frv_split_double_store (rtx, rtx); #ifdef BB_HEAD diff --git a/gcc/config/frv/frv.cc b/gcc/config/frv/frv.cc index c223ee8674b7..43e9620c9c59 100644 --- a/gcc/config/frv/frv.cc +++ b/gcc/config/frv/frv.cc @@ -4734,7 +4734,7 @@ frv_emit_scc (rtx operands[]) /* Split a SCC instruction into component parts, returning a SEQUENCE to hold the separate insns. */ -rtx +rtx_insn * frv_split_scc (rtx dest, rtx test, rtx cc_reg, rtx cr_reg, HOST_WIDE_INT value) { rtx_insn *ret; @@ -4845,7 +4845,7 @@ frv_emit_cond_move (rtx dest, rtx test_rtx, rtx src1, rtx src2) /* Split a conditional move into constituent parts, returning a SEQUENCE containing all of the insns. */ -rtx +rtx_insn * frv_split_cond_move (rtx operands[]) { rtx dest = operands[0]; @@ -4994,7 +4994,7 @@ frv_split_double_store (rtx dest, rtx source) /* Split a min/max operation returning a SEQUENCE containing all of the insns. */ -rtx +rtx_insn * frv_split_minmax (rtx operands[]) { rtx dest = operands[0]; @@ -5068,7 +5068,7 @@ frv_split_minmax (rtx operands[]) /* Split an integer abs operation returning a SEQUENCE containing all of the insns. */ -rtx +rtx_insn * frv_split_abs (rtx operands[]) { rtx dest = operands[0]; diff --git a/gcc/config/h8300/h8300.cc b/gcc/config/h8300/h8300.cc index 1598a86996e3..cbdf9fe34e7e 100644 --- a/gcc/config/h8300/h8300.cc +++ b/gcc/config/h8300/h8300.cc @@ -573,7 +573,7 @@ compute_saved_regs (void) /* Emit an insn to push register RN. */ -static rtx +static rtx_insn * push (int rn) { rtx reg = gen_rtx_REG (word_mode, rn); @@ -583,14 +583,14 @@ push (int rn) x = gen_push_h8300hs_advanced (reg); else x = gen_push_h8300hs_normal (reg); - x = F (emit_insn (x), 0); - add_reg_note (x, REG_INC, stack_pointer_rtx); - return x; + rtx_insn *insn = F (emit_insn (x), 0); + add_reg_note (insn, REG_INC, stack_pointer_rtx); + return insn; } /* Emit an insn to pop register RN. */ -static rtx +static rtx_insn * pop (int rn) { rtx reg = gen_rtx_REG (word_mode, rn); @@ -600,9 +600,9 @@ pop (int rn) x = gen_pop_h8300hs_advanced (reg); else x = gen_pop_h8300hs_normal (reg); - x = emit_insn (x); - add_reg_note (x, REG_INC, stack_pointer_rtx); - return x; + rtx_insn *insn = emit_insn (x); + add_reg_note (insn, REG_INC, stack_pointer_rtx); + return insn; } /* Emit an instruction to push or pop NREGS consecutive registers diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index 25d7e813446c..7759eac846cb 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -7866,7 +7866,7 @@ ix86_add_queued_cfa_restore_notes (rtx insn) zero if %r11 register is live and cannot be freely used and positive otherwise. */ -static rtx +static rtx_insn * pro_epilogue_adjust_stack (rtx dest, rtx src, rtx offset, int style, bool set_cfa) { diff --git a/gcc/config/lm32/lm32.cc b/gcc/config/lm32/lm32.cc index 21e78a961d6d..690880b893ed 100644 --- a/gcc/config/lm32/lm32.cc +++ b/gcc/config/lm32/lm32.cc @@ -64,7 +64,7 @@ struct lm32_frame_info }; /* Prototypes for static functions. */ -static rtx emit_add (rtx dest, rtx src0, rtx src1); +static rtx_insn *emit_add (rtx dest, rtx src0, rtx src1); static void expand_save_restore (struct lm32_frame_info *info, int op); static void stack_adjust (HOST_WIDE_INT amount); static bool lm32_in_small_data_p (const_tree); @@ -163,7 +163,7 @@ lm32_return_in_memory (tree type) /* Generate an emit a word sized add instruction. */ -static rtx +static rtx_insn * emit_add (rtx dest, rtx src0, rtx src1) { rtx_insn *insn; diff --git a/gcc/config/loongarch/loongarch-protos.h b/gcc/config/loongarch/loongarch-protos.h index e67addf36e3f..0289409226f4 100644 --- a/gcc/config/loongarch/loongarch-protos.h +++ b/gcc/config/loongarch/loongarch-protos.h @@ -59,7 +59,7 @@ enum loongarch_symbol_type { #define NUM_SYMBOL_TYPES (SYMBOL_TLSLDM + 1) /* Routines implemented in loongarch.cc. */ -extern rtx loongarch_emit_move (rtx, rtx); +extern rtx_insn *loongarch_emit_move (rtx, rtx); extern HOST_WIDE_INT loongarch_initial_elimination_offset (int, int); extern void loongarch_expand_prologue (void); extern void loongarch_expand_epilogue (int); diff --git a/gcc/config/loongarch/loongarch.cc b/gcc/config/loongarch/loongarch.cc index 3cbc288ab758..bae6f602bf45 100644 --- a/gcc/config/loongarch/loongarch.cc +++ b/gcc/config/loongarch/loongarch.cc @@ -1061,7 +1061,7 @@ loongarch_for_each_saved_reg (HOST_WIDE_INT sp_offset, how to force Pmode objects into the constant pool even when the constant pool address is not itself legitimate. */ -rtx +rtx_insn * loongarch_emit_move (rtx dest, rtx src) { return (can_create_pseudo_p () ? emit_move_insn (dest, src) diff --git a/gcc/config/m32r/m32r-protos.h b/gcc/config/m32r/m32r-protos.h index b3a3df514e1d..e1b539b44432 100644 --- a/gcc/config/m32r/m32r-protos.h +++ b/gcc/config/m32r/m32r-protos.h @@ -34,7 +34,7 @@ extern int easy_di_const (rtx); extern int easy_df_const (rtx); extern rtx gen_compare (enum rtx_code, rtx, rtx, int); extern bool gen_cond_store (enum rtx_code, rtx, rtx, rtx); -extern rtx gen_split_move_double (rtx *); +extern rtx_insn *gen_split_move_double (rtx *); extern int m32r_address_code (rtx); extern void m32r_initialize_trampoline (rtx, rtx, rtx); extern int zero_and_one (rtx, rtx); diff --git a/gcc/config/m32r/m32r.cc b/gcc/config/m32r/m32r.cc index a9ec37aebe6c..023c469782c6 100644 --- a/gcc/config/m32r/m32r.cc +++ b/gcc/config/m32r/m32r.cc @@ -1046,7 +1046,7 @@ gen_cond_store (enum rtx_code code, rtx op0, rtx op1, rtx op2) /* Split a 2 word move (DI or DF) into component parts. */ -rtx +rtx_insn * gen_split_move_double (rtx operands[]) { machine_mode mode = GET_MODE (operands[0]); diff --git a/gcc/config/pru/pru.cc b/gcc/config/pru/pru.cc index d6348ec296b3..6bc80badbabb 100644 --- a/gcc/config/pru/pru.cc +++ b/gcc/config/pru/pru.cc @@ -161,7 +161,7 @@ pru_compute_frame_layout (void) addendum - Second addendum operand (a constant). kind - Note kind. REG_NOTE_MAX if no note must be added. */ -static rtx +static rtx_insn * pru_add3_frame_adjust (rtx op0, rtx op1, int addendum, const enum reg_note kind) { @@ -200,7 +200,7 @@ pru_add3_frame_adjust (rtx op0, rtx op1, int addendum, } /* Add a const_int to the stack pointer register. */ -static rtx +static rtx_insn * pru_add_to_sp (int addendum, const enum reg_note kind) { return pru_add3_frame_adjust (stack_pointer_rtx, stack_pointer_rtx, diff --git a/gcc/config/riscv/riscv-protos.h b/gcc/config/riscv/riscv-protos.h index c0fb28397809..8641eec98a2e 100644 --- a/gcc/config/riscv/riscv-protos.h +++ b/gcc/config/riscv/riscv-protos.h @@ -115,7 +115,7 @@ extern int riscv_address_insns (rtx, machine_mode, bool); extern int riscv_const_insns (rtx, bool); extern int riscv_split_const_insns (rtx); extern int riscv_load_store_insns (rtx, rtx_insn *); -extern rtx riscv_emit_move (rtx, rtx); +extern rtx_insn *riscv_emit_move (rtx, rtx); extern bool riscv_split_symbol (rtx, rtx, machine_mode, rtx *); extern bool riscv_split_symbol_type (enum riscv_symbol_type); extern rtx riscv_unspec_address (rtx, enum riscv_symbol_type); diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 974bfe54b639..618412c825f8 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -3149,7 +3149,7 @@ riscv_load_store_insns (rtx mem, rtx_insn *insn) how to force Pmode objects into the constant pool even when the constant pool address is not itself legitimate. */ -rtx +rtx_insn * riscv_emit_move (rtx dest, rtx src) { return (can_create_pseudo_p () diff --git a/gcc/config/rs6000/rs6000-logue.cc b/gcc/config/rs6000/rs6000-logue.cc index 9366ddd2880d..d617416652bc 100644 --- a/gcc/config/rs6000/rs6000-logue.cc +++ b/gcc/config/rs6000/rs6000-logue.cc @@ -2360,13 +2360,13 @@ rs6000_savres_routine_sym (rs6000_stack_t *info, int sel) reset the stack pointer, but move the base of the frame into reg UPDT_REGNO for use by out-of-line register restore routines. */ -static rtx +static rtx_insn * rs6000_emit_stack_reset (rtx frame_reg_rtx, HOST_WIDE_INT frame_off, unsigned updt_regno) { /* If there is nothing to do, don't do anything. */ if (frame_off == 0 && REGNO (frame_reg_rtx) == updt_regno) - return NULL_RTX; + return nullptr; rtx updt_reg_rtx = gen_rtx_REG (Pmode, updt_regno); @@ -2386,7 +2386,7 @@ rs6000_emit_stack_reset (rtx frame_reg_rtx, HOST_WIDE_INT frame_off, else return emit_move_insn (updt_reg_rtx, frame_reg_rtx); - return NULL_RTX; + return nullptr; } /* Return the register number used as a pointer by out-of-line diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc index 7549156e8646..246f79b83ab0 100644 --- a/gcc/config/s390/s390.cc +++ b/gcc/config/s390/s390.cc @@ -11751,7 +11751,7 @@ s390_initial_elimination_offset (int from, int to) /* Emit insn to save fpr REGNUM at offset OFFSET relative to register BASE. Return generated insn. */ -static rtx +static rtx_insn * save_fpr (rtx base, int offset, int regnum) { rtx addr; @@ -11782,7 +11782,7 @@ save_fpr (rtx base, int offset, int regnum) /* Emit insn to restore fpr REGNUM from offset OFFSET relative to register BASE. Return generated insn. */ -static rtx +static rtx_insn * restore_fpr (rtx base, int offset, int regnum) { rtx addr; @@ -12138,7 +12138,7 @@ make_pass_s390_early_mach (gcc::context *ctxt) - push too big immediates to the literal pool and annotate the refs - emit frame related notes for stack pointer changes. */ -static rtx +static rtx_insn * s390_prologue_plus_offset (rtx target, rtx reg, rtx offset, bool frame_related_p) { rtx_insn *insn; diff --git a/gcc/config/sh/sh.cc b/gcc/config/sh/sh.cc index 09036b16a6d3..02c0c75df99d 100644 --- a/gcc/config/sh/sh.cc +++ b/gcc/config/sh/sh.cc @@ -188,7 +188,7 @@ static void sh_option_override (void); static void sh_override_options_after_change (void); static void output_stack_adjust (int, rtx, int, HARD_REG_SET *, bool); static rtx_insn* emit_frame_insn (rtx); -static rtx push (int); +static rtx_insn *push (int); static void pop (int); static void push_regs (HARD_REG_SET* mask, bool interrupt_handler); static int calc_live_regs (HARD_REG_SET *); @@ -6845,7 +6845,7 @@ emit_frame_insn (rtx x) } /* Output RTL to push register RN onto the stack. */ -static rtx +static rtx_insn * push (int rn) { rtx x; @@ -6857,7 +6857,7 @@ push (int rn) && ! TARGET_FPU_SINGLE && FP_OR_XD_REGISTER_P (rn)) { if (FP_REGISTER_P (rn) && (rn - FIRST_FP_REG) & 1) - return NULL_RTX; + return nullptr; x = gen_push_4 (gen_rtx_REG (DFmode, rn)); } else if (TARGET_SH2E && FP_REGISTER_P (rn)) @@ -6865,9 +6865,9 @@ push (int rn) else x = gen_push (gen_rtx_REG (SImode, rn)); - x = emit_frame_insn (x); - add_reg_note (x, REG_INC, gen_rtx_REG (SImode, STACK_POINTER_REGNUM)); - return x; + rtx_insn *insn = emit_frame_insn (x); + add_reg_note (insn, REG_INC, gen_rtx_REG (SImode, STACK_POINTER_REGNUM)); + return insn; } /* Output RTL to pop register RN from the stack. */ @@ -10736,7 +10736,7 @@ sh_register_move_cost (machine_mode mode, return 2 * ((GET_MODE_SIZE (mode) + 3) / 4U); } -static rtx +static rtx_insn * emit_load_ptr (rtx reg, rtx addr) { rtx mem = gen_const_mem (ptr_mode, addr); diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc index ffa0932b746d..a8a8a355ebad 100644 --- a/gcc/config/sh/sh_treg_combine.cc +++ b/gcc/config/sh/sh_treg_combine.cc @@ -586,7 +586,7 @@ private: // Create an insn rtx that performs a logical not (test != 0) on the src_reg // and stores the result in dst_reg. - rtx make_not_reg_insn (rtx dst_reg, rtx src_reg) const; + rtx_insn *make_not_reg_insn (rtx dst_reg, rtx src_reg) const; // Create an insn rtx that inverts the ccreg. rtx_insn *make_inv_ccreg_insn (void) const; @@ -919,7 +919,7 @@ sh_treg_combine::can_remove_comparison (const bb_entry& e, return true; } -rtx +rtx_insn * sh_treg_combine::make_not_reg_insn (rtx dst_reg, rtx src_reg) const { // On SH we can do only SImode and DImode comparisons. diff --git a/gcc/config/stormy16/stormy16.cc b/gcc/config/stormy16/stormy16.cc index 8caa367f6afc..29011fe6fcf4 100644 --- a/gcc/config/stormy16/stormy16.cc +++ b/gcc/config/stormy16/stormy16.cc @@ -54,7 +54,7 @@ /* This file should be included last. */ #include "target-def.h" -static rtx emit_addhi3_postreload (rtx, rtx, rtx); +static rtx_insn *emit_addhi3_postreload (rtx, rtx, rtx); static void xstormy16_asm_out_constructor (rtx, int); static void xstormy16_asm_out_destructor (rtx, int); static void xstormy16_asm_output_mi_thunk (FILE *, tree, HOST_WIDE_INT, @@ -1161,7 +1161,7 @@ xstormy16_initial_elimination_offset (int from, int to) return result; } -static rtx +static rtx_insn * emit_addhi3_postreload (rtx dest, rtx src0, rtx src1) { rtx set, clobber; diff --git a/gcc/config/visium/visium.cc b/gcc/config/visium/visium.cc index 5ba6f0d7984b..99b4f9dd4c4a 100644 --- a/gcc/config/visium/visium.cc +++ b/gcc/config/visium/visium.cc @@ -3748,12 +3748,12 @@ visium_epilogue_uses (int regno) /* Wrapper around emit_insn that sets RTX_FRAME_RELATED_P on the insn. */ -static rtx +static rtx_insn * emit_frame_insn (rtx x) { - x = emit_insn (x); - RTX_FRAME_RELATED_P (x) = 1; - return x; + rtx_insn *insn = emit_insn (x); + RTX_FRAME_RELATED_P (insn) = 1; + return insn; } /* Allocate ALLOC bytes on the stack and save the registers LOW_REGNO to
