Patchwork [AARCH64] Replace gen_rtx_PLUS with plus_constant

login
register
mail settings
Submitter Renlin Li
Date Sept. 30, 2013, 1:20 p.m.
Message ID <52497ABA.20601@arm.com>
Download mbox | patch
Permalink /patch/279149/
State New
Headers show

Comments

Renlin Li - Sept. 30, 2013, 1:20 p.m.
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 <renlin.li@arm.com>

     * config/aarch64/aarch64.c (aarch64_expand_prologue): Use 
plus_constant.
     (aarch64_expand_epilogue): Likewise.
Kyrylo Tkachov - Oct. 1, 2013, 9:11 a.m.
On 30/09/13 14:20, Renlin Li wrote:
> 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 <renlin.li@arm.com>
>
>       * config/aarch64/aarch64.c (aarch64_expand_prologue): Use
> plus_constant.
>       (aarch64_expand_epilogue): Likewise.
Looks ok to me, but I can't approve it. CC'ing the maintainers...

Kyrill
Marcus Shawcroft - Oct. 1, 2013, 11:32 a.m.
On 30 September 2013 14:20, Renlin Li <renlin.li@arm.com> wrote:

> gcc/ChangeLog:
>
> 2013-09-30  Renlin Li <renlin.li@arm.com>
>
>     * config/aarch64/aarch64.c (aarch64_expand_prologue): Use plus_constant.
>     (aarch64_expand_epilogue): Likewise.

OK
/Marcus
Kyrylo Tkachov - Oct. 2, 2013, 10:31 a.m.
On 01/10/13 12:32, Marcus Shawcroft wrote:
> On 30 September 2013 14:20, Renlin Li <renlin.li@arm.com> wrote:
>
>> gcc/ChangeLog:
>>
>> 2013-09-30  Renlin Li <renlin.li@arm.com>
>>
>>      * config/aarch64/aarch64.c (aarch64_expand_prologue): Use plus_constant.
>>      (aarch64_expand_epilogue): Likewise.
> OK
> /Marcus

I've committed the patch as r203108.
Renlin, for future reference: Changelog rules expect two spaces between your 
name and the email. So I've committed the patch with the Changelog:

2013-10-02  Renlin Li  <renlin.li@arm.com>

     * config/aarch64/aarch64.c (aarch64_expand_prologue): Use plus_constant.
     (aarch64_expand_epilogue): Likewise.


Cheers,
Kyrill

Patch

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));