From: Richard Henderson <rth@redhat.com>
Date: Sat, 10 Jan 2004 03:14:07 +0000 (-0800)
Subject: * recog.c (constrain_operands): Validate mem operands.
X-Git-Tag: releases/gcc-3.4.0~1151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47069ecbe6cad05836dace19eefcfaf10cd10288;p=thirdparty%2Fgcc.git

* recog.c (constrain_operands): Validate mem operands.

From-SVN: r75624
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 06768ae27d62..64dcf0781ea7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-09  Richard Henderson  <rth@redhat.com>
+
+	* recog.c (constrain_operands): Validate mem operands.
+
 2004-01-09   James E Wilson  <wilson@specifixinc.com>
 
 	* gcc.c (init_spec): Remove -lunwind from shared case.
diff --git a/gcc/recog.c b/gcc/recog.c
index 9f5c152082e8..d2338e6c9c2c 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -2445,12 +2445,25 @@ constrain_operands (int strict)
 		break;
 
 	      case 'm':
-		if (GET_CODE (op) == MEM
-		    /* Before reload, accept what reload can turn into mem.  */
-		    || (strict < 0 && CONSTANT_P (op))
-		    /* During reload, accept a pseudo  */
-		    || (reload_in_progress && GET_CODE (op) == REG
-			&& REGNO (op) >= FIRST_PSEUDO_REGISTER))
+		/* Memory operands must be valid, to the extent
+		   required by STRICT.  */
+		if (GET_CODE (op) == MEM)
+		  {
+		    if (strict > 0
+			&& !strict_memory_address_p (GET_MODE (op),
+						     XEXP (op, 0)))
+		      break;
+		    if (strict == 0
+			&& !memory_address_p (GET_MODE (op), XEXP (op, 0)))
+		      break;
+		    win = 1;
+		  }
+		/* Before reload, accept what reload can turn into mem.  */
+		else if (strict < 0 && CONSTANT_P (op))
+		  win = 1;
+		/* During reload, accept a pseudo  */
+		else if (reload_in_progress && GET_CODE (op) == REG
+			 && REGNO (op) >= FIRST_PSEUDO_REGISTER)
 		  win = 1;
 		break;