sh.h (CONST_OK_FOR_I06): Delete.

	* config/sh/sh.h (CONST_OK_FOR_I06): Delete.
	(CONST_OK_FOR_I10): Move macro to ...
	* config/sh/sh.c: ... here.
	(sh_legitimate_index_p): Use satisfies_constraint_I06 instead of
	CONST_OK_FOR_I06.

From-SVN: r189551

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a983274f957f25b81e1d740a57e1121b6ebdadd4..f9fd72364bbdfe512e0fc2ef24c34aadeced3928 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-16  Oleg Endo  <olegendo@gcc.gnu.org>
+
+       * config/sh/sh.h (CONST_OK_FOR_I06): Delete.
+       (CONST_OK_FOR_I10): Move macro to ...
+       * config/sh/sh.c: ... here.
+       (sh_legitimate_index_p): Use satisfies_constraint_I06 instead of
+       CONST_OK_FOR_I06.
+
 2012-07-16  Oleg Endo  <olegendo@gcc.gnu.org>
 
        * config/sh/sh.md: Delete mov related define_peephole patterns.

diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 015e274b13bd5f2f47600f4b1b1ad9422631029d..72043a06f8decb685f122daf37c63ec781830052 100644 (file)
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -63,6 +63,9 @@ int code_for_indirect_jump_scratch = CODE_FOR_indirect_jump_scratch;
 #define LSW (TARGET_LITTLE_ENDIAN ? 0 : 1)
 
 /* These are some macros to abstract register modes.  */
+#define CONST_OK_FOR_I10(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -512 \
+                                && ((HOST_WIDE_INT)(VALUE)) <= 511)
+
 #define CONST_OK_FOR_ADD(size) \
   (TARGET_SHMEDIA ? CONST_OK_FOR_I10 (size) : CONST_OK_FOR_I08 (size))
 #define GEN_MOV (*(TARGET_SHMEDIA64 ? gen_movdi : gen_movsi))
@@ -9776,7 +9779,7 @@ sh_legitimate_index_p (enum machine_mode mode, rtx op, bool consider_sh2a,
 
       /* Check if this is the address of an unaligned load / store.  */
       if (mode == VOIDmode)
-       return CONST_OK_FOR_I06 (INTVAL (op));
+       return satisfies_constraint_I06 (op);
 
       size = GET_MODE_SIZE (mode);
       return (!(INTVAL (op) & (size - 1))

diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index e1c57039e0c34ba56f5499c53cfb3bf11265d254..3187f35581a4392da9228928b7cee60ef5562390 100644 (file)
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -1213,12 +1213,8 @@ extern enum reg_class regno_reg_class[FIRST_PSEUDO_REGISTER];
 \f
 /* Defines for sh.md and constraints.md.  */
 
-#define CONST_OK_FOR_I06(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -32 \
-                                && ((HOST_WIDE_INT)(VALUE)) <= 31)
 #define CONST_OK_FOR_I08(VALUE) (((HOST_WIDE_INT)(VALUE))>= -128 \
                                 && ((HOST_WIDE_INT)(VALUE)) <= 127)
-#define CONST_OK_FOR_I10(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -512 \
-                                && ((HOST_WIDE_INT)(VALUE)) <= 511)
 #define CONST_OK_FOR_I16(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -32768 \
                                 && ((HOST_WIDE_INT)(VALUE)) <= 32767)