From patchwork Tue May 3 11:53:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Schmidt X-Patchwork-Id: 93773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 9A9BDB6F10 for ; Tue, 3 May 2011 21:54:03 +1000 (EST) Received: (qmail 29816 invoked by alias); 3 May 2011 11:54:01 -0000 Received: (qmail 29802 invoked by uid 22791); 3 May 2011 11:53:59 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 03 May 2011 11:53:44 +0000 Received: (qmail 27971 invoked from network); 3 May 2011 11:53:42 -0000 Received: from unknown (HELO ?84.152.192.215?) (bernds@127.0.0.2) by mail.codesourcery.com with ESMTPA; 3 May 2011 11:53:42 -0000 Message-ID: <4DBFECAF.5040405@codesourcery.com> Date: Tue, 03 May 2011 13:53:19 +0200 From: Bernd Schmidt User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.15) Gecko/20110325 Lightning/1.0b3pre Thunderbird/3.1.9 MIME-Version: 1.0 To: Jeff Law CC: GCC Patches Subject: Re: [PATCH 2/6] Unique return rtx References: <4D8A0703.9090306@codesourcery.com> <4D8A07FB.7030707@codesourcery.com> <4D947EE8.5050605@redhat.com> In-Reply-To: <4D947EE8.5050605@redhat.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On 03/31/2011 03:17 PM, Jeff Law wrote: > On 03/23/11 08:47, Bernd Schmidt wrote: >> We'll start putting "return" into JUMP_LABELS in a subsequent patch, so >> I've decided to make it unique as a small cleanup. > >> There's already another macro called "return_rtx", so the new one goes >> by the name of "ret_rtx". > OK. Thanks. Now committed in this form, slightly updated. I've verified that all ports modified in this patch still build the gcc/ directory successfully. Bernd Index: gengenrtl.c =================================================================== --- gengenrtl.c (revision 173297) +++ gengenrtl.c (working copy) @@ -128,6 +128,9 @@ special_rtx (int idx) || strcmp (defs[idx].enumname, "REG") == 0 || strcmp (defs[idx].enumname, "SUBREG") == 0 || strcmp (defs[idx].enumname, "MEM") == 0 + || strcmp (defs[idx].enumname, "PC") == 0 + || strcmp (defs[idx].enumname, "CC0") == 0 + || strcmp (defs[idx].enumname, "RETURN") == 0 || strcmp (defs[idx].enumname, "CONST_VECTOR") == 0); } Index: genemit.c =================================================================== --- genemit.c (revision 173297) +++ genemit.c (working copy) @@ -166,6 +166,9 @@ gen_exp (rtx x, enum rtx_code subroutine case PC: printf ("pc_rtx"); return; + case RETURN: + printf ("ret_rtx"); + return; case CLOBBER: if (REG_P (XEXP (x, 0))) { Index: ChangeLog =================================================================== --- ChangeLog (revision 173297) +++ ChangeLog (working copy) @@ -1,3 +1,29 @@ +2011-05-03 Bernd Schmidt + + * gengenrtl.c (special_rtx): PC, CC0 and RETURN are special. + * genemit.c (gen_exp): Handle RETURN. + * emit-rtl.c (verify_rtx_sharing): Likewise. + (init_emit_regs): Create pc_rtx, ret_rtx and cc0_rtx specially. + * rtl.c (copy_rtx): RETURN is shared. + * rtl.h (enum global_rtl_index): Add GR_RETURN. + (ret_rtx): New. + * jump.c (redirect_exp_1): Don't use gen_rtx_RETURN. + * config/s390/s390.c (s390_emit_epilogue): Likewise. + * config/rx/rx.c (gen_rx_rtsd_vector): Likewise. + * config/cris/cris.c (cris_expand_return): Likewise. + * config/m68k/m68k.c (m68k_expand_epilogue): Likewise. + * config/rs6000/rs6000.c (rs6000_make_savres_rtx, + rs6000_emit_epilogue, rs6000_output_mi_thunk): Likewise. + * config/picochip/picochip.c (picochip_expand_epilogue): Likewise. + * config/h8300/h8300.c (h8300_push_pop, h8300_expand_epilogue): + Likewise. + * config/v850/v850.c (expand_epilogue): Likewise. + * config/bfin/bfin.c (bfin_expand_call): Likewise. + * config/arm/arm.md (epilogue): Likewise. + * config/mn10300/mn10300.c (mn10300_expand_epilogue): Likewise. + * config/sparc/sparc.c (sparc_struct_value_rtx): Rename ret_rtx + variable to ret_reg. + 2011-05-03 Richard Guenther * c-decl.c (grokdeclarator): Instead of looking at Index: jump.c =================================================================== --- jump.c (revision 173297) +++ jump.c (working copy) @@ -1367,7 +1367,7 @@ redirect_exp_1 (rtx *loc, rtx olabel, rt if (nlabel) n = gen_rtx_LABEL_REF (Pmode, nlabel); else - n = gen_rtx_RETURN (VOIDmode); + n = ret_rtx; validate_change (insn, loc, n, 1); return; @@ -1378,7 +1378,7 @@ redirect_exp_1 (rtx *loc, rtx olabel, rt if (nlabel) x = gen_rtx_LABEL_REF (Pmode, nlabel); else - x = gen_rtx_RETURN (VOIDmode); + x = ret_rtx; if (loc == &PATTERN (insn)) x = gen_rtx_SET (VOIDmode, pc_rtx, x); validate_change (insn, loc, x, 1); @@ -1389,7 +1389,7 @@ redirect_exp_1 (rtx *loc, rtx olabel, rt && GET_CODE (SET_SRC (x)) == LABEL_REF && XEXP (SET_SRC (x), 0) == olabel) { - validate_change (insn, loc, gen_rtx_RETURN (VOIDmode), 1); + validate_change (insn, loc, ret_rtx, 1); return; } Index: emit-rtl.c =================================================================== --- emit-rtl.c (revision 173297) +++ emit-rtl.c (working copy) @@ -2450,6 +2450,7 @@ verify_rtx_sharing (rtx orig, rtx insn) case CODE_LABEL: case PC: case CC0: + case RETURN: case SCRATCH: return; /* SCRATCH must be shared because they represent distinct values. */ @@ -5416,8 +5417,9 @@ init_emit_regs (void) init_reg_modes_target (); /* Assign register numbers to the globally defined register rtx. */ - pc_rtx = gen_rtx_PC (VOIDmode); - cc0_rtx = gen_rtx_CC0 (VOIDmode); + pc_rtx = gen_rtx_fmt_ (PC, VOIDmode); + ret_rtx = gen_rtx_fmt_ (RETURN, VOIDmode); + cc0_rtx = gen_rtx_fmt_ (CC0, VOIDmode); stack_pointer_rtx = gen_raw_REG (Pmode, STACK_POINTER_REGNUM); frame_pointer_rtx = gen_raw_REG (Pmode, FRAME_POINTER_REGNUM); hard_frame_pointer_rtx = gen_raw_REG (Pmode, HARD_FRAME_POINTER_REGNUM); Index: rtl.c =================================================================== --- rtl.c (revision 173297) +++ rtl.c (working copy) @@ -255,6 +255,7 @@ copy_rtx (rtx orig) case CODE_LABEL: case PC: case CC0: + case RETURN: case SCRATCH: /* SCRATCH must be shared because they represent distinct values. */ return orig; Index: rtl.h =================================================================== --- rtl.h (revision 173297) +++ rtl.h (working copy) @@ -2045,6 +2045,7 @@ enum global_rtl_index { GR_PC, GR_CC0, + GR_RETURN, GR_STACK_POINTER, GR_FRAME_POINTER, /* For register elimination to work properly these hard_frame_pointer_rtx, @@ -2134,6 +2135,7 @@ extern struct target_rtl *this_target_rt /* Standard pieces of rtx, to be substituted directly into things. */ #define pc_rtx (global_rtl[GR_PC]) +#define ret_rtx (global_rtl[GR_RETURN]) #define cc0_rtx (global_rtl[GR_CC0]) /* All references to certain hard regs, except those created Index: config/s390/s390.c =================================================================== --- config/s390/s390.c (revision 173297) +++ config/s390/s390.c (working copy) @@ -8485,7 +8485,7 @@ s390_emit_epilogue (bool sibcall) p = rtvec_alloc (2); - RTVEC_ELT (p, 0) = gen_rtx_RETURN (VOIDmode); + RTVEC_ELT (p, 0) = ret_rtx; RTVEC_ELT (p, 1) = gen_rtx_USE (VOIDmode, return_reg); emit_jump_insn (gen_rtx_PARALLEL (VOIDmode, p)); } Index: config/sparc/sparc.c =================================================================== --- config/sparc/sparc.c (revision 173297) +++ config/sparc/sparc.c (working copy) @@ -6063,7 +6063,7 @@ sparc_struct_value_rtx (tree fndecl, int /* We must check and adjust the return address, as it is optional as to whether the return object is really provided. */ - rtx ret_rtx = gen_rtx_REG (Pmode, 31); + rtx ret_reg = gen_rtx_REG (Pmode, 31); rtx scratch = gen_reg_rtx (SImode); rtx endlab = gen_label_rtx (); @@ -6080,12 +6080,12 @@ sparc_struct_value_rtx (tree fndecl, int it's an unimp instruction (the most significant 10 bits will be zero). */ emit_move_insn (scratch, gen_rtx_MEM (SImode, - plus_constant (ret_rtx, 8))); + plus_constant (ret_reg, 8))); /* Assume the size is valid and pre-adjust */ - emit_insn (gen_add3_insn (ret_rtx, ret_rtx, GEN_INT (4))); + emit_insn (gen_add3_insn (ret_reg, ret_reg, GEN_INT (4))); emit_cmp_and_jump_insns (scratch, size_rtx, EQ, const0_rtx, SImode, 0, endlab); - emit_insn (gen_sub3_insn (ret_rtx, ret_rtx, GEN_INT (4))); + emit_insn (gen_sub3_insn (ret_reg, ret_reg, GEN_INT (4))); /* Write the address of the memory pointed to by temp_val into the memory pointed to by mem */ emit_move_insn (mem, XEXP (temp_val, 0)); Index: config/rx/rx.c =================================================================== --- config/rx/rx.c (revision 173297) +++ config/rx/rx.c (working copy) @@ -1567,7 +1567,7 @@ gen_rx_rtsd_vector (unsigned int adjust, : plus_constant (stack_pointer_rtx, i * UNITS_PER_WORD))); - XVECEXP (vector, 0, count - 1) = gen_rtx_RETURN (VOIDmode); + XVECEXP (vector, 0, count - 1) = ret_rtx; return vector; } Index: config/cris/cris.c =================================================================== --- config/cris/cris.c (revision 173297) +++ config/cris/cris.c (working copy) @@ -1790,7 +1790,7 @@ cris_expand_return (bool on_stack) we do that until they're fixed. Currently, all return insns in a function must be the same (not really a limiting factor) so we need to check that it doesn't change half-way through. */ - emit_jump_insn (gen_rtx_RETURN (VOIDmode)); + emit_jump_insn (ret_rtx); CRIS_ASSERT (cfun->machine->return_type != CRIS_RETINSN_RET || !on_stack); CRIS_ASSERT (cfun->machine->return_type != CRIS_RETINSN_JUMP || on_stack); Index: config/mn10300/mn10300.c =================================================================== --- config/mn10300/mn10300.c (revision 173297) +++ config/mn10300/mn10300.c (working copy) @@ -1255,7 +1255,7 @@ mn10300_expand_epilogue (void) /* Adjust the stack and restore callee-saved registers, if any. */ if (mn10300_can_use_rets_insn ()) - emit_jump_insn (gen_rtx_RETURN (VOIDmode)); + emit_jump_insn (ret_rtx); else emit_jump_insn (gen_return_ret (GEN_INT (size + REG_SAVE_BYTES))); } Index: config/m68k/m68k.c =================================================================== --- config/m68k/m68k.c (revision 173297) +++ config/m68k/m68k.c (working copy) @@ -1308,7 +1308,7 @@ m68k_expand_epilogue (bool sibcall_p) EH_RETURN_STACKADJ_RTX)); if (!sibcall_p) - emit_jump_insn (gen_rtx_RETURN (VOIDmode)); + emit_jump_insn (ret_rtx); } /* Return true if X is a valid comparison operator for the dbcc Index: config/rs6000/rs6000.c =================================================================== --- config/rs6000/rs6000.c (revision 173297) +++ config/rs6000/rs6000.c (working copy) @@ -20358,7 +20358,7 @@ rs6000_make_savres_rtx (rs6000_stack_t * p = rtvec_alloc ((lr ? 4 : 3) + n_regs); if (!savep && lr) - RTVEC_ELT (p, offset++) = gen_rtx_RETURN (VOIDmode); + RTVEC_ELT (p, offset++) = ret_rtx; RTVEC_ELT (p, offset++) = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, 65)); @@ -21350,7 +21350,7 @@ rs6000_emit_epilogue (int sibcall) alloc_rname = ggc_strdup (rname); j = 0; - RTVEC_ELT (p, j++) = gen_rtx_RETURN (VOIDmode); + RTVEC_ELT (p, j++) = ret_rtx; RTVEC_ELT (p, j++) = gen_rtx_USE (VOIDmode, gen_rtx_REG (Pmode, LR_REGNO)); @@ -21966,7 +21966,7 @@ rs6000_emit_epilogue (int sibcall) else p = rtvec_alloc (2); - RTVEC_ELT (p, 0) = gen_rtx_RETURN (VOIDmode); + RTVEC_ELT (p, 0) = ret_rtx; RTVEC_ELT (p, 1) = ((restoring_FPRs_inline || !lr) ? gen_rtx_USE (VOIDmode, gen_rtx_REG (Pmode, 65)) : gen_rtx_CLOBBER (VOIDmode, @@ -22405,7 +22405,7 @@ rs6000_output_mi_thunk (FILE *file, tree gen_rtx_USE (VOIDmode, gen_rtx_REG (SImode, LR_REGNO)), - gen_rtx_RETURN (VOIDmode)))); + ret_rtx))); SIBLING_CALL_P (insn) = 1; emit_barrier (); Index: config/picochip/picochip.c =================================================================== --- config/picochip/picochip.c (revision 173297) +++ config/picochip/picochip.c (working copy) @@ -2273,7 +2273,7 @@ picochip_expand_epilogue (int is_sibling rtvec p; p = rtvec_alloc (2); - RTVEC_ELT (p, 0) = gen_rtx_RETURN (VOIDmode); + RTVEC_ELT (p, 0) = ret_rtx; RTVEC_ELT (p, 1) = gen_rtx_USE (VOIDmode, gen_rtx_REG (Pmode, LINK_REGNUM)); emit_jump_insn (gen_rtx_PARALLEL (VOIDmode, p)); Index: config/arm/arm.md =================================================================== --- config/arm/arm.md (revision 173297) +++ config/arm/arm.md (working copy) @@ -10006,9 +10006,7 @@ (define_expand "epilogue" DONE; } emit_jump_insn (gen_rtx_UNSPEC_VOLATILE (VOIDmode, - gen_rtvec (1, - gen_rtx_RETURN (VOIDmode)), - VUNSPEC_EPILOGUE)); + gen_rtvec (1, ret_rtx), VUNSPEC_EPILOGUE)); DONE; " ) Index: config/h8300/h8300.c =================================================================== --- config/h8300/h8300.c (revision 173297) +++ config/h8300/h8300.c (working copy) @@ -643,7 +643,7 @@ h8300_push_pop (int regno, int nregs, bo /* Add the return instruction. */ if (return_p) { - RTVEC_ELT (vec, i) = gen_rtx_RETURN (VOIDmode); + RTVEC_ELT (vec, i) = ret_rtx; i++; } @@ -927,7 +927,7 @@ h8300_expand_epilogue (void) } if (!returned_p) - emit_jump_insn (gen_rtx_RETURN (VOIDmode)); + emit_jump_insn (ret_rtx); } /* Return nonzero if the current function is an interrupt Index: config/v850/v850.c =================================================================== --- config/v850/v850.c (revision 173297) +++ config/v850/v850.c (working copy) @@ -1890,7 +1890,7 @@ expand_epilogue (void) int offset; restore_all = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (num_restore + 2)); - XVECEXP (restore_all, 0, 0) = gen_rtx_RETURN (VOIDmode); + XVECEXP (restore_all, 0, 0) = ret_rtx; XVECEXP (restore_all, 0, 1) = gen_rtx_SET (VOIDmode, stack_pointer_rtx, gen_rtx_PLUS (Pmode, Index: config/bfin/bfin.c =================================================================== --- config/bfin/bfin.c (revision 173297) +++ config/bfin/bfin.c (working copy) @@ -2334,7 +2334,7 @@ bfin_expand_call (rtx retval, rtx fnaddr XVECEXP (pat, 0, n++) = gen_rtx_USE (VOIDmode, picreg); XVECEXP (pat, 0, n++) = gen_rtx_USE (VOIDmode, cookie); if (sibcall) - XVECEXP (pat, 0, n++) = gen_rtx_RETURN (VOIDmode); + XVECEXP (pat, 0, n++) = ret_rtx; else XVECEXP (pat, 0, n++) = gen_rtx_CLOBBER (VOIDmode, retsreg); call = emit_call_insn (pat);