From patchwork Mon Sep 30 13:20:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Renlin Li X-Patchwork-Id: 279149 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1687C2C008A for ; Mon, 30 Sep 2013 23:21:09 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; q= dns; s=default; b=icT37W1pwl4gm/186f+C01gGra+pbDfZRTH/ydGQl2yKQ/ 2/JypPqTyp06Pttu/fIrM+LlqVfyXUib/5J5bmmsTifRhZtAEinBS4xjmtQvBll1 jZqFNpgy9rBRv0ot+MAu0JrUBaeebGlXvnAqar2H/XlO3qun3P5NgTsvbIR/U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; s= default; bh=wTqMzlSX1s77O0U38PaSxNBK47A=; b=YPNjz8NHCyl8zg6N+SPu IGufjtkzbNj1U8w8ayr+lXI7gxY4sVWDBNtni3vnfmGPieo5MJIc5WmFoW8J/91K 77V8eNBPPJdoSl9p+rOAq8eYtj2Q7Q4yB3kiIk0ptqw0kL0czNElGwn3I6BISqa0 /WSlLoTi9RCBGb9LAkzJkgg= Received: (qmail 18275 invoked by alias); 30 Sep 2013 13:21:03 -0000 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 Received: (qmail 18264 invoked by uid 89); 30 Sep 2013 13:21:03 -0000 Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 30 Sep 2013 13:21:03 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: service87.mimecast.com Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Mon, 30 Sep 2013 14:20:59 +0100 Received: from [10.1.205.32] ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Mon, 30 Sep 2013 14:20:58 +0100 Message-ID: <52497ABA.20601@arm.com> Date: Mon, 30 Sep 2013 14:20:58 +0100 From: Renlin Li User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [PATCH][AARCH64]Replace gen_rtx_PLUS with plus_constant X-MC-Unique: 113093014205903501 X-IsSubscribed: yes Hello all, Sorry for my last patch that cause some test regressions. I have correct it, and it has been tested for aarch64-none-elf on the model. This patch will replace all explicit calls to gen_rtx_PLUS and GEN_INT with plus_constant. OK for trunk? Kind regards, Renlin Li gcc/ChangeLog: 2013-09-30 Renlin Li * config/aarch64/aarch64.c (aarch64_expand_prologue): Use plus_constant. (aarch64_expand_epilogue): Likewise. diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index e8ae20a..db56f19 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -2065,9 +2065,9 @@ aarch64_expand_prologue (void) emit_insn (gen_add2_insn (stack_pointer_rtx, op0)); aarch64_set_frame_expr (gen_rtx_SET (Pmode, stack_pointer_rtx, - gen_rtx_PLUS (Pmode, - stack_pointer_rtx, - GEN_INT (-frame_size)))); + plus_constant (Pmode, + stack_pointer_rtx, + -frame_size))); } else if (frame_size > 0) { @@ -2151,9 +2151,9 @@ aarch64_expand_prologue (void) GEN_INT (fp_offset))); aarch64_set_frame_expr (gen_rtx_SET (Pmode, hard_frame_pointer_rtx, - gen_rtx_PLUS (Pmode, - stack_pointer_rtx, - GEN_INT (fp_offset)))); + plus_constant (Pmode, + stack_pointer_rtx, + fp_offset))); RTX_FRAME_RELATED_P (insn) = 1; insn = emit_insn (gen_stack_tie (stack_pointer_rtx, hard_frame_pointer_rtx)); @@ -2349,9 +2349,9 @@ aarch64_expand_epilogue (bool for_sibcall) emit_insn (gen_add2_insn (stack_pointer_rtx, op0)); aarch64_set_frame_expr (gen_rtx_SET (Pmode, stack_pointer_rtx, - gen_rtx_PLUS (Pmode, - stack_pointer_rtx, - GEN_INT (frame_size)))); + plus_constant (Pmode, + stack_pointer_rtx, + frame_size))); } else if (frame_size > 0) { @@ -2373,10 +2373,10 @@ aarch64_expand_epilogue (bool for_sibcall) } } - aarch64_set_frame_expr (gen_rtx_SET (Pmode, stack_pointer_rtx, - gen_rtx_PLUS (Pmode, - stack_pointer_rtx, - GEN_INT (offset)))); + aarch64_set_frame_expr (gen_rtx_SET (Pmode, stack_pointer_rtx, + plus_constant (Pmode, + stack_pointer_rtx, + offset))); } emit_use (gen_rtx_REG (DImode, LR_REGNUM));