From patchwork Thu Dec 15 20:58:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DJ Delorie X-Patchwork-Id: 131732 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 C0E54B6FD1 for ; Fri, 16 Dec 2011 07:58:45 +1100 (EST) Received: (qmail 1600 invoked by alias); 15 Dec 2011 20:58:43 -0000 Received: (qmail 1591 invoked by uid 22791); 15 Dec 2011 20:58:42 -0000 X-SWARE-Spam-Status: No, hits=-5.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 15 Dec 2011 20:58:22 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pBFKwMdm007336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 15 Dec 2011 15:58:22 -0500 Received: from greed.delorie.com (ovpn-113-126.phx2.redhat.com [10.3.113.126]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pBFKwL0R013519 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 15 Dec 2011 15:58:21 -0500 Received: from greed.delorie.com (greed.delorie.com [127.0.0.1]) by greed.delorie.com (8.14.4/8.14.4) with ESMTP id pBFKwJnf008908 for ; Thu, 15 Dec 2011 15:58:19 -0500 Received: (from dj@localhost) by greed.delorie.com (8.14.4/8.14.4/Submit) id pBFKwJ8L008907; Thu, 15 Dec 2011 15:58:19 -0500 Date: Thu, 15 Dec 2011 15:58:19 -0500 Message-Id: <201112152058.pBFKwJ8L008907@greed.delorie.com> From: DJ Delorie To: gcc-patches@gcc.gnu.org Subject: [rl78] rename return pattern X-IsSubscribed: yes 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 Committed. Fixes issues with the full epilogue not being emitted. * config/rl78/rl78.md (return): Rename to rl78_return. * config/rl78/rl78.c (rl78_expand_epilogue): Use new name. (rl78_expand_eh_epilogue): Use new name. (rl78_calculate_death_notes): Likewise. Index: config/rl78/rl78.md =================================================================== --- config/rl78/rl78.md (revision 182386) +++ config/rl78/rl78.md (working copy) @@ -84,13 +84,13 @@ (define_expand "sibcall_epilogue" [(return)] "" "FAIL;" ) -(define_insn "return" +(define_insn "rl78_return" [(return)] "" "ret" ) (define_insn "interrupt_return" Index: config/rl78/rl78.c =================================================================== --- config/rl78/rl78.c (revision 182386) +++ config/rl78/rl78.c (working copy) @@ -900,21 +900,21 @@ rl78_expand_epilogue (void) if (is_brk_interrupt_func (cfun->decl)) emit_jump_insn (gen_brk_interrupt_return ()); else if (is_interrupt_func (cfun->decl)) emit_jump_insn (gen_interrupt_return ()); else - emit_jump_insn (gen_return ()); + emit_jump_insn (gen_rl78_return ()); } /* Likewise, for exception handlers. */ void rl78_expand_eh_epilogue (rtx x ATTRIBUTE_UNUSED) { /* FIXME - replace this with an indirect jump with stack adjust. */ - emit_jump_insn (gen_return ()); + emit_jump_insn (gen_rl78_return ()); } #undef TARGET_ASM_FUNCTION_PROLOGUE #define TARGET_ASM_FUNCTION_PROLOGUE rl78_start_function /* We don't use this to actually emit the function prologue. We use @@ -2387,13 +2387,13 @@ rl78_calculate_death_notes (void) default: break; } break; case JUMP_INSN: - if (INSN_CODE (insn) == CODE_FOR_return) + if (INSN_CODE (insn) == CODE_FOR_rl78_return) { memset (dead, 1, sizeof (dead)); /* We expect a USE just prior to this, which will mark the actual return registers. The USE will have a death note, but we aren't going to be modifying it after this pass. */