[AArch64] Remove an unused reload hook.

    * config/aarch64/aarch64.h (LEGITIMIZE_RELOAD_ADDRESS): Remove.
    * config/aarch64/arch64-protos.h
    (aarch64_legitimize_reload_address): Remove.
    * config/aarch64/aarch64.c (aarch64_legitimize_reload_address):
    Remove.

From-SVN: r236266

diff --git a/ChangeLog b/ChangeLog
index eac1cc639abbd387af8e4228e6ec2868653c9fbb..a50365496d66e92b56fda8f1d5c75d53f44ab760 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-05-16  Matthew Wahab  <matthew.wahab@arm.com>
+
+    * config/aarch64/aarch64.h (LEGITIMIZE_RELOAD_ADDRESS): Remove.
+    * config/aarch64/arch64-protos.h
+    (aarch64_legitimize_reload_address): Remove.
+    * config/aarch64/aarch64.c (aarch64_legitimize_reload_address):
+    Remove.
+
 2016-05-09  Aaron Sawdey  <acsawdey@linux.vnet.ibm.com>
 
        * MAINTAINERS (Write After Approval): Add myself.

diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h
index f22a31c28307e22f79e393441c59ec9c0a47d8b3..6a8a850673853a98e12496046ebdcf4a3cd37cf8 100644 (file)
--- a/gcc/config/aarch64/aarch64-protos.h
+++ b/gcc/config/aarch64/aarch64-protos.h
@@ -339,7 +339,6 @@ int aarch64_simd_attr_length_move (rtx_insn *);
 int aarch64_uxt_size (int, HOST_WIDE_INT);
 int aarch64_vec_fpconst_pow_of_2 (rtx);
 rtx aarch64_final_eh_return_addr (void);
-rtx aarch64_legitimize_reload_address (rtx *, machine_mode, int, int, int);
 rtx aarch64_mask_from_zextract_ops (rtx, rtx);
 const char *aarch64_output_move_struct (rtx *operands);
 rtx aarch64_return_addr (int, rtx);

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 7e0e3b9a62157cba92c42651763f6cd2954bd33f..e081b16f324afbec5bb2a188db32f3c20ddbecd7 100644 (file)
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -5022,120 +5022,6 @@ aarch64_legitimize_address (rtx x, rtx /* orig_x  */, machine_mode mode)
   return x;
 }
 
-/* Try a machine-dependent way of reloading an illegitimate address
-   operand.  If we find one, push the reload and return the new rtx.  */
-
-rtx
-aarch64_legitimize_reload_address (rtx *x_p,
-                                  machine_mode mode,
-                                  int opnum, int type,
-                                  int ind_levels ATTRIBUTE_UNUSED)
-{
-  rtx x = *x_p;
-
-  /* Do not allow mem (plus (reg, const)) if vector struct mode.  */
-  if (aarch64_vect_struct_mode_p (mode)
-      && GET_CODE (x) == PLUS
-      && REG_P (XEXP (x, 0))
-      && CONST_INT_P (XEXP (x, 1)))
-    {
-      rtx orig_rtx = x;
-      x = copy_rtx (x);
-      push_reload (orig_rtx, NULL_RTX, x_p, NULL,
-                  BASE_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0,
-                  opnum, (enum reload_type) type);
-      return x;
-    }
-
-  /* We must recognize output that we have already generated ourselves.  */
-  if (GET_CODE (x) == PLUS
-      && GET_CODE (XEXP (x, 0)) == PLUS
-      && REG_P (XEXP (XEXP (x, 0), 0))
-      && CONST_INT_P (XEXP (XEXP (x, 0), 1))
-      && CONST_INT_P (XEXP (x, 1)))
-    {
-      push_reload (XEXP (x, 0), NULL_RTX, &XEXP (x, 0), NULL,
-                  BASE_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0,
-                  opnum, (enum reload_type) type);
-      return x;
-    }
-
-  /* We wish to handle large displacements off a base register by splitting
-     the addend across an add and the mem insn.  This can cut the number of
-     extra insns needed from 3 to 1.  It is only useful for load/store of a
-     single register with 12 bit offset field.  */
-  if (GET_CODE (x) == PLUS
-      && REG_P (XEXP (x, 0))
-      && CONST_INT_P (XEXP (x, 1))
-      && HARD_REGISTER_P (XEXP (x, 0))
-      && mode != TImode
-      && mode != TFmode
-      && aarch64_regno_ok_for_base_p (REGNO (XEXP (x, 0)), true))
-    {
-      HOST_WIDE_INT val = INTVAL (XEXP (x, 1));
-      HOST_WIDE_INT low = val & 0xfff;
-      HOST_WIDE_INT high = val - low;
-      HOST_WIDE_INT offs;
-      rtx cst;
-      machine_mode xmode = GET_MODE (x);
-
-      /* In ILP32, xmode can be either DImode or SImode.  */
-      gcc_assert (xmode == DImode || xmode == SImode);
-
-      /* Reload non-zero BLKmode offsets.  This is because we cannot ascertain
-        BLKmode alignment.  */
-      if (GET_MODE_SIZE (mode) == 0)
-       return NULL_RTX;
-
-      offs = low % GET_MODE_SIZE (mode);
-
-      /* Align misaligned offset by adjusting high part to compensate.  */
-      if (offs != 0)
-       {
-         if (aarch64_uimm12_shift (high + offs))
-           {
-             /* Align down.  */
-             low = low - offs;
-             high = high + offs;
-           }
-         else
-           {
-             /* Align up.  */
-             offs = GET_MODE_SIZE (mode) - offs;
-             low = low + offs;
-             high = high + (low & 0x1000) - offs;
-             low &= 0xfff;
-           }
-       }
-
-      /* Check for overflow.  */
-      if (high + low != val)
-       return NULL_RTX;
-
-      cst = GEN_INT (high);
-      if (!aarch64_uimm12_shift (high))
-       cst = force_const_mem (xmode, cst);
-
-      /* Reload high part into base reg, leaving the low part
-        in the mem instruction.
-        Note that replacing this gen_rtx_PLUS with plus_constant is
-        wrong in this case because we rely on the
-        (plus (plus reg c1) c2) structure being preserved so that
-        XEXP (*p, 0) in push_reload below uses the correct term.  */
-      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,
-                  opnum, (enum reload_type) type);
-      return x;
-    }
-
-  return NULL_RTX;
-}
-
-
 /* Return the reload icode required for a constant pool in mode.  */
 static enum insn_code
 aarch64_constant_pool_reload_icode (machine_mode mode)

diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
index 4135da1becd8a433a57b9a82fa2b63f6cc76640f..6eb31e9537a01881d74e258ce159b5a2fb7e0e6f 100644 (file)
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
@@ -652,21 +652,6 @@ typedef struct
 
 #define CONSTANT_ADDRESS_P(X)          aarch64_constant_address_p(X)
 
-/* Try a machine-dependent way of reloading an illegitimate address
-   operand.  If we find one, push the reload and jump to WIN.  This
-   macro is used in only one place: `find_reloads_address' in reload.c.  */
-
-#define LEGITIMIZE_RELOAD_ADDRESS(X, MODE, OPNUM, TYPE, IND_L, WIN)         \
-do {                                                                        \
-  rtx new_x = aarch64_legitimize_reload_address (&(X), MODE, OPNUM, TYPE,    \
-                                                IND_L);                     \
-  if (new_x)                                                                \
-    {                                                                       \
-      X = new_x;                                                            \
-      goto WIN;                                                                     \
-    }                                                                       \
-} while (0)
-
 #define REGNO_OK_FOR_BASE_P(REGNO)     \
   aarch64_regno_ok_for_base_p (REGNO, true)