mips.h (EXTRA_CONSTRAINT): Add 'W' constraint.

	* config/mips/mips.h (EXTRA_CONSTRAINT): Add 'W' constraint.
	(EXTRA_MEMORY_CONSTRAINT): Define.
	(CAN_ELIMINATE): Remove lwu workaround.
	* config/mips/mips.md (*zero_extendsidi2_mem): Enable for mips16 too.
	Use a 'W' constraint for the source operand.

From-SVN: r72221

3 files changed, 24 insertions, 9 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e17b5ef..b234479 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-08  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/mips.h (EXTRA_CONSTRAINT): Add 'W' constraint.
+	(EXTRA_MEMORY_CONSTRAINT): Define.
+	(CAN_ELIMINATE): Remove lwu workaround.
+	* config/mips/mips.md (*zero_extendsidi2_mem): Enable for mips16 too.
+	Use a 'W' constraint for the source operand.
+
 2003-10-08  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* genopinit.c (main): Output code to declare undefined
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index b3de61e..5ea19a8 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -2035,7 +2035,11 @@ extern enum reg_class mips_char_to_class[256];
 	 constraint has often been used in linux and glibc code.
    `S' is for legitimate constant call addresses.
    `T' is for constant move_operands that cannot be safely loaded into $25.
-   `U' is for constant move_operands that can be safely loaded into $25.  */
+   `U' is for constant move_operands that can be safely loaded into $25.
+   `W' is for memory references that are based on a member of BASE_REG_CLASS.
+	 This is true for all non-mips16 references (although it can somtimes
+	 be indirect if !TARGET_EXPLICIT_RELOCS).  For mips16, it excludes
+	 stack and constant-pool references.  */
 
 #define EXTRA_CONSTRAINT(OP,CODE)					\
   (((CODE) == 'Q')	  ? const_arith_operand (OP, VOIDmode)		\
@@ -2049,8 +2053,16 @@ extern enum reg_class mips_char_to_class[256];
    : ((CODE) == 'U')	  ? (CONSTANT_P (OP)				\
 			     && move_operand (OP, VOIDmode)		\
 			     && !DANGEROUS_FOR_LA25_P (OP))		\
+   : ((CODE) == 'W')	  ? (GET_CODE (OP) == MEM			\
+			     && memory_operand (OP, VOIDmode)		\
+			     && (!TARGET_MIPS16				\
+				 || (!stack_operand (OP, VOIDmode)	\
+				     && !CONSTANT_P (XEXP (OP, 0)))))	\
    : FALSE)
 
+/* Say which of the above are memory constraints.  */
+#define EXTRA_MEMORY_CONSTRAINT(C, STR) ((C) == 'R' || (C) == 'W')
+
 /* Given an rtx X being reloaded into a reg required to be
    in class CLASS, return the class of reg to actually use.
    In general this is just CLASS; but on some machines
@@ -2150,15 +2162,10 @@ extern enum reg_class mips_char_to_class[256];
    In mips16 mode, we need a frame pointer for a large frame; otherwise,
    reload may be unable to compute the address of a local variable,
    since there is no way to add a large constant to the stack pointer
-   without using a temporary register.
-
-   Also, for some mips16 instructions (eg lwu), we can't eliminate the
-   frame pointer for the stack pointer.  These instructions are
-   only generated in TARGET_64BIT mode.  */
+   without using a temporary register.  */
 #define CAN_ELIMINATE(FROM, TO)						\
   ((TO) == HARD_FRAME_POINTER_REGNUM 				        \
    || ((TO) == STACK_POINTER_REGNUM && !frame_pointer_needed		\
-       && !(TARGET_MIPS16 && TARGET_64BIT)				\
        && (!TARGET_MIPS16						\
 	   || compute_frame_size (get_frame_size ()) < 32768)))
 
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index 3bdc06a..179d217 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -3292,8 +3292,8 @@ dsrl\t%3,%3,1\n\
 
 (define_insn "*zero_extendsidi2_mem"
   [(set (match_operand:DI 0 "register_operand" "=d")
-        (zero_extend:DI (match_operand:SI 1 "memory_operand" "m")))]
-  "TARGET_64BIT && !TARGET_MIPS16"
+        (zero_extend:DI (match_operand:SI 1 "memory_operand" "W")))]
+  "TARGET_64BIT"
   "lwu\t%0,%1"
   [(set_attr "type"     "load")
    (set_attr "mode"     "DI")])