Revert r202780:

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202824 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 211dfb7..1d9c5a9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-23  James Greenhalgh  <james.greenhalgh@arm.com>
+
+       Revert r202780:
+       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-22  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gimplify.c (gimplify_asm_expr): Reset the TREE_CHAIN of clobbers to

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index c65d845..e8ae20a 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,
-                                  plus_constant (Pmode,
-                                                 stack_pointer_rtx,
-                                                 -frame_size)));
+                                  gen_rtx_PLUS (Pmode,
+                                                stack_pointer_rtx,
+                                                GEN_INT (-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,
-                                  plus_constant (Pmode,
-                                                 stack_pointer_rtx,
-                                                 fp_offset)));
+                                  gen_rtx_PLUS (Pmode,
+                                                stack_pointer_rtx,
+                                                GEN_INT (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,
-                                  plus_constant (Pmode,
-                                                 stack_pointer_rtx,
-                                                 frame_size)));
+                                  gen_rtx_PLUS (Pmode,
+                                                stack_pointer_rtx,
+                                                GEN_INT (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,
-                                            plus_constant (Pmode,
-                                                           stack_pointer_rtx,
-                                                           offset)));
+      aarch64_set_frame_expr (gen_rtx_SET (Pmode, stack_pointer_rtx,
+                                          gen_rtx_PLUS (Pmode,
+                                                        stack_pointer_rtx,
+                                                        GEN_INT (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 = plus_constant (xmode,
-                        gen_rtx_PLUS (xmode, XEXP (x, 0), cst),
-                        low);
+      x = gen_rtx_PLUS (xmode,
+                       gen_rtx_PLUS (xmode, XEXP (x, 0), cst),
+                       GEN_INT (low));
 
       push_reload (XEXP (x, 0), NULL_RTX, &XEXP (x, 0), NULL,
                   BASE_REG_CLASS, xmode, VOIDmode, 0, 0,