https://gcc.gnu.org/g:a9f1dfabce639f7731263e1f3badda79d7c892ed
commit r17-5853-ga9f1dfabce639f7731263e1f3badda79d7c892ed Author: Trevor Saunders <[email protected]> Date: Sat Oct 24 20:52:47 2026 +0000 Split pattern locals from the insns they emit gcc/ChangeLog: * config/arc/arc.cc (arc_restore_callee_leave, arc_restore_callee_milli, arc_reorg): Split the pattern from the emitted insn. * config/arm/arm.cc (vfp_emit_fstmd, arm_emit_strd_push, arm_emit_multi_reg_pop, arm_emit_vfp_multi_reg_pop, thumb2_emit_ldrd_pop, arm_emit_ldrd_pop, arm_expand_epilogue): Likewise. * config/epiphany/epiphany.md (*ashlv2si3_i): Likewise. * config/msp430/msp430.cc (msp430_expand_helper): Likewise. * config/nds32/nds32.cc (nds32_emit_stack_push_multiple, nds32_emit_stack_pop_multiple, nds32_emit_stack_v3push, nds32_emit_stack_v3pop, nds32_emit_adjust_frame): Likewise. * config/sh/sh.cc (pop, push_regs): Likewise. Diff: --- gcc/config/arc/arc.cc | 63 ++++++++++++++++--------------- gcc/config/arm/arm.cc | 79 +++++++++++++++++++-------------------- gcc/config/epiphany/epiphany.md | 8 ++-- gcc/config/msp430/msp430.cc | 6 +-- gcc/config/nds32/nds32.cc | 82 ++++++++++++++++++++--------------------- gcc/config/sh/sh.cc | 22 +++++------ 6 files changed, 132 insertions(+), 128 deletions(-) diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc index 30353c82d6ba..4bcabb3c7ebe 100644 --- a/gcc/config/arc/arc.cc +++ b/gcc/config/arc/arc.cc @@ -3365,7 +3365,7 @@ arc_restore_callee_leave (uint64_t gmask, int start_reg = ENTER_LEAVE_START_REG; int end_reg = ENTER_LEAVE_END_REG; int regno, indx, off, nregs; - rtx insn, reg, mem; + rtx body, reg, mem; int frame_allocated = 0; for (regno = start_reg; regno <= end_reg && (gmask & (1ULL << regno));) @@ -3376,12 +3376,12 @@ arc_restore_callee_leave (uint64_t gmask, nregs += restore_blink ? 1 : 0; nregs += restore_fp ? 1 : 0; - insn = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (nregs + 1 + body = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (nregs + 1 + (return_p ? 1 : 0))); indx = 0; if (return_p) - XVECEXP (insn, 0, indx++) = ret_rtx; + XVECEXP (body, 0, indx++) = ret_rtx; if (restore_fp) { @@ -3405,7 +3405,7 @@ arc_restore_callee_leave (uint64_t gmask, stack_pointer_rtx, offset + nregs * UNITS_PER_WORD)); RTX_FRAME_RELATED_P (reg) = 1; - XVECEXP (insn, 0, indx++) = reg; + XVECEXP (body, 0, indx++) = reg; off = nregs * UNITS_PER_WORD; if (restore_blink) @@ -3414,8 +3414,8 @@ arc_restore_callee_leave (uint64_t gmask, mem = gen_frame_mem (Pmode, plus_constant (Pmode, stack_pointer_rtx, off)); - XVECEXP (insn, 0, indx) = gen_rtx_SET (reg, mem); - RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx++)) = 1; + XVECEXP (body, 0, indx) = gen_rtx_SET (reg, mem); + RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx++)) = 1; off -= UNITS_PER_WORD; } @@ -3427,8 +3427,8 @@ arc_restore_callee_leave (uint64_t gmask, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, off)); - XVECEXP (insn, 0, indx) = gen_rtx_SET (reg, mem); - RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx)) = 1; + XVECEXP (body, 0, indx) = gen_rtx_SET (reg, mem); + RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx)) = 1; gmask = gmask & ~(1ULL << regno); } @@ -3437,19 +3437,20 @@ arc_restore_callee_leave (uint64_t gmask, mem = gen_frame_mem (Pmode, plus_constant (Pmode, stack_pointer_rtx, off)); - XVECEXP (insn, 0, indx) = gen_rtx_SET (hard_frame_pointer_rtx, mem); - RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx++)) = 1; + XVECEXP (body, 0, indx) = gen_rtx_SET (hard_frame_pointer_rtx, mem); + RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx++)) = 1; off -= UNITS_PER_WORD; } gcc_assert (off == 0); + rtx_insn *insn; if (return_p) { - insn = emit_jump_insn (insn); + insn = emit_jump_insn (body); RTX_FRAME_RELATED_P (insn) = 1; } else - insn = frame_insn (insn); + insn = frame_insn (body); add_reg_note (insn, REG_INC, stack_pointer_rtx); @@ -3615,7 +3616,7 @@ arc_restore_callee_milli (uint64_t gmask, int start_reg = 13; int end_reg = 25; int regno, indx, off, nregs; - rtx insn, reg, mem; + rtx body, reg, mem; int frame_allocated = 0; for (regno = start_reg; regno <= end_reg && (gmask & (1ULL << regno));) @@ -3646,7 +3647,7 @@ arc_restore_callee_milli (uint64_t gmask, } /* Start generate millicode call. */ - insn = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc ((return_p ? 1 : 0) + body = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc ((return_p ? 1 : 0) + nregs + 1)); indx = 0; @@ -3655,17 +3656,17 @@ arc_restore_callee_milli (uint64_t gmask, /* sibling call, the blink is restored with the help of the value held into r12. */ reg = gen_rtx_REG (Pmode, 12); - XVECEXP (insn, 0, indx++) = ret_rtx; - XVECEXP (insn, 0, indx++) = - gen_rtx_SET (stack_pointer_rtx, - gen_rtx_PLUS (Pmode, stack_pointer_rtx, reg)); + XVECEXP (body, 0, indx++) = ret_rtx; + XVECEXP (body, 0, indx++) + = gen_rtx_SET (stack_pointer_rtx, + gen_rtx_PLUS (Pmode, stack_pointer_rtx, reg)); frame_allocated += UNITS_PER_WORD; } else { /* This is a call, we clobber blink. */ - XVECEXP (insn, 0, nregs) = - gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM)); + XVECEXP (body, 0, nregs) + = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM)); } for (regno = start_reg, off = 0; @@ -3676,8 +3677,8 @@ arc_restore_callee_milli (uint64_t gmask, mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx, off)); - XVECEXP (insn, 0, indx) = gen_rtx_SET (reg, mem); - RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx)) = 1; + XVECEXP (body, 0, indx) = gen_rtx_SET (reg, mem); + RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx)) = 1; gmask = gmask & ~(1ULL << regno); } @@ -3697,16 +3698,17 @@ arc_restore_callee_milli (uint64_t gmask, } /* Emit millicode call. */ + rtx_insn *insn; if (return_p) { reg = gen_rtx_REG (Pmode, 12); frame_insn (gen_rtx_SET (reg, GEN_INT (off))); frame_allocated += off; - insn = emit_jump_insn (insn); + insn = emit_jump_insn (body); RTX_FRAME_RELATED_P (insn) = 1; } else - insn = frame_insn (insn); + insn = frame_insn (body); /* Add DWARF info. */ for (regno = start_reg; regno <= end_reg; regno++) @@ -8584,7 +8586,7 @@ arc_reorg (void) else { /* Check if this is a data dependency. */ - rtx op, cc_clob_rtx, op0, op1, brcc_insn, note; + rtx op, cc_clob_rtx, op0, op1, brcc_body, note; rtx cmp0, cmp1; /* Make sure we can use it for brcc insns. */ @@ -8664,14 +8666,15 @@ arc_reorg (void) else cc_clob_rtx = gen_rtx_REG (CCmode, CC_REG); - brcc_insn + brcc_body = gen_rtx_IF_THEN_ELSE (VOIDmode, op, label, pc_rtx); - brcc_insn = gen_rtx_SET (pc_rtx, brcc_insn); + brcc_body = gen_rtx_SET (pc_rtx, brcc_body); cc_clob_rtx = gen_rtx_CLOBBER (VOIDmode, cc_clob_rtx); - brcc_insn + brcc_body = gen_rtx_PARALLEL - (VOIDmode, gen_rtvec (2, brcc_insn, cc_clob_rtx)); - brcc_insn = emit_jump_insn_before (brcc_insn, insn); + (VOIDmode, gen_rtvec (2, brcc_body, cc_clob_rtx)); + rtx_jump_insn *brcc_insn + = emit_jump_insn_before (brcc_body, insn); JUMP_LABEL (brcc_insn) = JUMP_LABEL (insn); note = find_reg_note (insn, REG_BR_PROB, 0); diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index b7b81b703f0c..58ed06255d7a 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -19015,9 +19015,9 @@ vfp_emit_fstmd (int base_reg, int count) XVECEXP (dwarf, 0, i + 1) = tmp; } - par = emit_insn (par); - add_reg_note (par, REG_FRAME_RELATED_EXPR, dwarf); - RTX_FRAME_RELATED_P (par) = 1; + rtx_insn *insn = emit_insn (par); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); + RTX_FRAME_RELATED_P (insn) = 1; return count * 8; } @@ -21259,11 +21259,11 @@ arm_emit_strd_push (unsigned long saved_regs_mask) tmp = gen_rtx_SET (mem, gen_rtx_REG (DImode, j)); RTX_FRAME_RELATED_P (tmp) = 1; - tmp = emit_insn (tmp); + rtx_insn *tmp1 = emit_insn (tmp); /* Record the first store insn. */ if (dwarf_index == 1) - insn = tmp; + insn = tmp1; /* Generate dwarf info. */ mem = gen_frame_mem (SImode, @@ -21306,11 +21306,11 @@ arm_emit_strd_push (unsigned long saved_regs_mask) tmp = gen_rtx_SET (mem, gen_rtx_REG (SImode, j)); RTX_FRAME_RELATED_P (tmp) = 1; - tmp = emit_insn (tmp); + rtx_insn *tmp1 = emit_insn (tmp); /* Record the first store insn. */ if (dwarf_index == 1) - insn = tmp; + insn = tmp1; /* Generate dwarf info. */ mem = gen_frame_mem (SImode, @@ -21617,14 +21617,14 @@ arm_emit_multi_reg_pop (unsigned long saved_regs_mask) elt++; } - par = return_in_pc ? emit_jump_insn (par) : emit_insn (par); - REG_NOTES (par) = dwarf; + rtx_insn *insn = return_in_pc ? emit_jump_insn (par) : emit_insn (par); + REG_NOTES (insn) = dwarf; if (!return_in_pc && emit_update) - arm_add_cfa_adjust_cfa_note (par, UNITS_PER_WORD * num_regs, + arm_add_cfa_adjust_cfa_note (insn, UNITS_PER_WORD * num_regs, stack_pointer_rtx, stack_pointer_rtx); else if (!return_in_pc) - RTX_FRAME_RELATED_P (par) = 1; + RTX_FRAME_RELATED_P (insn) = 1; } /* Generate and emit an insn pattern that we will recognize as a pop_multi @@ -21690,17 +21690,17 @@ arm_emit_vfp_multi_reg_pop (int first_reg, int num_regs, rtx base_reg) j++; } - par = emit_insn (par); - REG_NOTES (par) = dwarf; + rtx_insn *insn = emit_insn (par); + REG_NOTES (insn) = dwarf; /* Make sure cfa doesn't leave with IP_REGNUM to allow unwinding from FP. */ if (REGNO (base_reg) == IP_REGNUM) { - RTX_FRAME_RELATED_P (par) = 1; - add_reg_note (par, REG_CFA_DEF_CFA, hard_frame_pointer_rtx); + RTX_FRAME_RELATED_P (insn) = 1; + add_reg_note (insn, REG_CFA_DEF_CFA, hard_frame_pointer_rtx); } else - arm_add_cfa_adjust_cfa_note (par, 2 * UNITS_PER_WORD * num_regs, + arm_add_cfa_adjust_cfa_note (insn, 2 * UNITS_PER_WORD * num_regs, base_reg, base_reg); } @@ -21773,9 +21773,9 @@ thumb2_emit_ldrd_pop (unsigned long saved_regs_mask) /* When saved-register index (i) is odd, RTXs for both the registers to be loaded are generated in above given LDRD pattern, and the pattern can be emitted now. */ - par = emit_insn (par); - REG_NOTES (par) = dwarf; - RTX_FRAME_RELATED_P (par) = 1; + rtx_insn *insn = emit_insn (par); + REG_NOTES (insn) = dwarf; + RTX_FRAME_RELATED_P (insn) = 1; } i++; @@ -21791,10 +21791,10 @@ thumb2_emit_ldrd_pop (unsigned long saved_regs_mask) tmp = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, 4 * i)); RTX_FRAME_RELATED_P (tmp) = 1; - tmp = emit_insn (tmp); + rtx_insn *insn = emit_insn (tmp); if (!return_in_pc) { - arm_add_cfa_adjust_cfa_note (tmp, UNITS_PER_WORD * i, + arm_add_cfa_adjust_cfa_note (insn, UNITS_PER_WORD * i, stack_pointer_rtx, stack_pointer_rtx); } @@ -21829,9 +21829,9 @@ thumb2_emit_ldrd_pop (unsigned long saved_regs_mask) } else { - par = emit_insn (tmp); - REG_NOTES (par) = dwarf; - arm_add_cfa_adjust_cfa_note (par, UNITS_PER_WORD, + rtx_insn *insn = emit_insn (tmp); + REG_NOTES (insn) = dwarf; + arm_add_cfa_adjust_cfa_note (insn, UNITS_PER_WORD, stack_pointer_rtx, stack_pointer_rtx); } @@ -21888,8 +21888,8 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) mem = gen_frame_mem (DImode, stack_pointer_rtx); tmp = gen_rtx_SET (gen_rtx_REG (DImode, j), mem); - tmp = emit_insn (tmp); - RTX_FRAME_RELATED_P (tmp) = 1; + rtx_insn *insn = emit_insn (tmp); + RTX_FRAME_RELATED_P (insn) = 1; /* Generate dwarf info. */ @@ -21900,7 +21900,7 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) gen_rtx_REG (SImode, j + 1), dwarf); - REG_NOTES (tmp) = dwarf; + REG_NOTES (insn) = dwarf; offset += 8; j += 2; @@ -21917,11 +21917,11 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) mem = gen_frame_mem (SImode, stack_pointer_rtx); tmp = gen_rtx_SET (gen_rtx_REG (SImode, j), mem); - tmp = emit_insn (tmp); - RTX_FRAME_RELATED_P (tmp) = 1; + rtx_insn *insn = emit_insn (tmp); + RTX_FRAME_RELATED_P (insn) = 1; /* Generate dwarf info. */ - REG_NOTES (tmp) = alloc_reg_note (REG_CFA_RESTORE, + REG_NOTES (insn) = alloc_reg_note (REG_CFA_RESTORE, gen_rtx_REG (SImode, j), NULL_RTX); @@ -21941,8 +21941,8 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) plus_constant (Pmode, stack_pointer_rtx, offset)); - tmp = emit_insn (tmp); - arm_add_cfa_adjust_cfa_note (tmp, offset, + rtx_insn *insn = emit_insn (tmp); + arm_add_cfa_adjust_cfa_note (insn, offset, stack_pointer_rtx, stack_pointer_rtx); offset = 0; } @@ -21958,14 +21958,14 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) stack_pointer_rtx))); RTX_FRAME_RELATED_P (tmp) = 1; XVECEXP (par, 0, 1) = tmp; - par = emit_jump_insn (par); + rtx_insn *insn = emit_jump_insn (par); /* Generate dwarf info. */ dwarf = alloc_reg_note (REG_CFA_RESTORE, gen_rtx_REG (SImode, PC_REGNUM), NULL_RTX); - REG_NOTES (par) = dwarf; - arm_add_cfa_adjust_cfa_note (par, UNITS_PER_WORD, + REG_NOTES (insn) = dwarf; + arm_add_cfa_adjust_cfa_note (insn, UNITS_PER_WORD, stack_pointer_rtx, stack_pointer_rtx); } } @@ -27133,12 +27133,13 @@ arm_expand_epilogue (bool really_return) } else { - insn = emit_insn (gen_movsi (gen_rtx_REG (SImode, i), - addr)); - REG_NOTES (insn) = alloc_reg_note (REG_CFA_RESTORE, + rtx_insn *move + = emit_insn (gen_movsi (gen_rtx_REG (SImode, i), + addr)); + REG_NOTES (move) = alloc_reg_note (REG_CFA_RESTORE, gen_rtx_REG (SImode, i), NULL_RTX); - arm_add_cfa_adjust_cfa_note (insn, UNITS_PER_WORD, + arm_add_cfa_adjust_cfa_note (move, UNITS_PER_WORD, stack_pointer_rtx, stack_pointer_rtx); } diff --git a/gcc/config/epiphany/epiphany.md b/gcc/config/epiphany/epiphany.md index 934c1949b933..2114827c439e 100644 --- a/gcc/config/epiphany/epiphany.md +++ b/gcc/config/epiphany/epiphany.md @@ -2623,7 +2623,7 @@ gcc_assert (!reg_overlap_mentioned_p (operands[5], operands[4])); operands[9] = XVECEXP (operands[3], 0, XVECLEN (operands[3], 0) - 2); operands[10] = XVECEXP (operands[3], 0, XVECLEN (operands[3], 0) - 1); - rtx insn + rtx body = (gen_rtx_PARALLEL (VOIDmode, gen_rtvec @@ -2632,10 +2632,10 @@ gen_rtx_MULT (SImode, operands[6], operands[4])), gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CC_FPmode, CCFP_REGNUM)), operands[9], operands[10]))); - insn = emit_insn (insn); + rtx_insn *insn = emit_insn (body); add_reg_note (insn, REG_EQUAL, gen_rtx_ASHIFT (SImode, operands[6], operands[2])); - insn + body = (gen_rtx_PARALLEL (VOIDmode, gen_rtvec @@ -2644,7 +2644,7 @@ gen_rtx_MULT (SImode, operands[8], operands[4])), gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (CC_FPmode, CCFP_REGNUM)), operands[9], operands[10]))); - insn = emit_insn (insn); + insn = emit_insn (body); add_reg_note (insn, REG_EQUAL, gen_rtx_ASHIFT (SImode, operands[7], operands[2])); DONE; diff --git a/gcc/config/msp430/msp430.cc b/gcc/config/msp430/msp430.cc index 343041257edd..bf9fdcba7c8f 100644 --- a/gcc/config/msp430/msp430.cc +++ b/gcc/config/msp430/msp430.cc @@ -3321,8 +3321,8 @@ msp430_expand_helper (rtx *operands, const char *helper_name, c = gen_call_value_internal (gen_rtx_REG (arg0mode, 12), fsym, GEN_INT (0)); - c = emit_call_insn (c); - RTL_CONST_CALL_P (c) = 1; + rtx_insn *call = emit_call_insn (c); + RTL_CONST_CALL_P (call) = 1; /* Add register usage information for the arguments to the call. */ fusage = NULL; @@ -3336,7 +3336,7 @@ msp430_expand_helper (rtx *operands, const char *helper_name, else use_regs (&fusage, arg2, arg1sz); } - add_function_usage_to (c, fusage); + add_function_usage_to (call, fusage); emit_move_insn (operands[0], /* Return value will always start in R12. */ diff --git a/gcc/config/nds32/nds32.cc b/gcc/config/nds32/nds32.cc index 0aae11125071..1c84f21122e3 100644 --- a/gcc/config/nds32/nds32.cc +++ b/gcc/config/nds32/nds32.cc @@ -733,7 +733,7 @@ nds32_emit_stack_push_multiple (unsigned Rb, unsigned Re, rtx mem; rtx push_rtx; rtx adjust_sp_rtx; - rtx parallel_insn; + rtx parallel_body; rtx dwarf; /* We need to provide a customized rtx which contains @@ -771,7 +771,7 @@ nds32_emit_stack_push_multiple (unsigned Rb, unsigned Re, /* In addition to used registers, we need one more space for (set sp sp-x) rtx. */ - parallel_insn = gen_rtx_PARALLEL (VOIDmode, + parallel_body = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (num_use_regs + 1)); par_index = 0; @@ -791,7 +791,7 @@ nds32_emit_stack_push_multiple (unsigned Rb, unsigned Re, stack_pointer_rtx, offset)); push_rtx = gen_rtx_SET (mem, reg); - XVECEXP (parallel_insn, 0, par_index) = push_rtx; + XVECEXP (parallel_body, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; par_index++; @@ -805,7 +805,7 @@ nds32_emit_stack_push_multiple (unsigned Rb, unsigned Re, stack_pointer_rtx, offset)); push_rtx = gen_rtx_SET (mem, reg); - XVECEXP (parallel_insn, 0, par_index) = push_rtx; + XVECEXP (parallel_body, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; par_index++; @@ -817,7 +817,7 @@ nds32_emit_stack_push_multiple (unsigned Rb, unsigned Re, stack_pointer_rtx, offset)); push_rtx = gen_rtx_SET (mem, reg); - XVECEXP (parallel_insn, 0, par_index) = push_rtx; + XVECEXP (parallel_body, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; par_index++; @@ -829,7 +829,7 @@ nds32_emit_stack_push_multiple (unsigned Rb, unsigned Re, stack_pointer_rtx, offset)); push_rtx = gen_rtx_SET (mem, reg); - XVECEXP (parallel_insn, 0, par_index) = push_rtx; + XVECEXP (parallel_body, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; par_index++; @@ -842,10 +842,10 @@ nds32_emit_stack_push_multiple (unsigned Rb, unsigned Re, adjust_sp_rtx = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, offset)); - XVECEXP (parallel_insn, 0, par_index) = adjust_sp_rtx; + XVECEXP (parallel_body, 0, par_index) = adjust_sp_rtx; RTX_FRAME_RELATED_P (adjust_sp_rtx) = 1; - parallel_insn = emit_insn (parallel_insn); + rtx_insn *parallel_insn = emit_insn (parallel_body); /* The insn rtx 'parallel_insn' will change frame layout. We need to use RTX_FRAME_RELATED_P so that GCC is able to @@ -881,7 +881,7 @@ nds32_emit_stack_pop_multiple (unsigned Rb, unsigned Re, rtx mem; rtx pop_rtx; rtx adjust_sp_rtx; - rtx parallel_insn; + rtx parallel_body; rtx dwarf = NULL_RTX; /* We need to provide a customized rtx which contains @@ -919,7 +919,7 @@ nds32_emit_stack_pop_multiple (unsigned Rb, unsigned Re, /* In addition to used registers, we need one more space for (set sp sp+x) rtx. */ - parallel_insn = gen_rtx_PARALLEL (VOIDmode, + parallel_body = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (num_use_regs + 1)); par_index = 0; @@ -939,7 +939,7 @@ nds32_emit_stack_pop_multiple (unsigned Rb, unsigned Re, stack_pointer_rtx, offset)); pop_rtx = gen_rtx_SET (reg, mem); - XVECEXP (parallel_insn, 0, par_index) = pop_rtx; + XVECEXP (parallel_body, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; par_index++; @@ -955,7 +955,7 @@ nds32_emit_stack_pop_multiple (unsigned Rb, unsigned Re, stack_pointer_rtx, offset)); pop_rtx = gen_rtx_SET (reg, mem); - XVECEXP (parallel_insn, 0, par_index) = pop_rtx; + XVECEXP (parallel_body, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; par_index++; @@ -969,7 +969,7 @@ nds32_emit_stack_pop_multiple (unsigned Rb, unsigned Re, stack_pointer_rtx, offset)); pop_rtx = gen_rtx_SET (reg, mem); - XVECEXP (parallel_insn, 0, par_index) = pop_rtx; + XVECEXP (parallel_body, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; par_index++; @@ -983,7 +983,7 @@ nds32_emit_stack_pop_multiple (unsigned Rb, unsigned Re, stack_pointer_rtx, offset)); pop_rtx = gen_rtx_SET (reg, mem); - XVECEXP (parallel_insn, 0, par_index) = pop_rtx; + XVECEXP (parallel_body, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; par_index++; @@ -997,12 +997,12 @@ nds32_emit_stack_pop_multiple (unsigned Rb, unsigned Re, adjust_sp_rtx = gen_rtx_SET (stack_pointer_rtx, plus_constant (Pmode, stack_pointer_rtx, offset)); - XVECEXP (parallel_insn, 0, par_index) = adjust_sp_rtx; + XVECEXP (parallel_body, 0, par_index) = adjust_sp_rtx; /* Tell gcc we adjust SP in this insn. */ dwarf = alloc_reg_note (REG_CFA_ADJUST_CFA, copy_rtx (adjust_sp_rtx), dwarf); - parallel_insn = emit_insn (parallel_insn); + rtx_insn *parallel_insn = emit_insn (parallel_body); /* The insn rtx 'parallel_insn' will change frame layout. We need to use RTX_FRAME_RELATED_P so that GCC is able to @@ -1032,7 +1032,7 @@ nds32_emit_stack_v3push (unsigned Rb, rtx mem; rtx push_rtx; rtx adjust_sp_rtx; - rtx parallel_insn; + rtx parallel_body; /* We need to provide a customized rtx which contains necessary information for data analysis, @@ -1062,7 +1062,7 @@ nds32_emit_stack_v3push (unsigned Rb, /* In addition to used registers, we need one more space for (set sp sp-x-imm8u) rtx. */ - parallel_insn = gen_rtx_PARALLEL (VOIDmode, + parallel_body = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (num_use_regs + 1)); par_index = 0; @@ -1079,7 +1079,7 @@ nds32_emit_stack_v3push (unsigned Rb, stack_pointer_rtx, offset)); push_rtx = gen_rtx_SET (mem, reg); - XVECEXP (parallel_insn, 0, par_index) = push_rtx; + XVECEXP (parallel_body, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; par_index++; @@ -1091,7 +1091,7 @@ nds32_emit_stack_v3push (unsigned Rb, stack_pointer_rtx, offset)); push_rtx = gen_rtx_SET (mem, reg); - XVECEXP (parallel_insn, 0, par_index) = push_rtx; + XVECEXP (parallel_body, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; par_index++; @@ -1101,7 +1101,7 @@ nds32_emit_stack_v3push (unsigned Rb, stack_pointer_rtx, offset)); push_rtx = gen_rtx_SET (mem, reg); - XVECEXP (parallel_insn, 0, par_index) = push_rtx; + XVECEXP (parallel_body, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; par_index++; @@ -1111,7 +1111,7 @@ nds32_emit_stack_v3push (unsigned Rb, stack_pointer_rtx, offset)); push_rtx = gen_rtx_SET (mem, reg); - XVECEXP (parallel_insn, 0, par_index) = push_rtx; + XVECEXP (parallel_body, 0, par_index) = push_rtx; RTX_FRAME_RELATED_P (push_rtx) = 1; offset = offset + 4; par_index++; @@ -1125,10 +1125,10 @@ nds32_emit_stack_v3push (unsigned Rb, plus_constant (Pmode, stack_pointer_rtx, offset - imm8u)); - XVECEXP (parallel_insn, 0, par_index) = adjust_sp_rtx; + XVECEXP (parallel_body, 0, par_index) = adjust_sp_rtx; RTX_FRAME_RELATED_P (adjust_sp_rtx) = 1; - parallel_insn = emit_insn (parallel_insn); + rtx_insn *parallel_insn = emit_insn (parallel_body); /* The insn rtx 'parallel_insn' will change frame layout. We need to use RTX_FRAME_RELATED_P so that GCC is able to @@ -1155,7 +1155,7 @@ nds32_emit_stack_v3pop (unsigned Rb, rtx mem; rtx pop_rtx; rtx adjust_sp_rtx; - rtx parallel_insn; + rtx parallel_body; rtx dwarf = NULL_RTX; /* We need to provide a customized rtx which contains @@ -1186,7 +1186,7 @@ nds32_emit_stack_v3pop (unsigned Rb, /* In addition to used registers, we need one more space for (set sp sp+x+imm8u) rtx. */ - parallel_insn = gen_rtx_PARALLEL (VOIDmode, + parallel_body = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (num_use_regs + 1)); par_index = 0; @@ -1203,7 +1203,7 @@ nds32_emit_stack_v3pop (unsigned Rb, stack_pointer_rtx, offset)); pop_rtx = gen_rtx_SET (reg, mem); - XVECEXP (parallel_insn, 0, par_index) = pop_rtx; + XVECEXP (parallel_body, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; par_index++; @@ -1217,7 +1217,7 @@ nds32_emit_stack_v3pop (unsigned Rb, stack_pointer_rtx, offset)); pop_rtx = gen_rtx_SET (reg, mem); - XVECEXP (parallel_insn, 0, par_index) = pop_rtx; + XVECEXP (parallel_body, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; par_index++; @@ -1229,7 +1229,7 @@ nds32_emit_stack_v3pop (unsigned Rb, stack_pointer_rtx, offset)); pop_rtx = gen_rtx_SET (reg, mem); - XVECEXP (parallel_insn, 0, par_index) = pop_rtx; + XVECEXP (parallel_body, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; par_index++; @@ -1241,7 +1241,7 @@ nds32_emit_stack_v3pop (unsigned Rb, stack_pointer_rtx, offset)); pop_rtx = gen_rtx_SET (reg, mem); - XVECEXP (parallel_insn, 0, par_index) = pop_rtx; + XVECEXP (parallel_body, 0, par_index) = pop_rtx; RTX_FRAME_RELATED_P (pop_rtx) = 1; offset = offset + 4; par_index++; @@ -1255,7 +1255,7 @@ nds32_emit_stack_v3pop (unsigned Rb, plus_constant (Pmode, stack_pointer_rtx, offset + imm8u)); - XVECEXP (parallel_insn, 0, par_index) = adjust_sp_rtx; + XVECEXP (parallel_body, 0, par_index) = adjust_sp_rtx; if (frame_pointer_needed) { @@ -1273,7 +1273,7 @@ nds32_emit_stack_v3pop (unsigned Rb, copy_rtx (adjust_sp_rtx), dwarf); } - parallel_insn = emit_insn (parallel_insn); + rtx_insn *parallel_insn = emit_insn (parallel_body); /* The insn rtx 'parallel_insn' will change frame layout. We need to use RTX_FRAME_RELATED_P so that GCC is able to @@ -1324,7 +1324,7 @@ static void nds32_emit_adjust_frame (rtx to_reg, rtx from_reg, int adjust_value) { rtx tmp_reg; - rtx frame_adjust_insn; + rtx_insn *frame_adjust_insn; rtx adjust_value_rtx = GEN_INT (adjust_value); if (adjust_value == 0) @@ -1344,11 +1344,11 @@ nds32_emit_adjust_frame (rtx to_reg, rtx from_reg, int adjust_value) emit_move_insn (tmp_reg, adjust_value_rtx); /* Create new 'add' rtx. */ - frame_adjust_insn = gen_addsi3 (to_reg, - from_reg, - tmp_reg); + rtx adj_pat = gen_addsi3 (to_reg, + from_reg, + tmp_reg); /* Emit rtx into insn list and receive its transformed insn rtx. */ - frame_adjust_insn = emit_insn (frame_adjust_insn); + frame_adjust_insn = emit_insn (adj_pat); /* Because (tmp_reg <- full_value) may be split into two rtl patterns, we cannot set its RTX_FRAME_RELATED_P. @@ -1367,11 +1367,11 @@ nds32_emit_adjust_frame (rtx to_reg, rtx from_reg, int adjust_value) else { /* Generate sp adjustment instruction if and only if sp_adjust != 0. */ - frame_adjust_insn = gen_addsi3 (to_reg, - from_reg, - adjust_value_rtx); + rtx adj_pat = gen_addsi3 (to_reg, + from_reg, + adjust_value_rtx); /* Emit rtx into instructions list and receive INSN rtx form. */ - frame_adjust_insn = emit_insn (frame_adjust_insn); + frame_adjust_insn = emit_insn (adj_pat); } /* The insn rtx 'sp_adjust_insn' will change frame layout. diff --git a/gcc/config/sh/sh.cc b/gcc/config/sh/sh.cc index c583baedd90b..398e85a8cfc5 100644 --- a/gcc/config/sh/sh.cc +++ b/gcc/config/sh/sh.cc @@ -6891,19 +6891,19 @@ pop (int rn) else x = gen_pop (gen_rtx_REG (SImode, rn)); - x = emit_insn (x); + rtx_insn *insn = emit_insn (x); sp_reg = gen_rtx_REG (SImode, STACK_POINTER_REGNUM); - reg = copy_rtx (GET_CODE (PATTERN (x)) == PARALLEL - ? SET_DEST (XVECEXP (PATTERN (x), 0, 0)) - : SET_DEST (PATTERN (x))); - add_reg_note (x, REG_CFA_RESTORE, reg); - add_reg_note (x, REG_CFA_ADJUST_CFA, + reg = copy_rtx (GET_CODE (PATTERN (insn)) == PARALLEL + ? SET_DEST (XVECEXP (PATTERN (insn), 0, 0)) + : SET_DEST (PATTERN (insn))); + add_reg_note (insn, REG_CFA_RESTORE, reg); + add_reg_note (insn, REG_CFA_ADJUST_CFA, gen_rtx_SET (sp_reg, plus_constant (SImode, sp_reg, GET_MODE_SIZE (GET_MODE (reg))))); - add_reg_note (x, REG_INC, gen_rtx_REG (SImode, STACK_POINTER_REGNUM)); - RTX_FRAME_RELATED_P (x) = 1; + add_reg_note (insn, REG_INC, gen_rtx_REG (SImode, STACK_POINTER_REGNUM)); + RTX_FRAME_RELATED_P (insn) = 1; } /* Generate code to push the regs specified in the mask. */ @@ -6974,16 +6974,16 @@ push_regs (HARD_REG_SET *mask, bool interrupt_handler) insns. */ emit_insn (gen_blockage ()); x = gen_movml_push_banked (sp_reg); - x = emit_frame_insn (x); + rtx_insn *insn = emit_frame_insn (x); for (int i = FIRST_BANKED_REG; i <= LAST_BANKED_REG; i++) { mem = gen_rtx_MEM (SImode, plus_constant (Pmode, sp_reg, i * 4)); reg = gen_rtx_REG (SImode, i); - add_reg_note (x, REG_CFA_OFFSET, gen_rtx_SET (mem, reg)); + add_reg_note (insn, REG_CFA_OFFSET, gen_rtx_SET (mem, reg)); } set = gen_rtx_SET (sp_reg, plus_constant (Pmode, sp_reg, - 32)); - add_reg_note (x, REG_CFA_ADJUST_CFA, set); + add_reg_note (insn, REG_CFA_ADJUST_CFA, set); emit_insn (gen_blockage ()); } else
