[AArch64] Use plus_constant.

2013-09-20  Renlin Li  <renlin.li@arm.com>

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

From-SVN: r202780

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7c2b467db1a9aa0d64117b03bcb9bc13e78914a4..68a0f2eb51d094d732da8b314c586f678c800805 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-20  Renlin Li  <renlin.li@arm.com>
+
+       * config/aarch64/aarch64.c (aarch64_expand_prologue): Use plus_constant.
+       (aarch64_expand_epilogue): Likewise.
+       (aarch64_legitimize_reload_address): Likewise.
+
 2013-09-20  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
        PR middle-end/57748

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index e8ae20ad3d2f7805314a9b391dff11218eb72957..c65d8451b1dcedf7bba1856db35c6c4cc7099a5b 100644 (file)
--- 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));
@@ -4014,9 +4014,9 @@ aarch64_legitimize_reload_address (rtx *x_p,
 
       /* Reload high part into base reg, leaving the low part
         in the mem instruction.  */
-      x = gen_rtx_PLUS (xmode,
-                       gen_rtx_PLUS (xmode, XEXP (x, 0), cst),
-                       GEN_INT (low));
+      x = plus_constant (xmode,
+                        gen_rtx_PLUS (xmode, XEXP (x, 0), cst),
+                        low);
 
       push_reload (XEXP (x, 0), NULL_RTX, &XEXP (x, 0), NULL,
                   BASE_REG_CLASS, xmode, VOIDmode, 0, 0,