arm.h (ARM_REGNO_OK_FOR_BASE_P, [...]): New macros.

* arm.h (ARM_REGNO_OK_FOR_BASE_P, THUMB_REGNO_MODE_OK_FOR_BASE_P): New
macros.
(REGNO_MODE_OK_FOR_BASE_P): Define in terms of above.
(REGNO_OK_FOR_FOR_BASE_P): Delete.
(ARM_REG_OK_FOR_BASE_P, THUMB_REG_MODE_OK_FOR_BASE_P): New macros for
both strict and non-strict uses.
(REG_MODE_OK_FOR_BASE_P): Define in terms of above.
(ARM_REG_OK_FOR_INDEX_P, THUMB_REG_OK_FOR_INDEX_P): New macros.
(REG_OK_FOR_INDEX_P): Define in terms of above.
(REG_OK_FOR_BASE_P): Delete.
(REG_OK_FOR_PRE_POST_P): Delete.
(ARM_BASE_REGISTER_RTX_P): Renamed from BASE_REGISTER_RTX_P.
(ARM_INDEX_REGISTER_RTX_P): Renamed from INDEX_REGISTER_RTX_P.
(ARM_GO_IF_LEGITIMATE_INDEX): Renamed from GO_IF_LEGITIMATE_INDEX.
(THUMB_LEGITIMATE_OFFSET): Renamed from LEGITIMATE_OFFSET.
(ARM_GO_IF_LEGITIMATE_ADDRESS): Adjust for name changes.  Use ARM
specific variants rather than general ones.  Use ARM_REG_OK_FOR_BASE_P
in pre/post increment cases.
(THUMB_GO_IF_LEGITIMATE_ADDRESS): Similarly for Thumb.
(ARM_LEGITIMIZE_ADDRESS): Similarly.
(THUMB_LEGITIMIZE_RELOAD_ADDRESS): Similarly.
* arm.c (legitimate_pic_address): Similarly.

From-SVN: r37954

gcc/ChangeLog

+2000-12-02  Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.h (ARM_REGNO_OK_FOR_BASE_P, THUMB_REGNO_MODE_OK_FOR_BASE_P): New
+	macros.
+	(REGNO_MODE_OK_FOR_BASE_P): Define in terms of above.
+	(REGNO_OK_FOR_FOR_BASE_P): Delete.
+	(ARM_REG_OK_FOR_BASE_P, THUMB_REG_MODE_OK_FOR_BASE_P): New macros for
+	both strict and non-strict uses.
+	(REG_MODE_OK_FOR_BASE_P): Define in terms of above.
+	(ARM_REG_OK_FOR_INDEX_P, THUMB_REG_OK_FOR_INDEX_P): New macros.
+	(REG_OK_FOR_INDEX_P): Define in terms of above.
+	(REG_OK_FOR_BASE_P): Delete.
+	(REG_OK_FOR_PRE_POST_P): Delete.
+	(ARM_BASE_REGISTER_RTX_P): Renamed from BASE_REGISTER_RTX_P.
+	(ARM_INDEX_REGISTER_RTX_P): Renamed from INDEX_REGISTER_RTX_P.
+	(ARM_GO_IF_LEGITIMATE_INDEX): Renamed from GO_IF_LEGITIMATE_INDEX.
+	(THUMB_LEGITIMATE_OFFSET): Renamed from LEGITIMATE_OFFSET.
+	(ARM_GO_IF_LEGITIMATE_ADDRESS): Adjust for name changes.  Use ARM
+	specific variants rather than general ones.  Use ARM_REG_OK_FOR_BASE_P
+	in pre/post increment cases.
+	(THUMB_GO_IF_LEGITIMATE_ADDRESS): Similarly for Thumb.
+	(ARM_LEGITIMIZE_ADDRESS): Similarly.
+	(THUMB_LEGITIMIZE_RELOAD_ADDRESS): Similarly.
+	* arm.c (legitimate_pic_address): Similarly.
+
 2000-12-02  Neil Booth  <neilb@earthling.net>
 
         * tradcpp.c (struct answer, parse_assertion, parse_answer,

gcc/config/arm/arm.c

@@ -1967,7 +1967,7 @@ legitimize_pic_address (orig, mode, reg)
 	{
 	  /* The base register doesn't really matter, we only want to
 	     test the index for the appropriate mode.  */
-	  GO_IF_LEGITIMATE_INDEX (mode, 0, offset, win);
+	  ARM_GO_IF_LEGITIMATE_INDEX (mode, 0, offset, win);
 
 	  if (!no_new_pseudos)
 	    offset = force_reg (Pmode, offset);