[committed] reapply part of patch

[Eric Christopher]

Somehow I mistakenly deleted part of Dale's last patch.

Recommitted and apologies.

-eric

-- 
Eric Christopher <echristo@redhat.com>

2004-06-24  Eric Christopher  <echristo@redhat.com>

	* config/rs6000/rs6000.md: Apply change mistakenly
	deleted with 2004-06-22 patch.

Index: rs6000.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/rs6000/rs6000.md,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -p -r1.306 -r1.307
--- rs6000.md	22 Jun 2004 18:12:37 -0000	1.306
+++ rs6000.md	23 Jun 2004 05:54:21 -0000	1.307
@@ -8051,13 +8090,11 @@
       else
 	return \"mr %0,%1\;mr %L0,%L1\";
     case 1:
-      if (GET_CODE (operands[1]) == MEM
-	  && (rs6000_legitimate_offset_address_p (DFmode, XEXP (operands[1],
0),
-			reload_completed || reload_in_progress)
-	      || GET_CODE (XEXP (operands[1], 0)) == REG
-	      || GET_CODE (XEXP (operands[1], 0)) == LO_SUM
+      if (offsettable_memref_p (operands[1])
+	  || (GET_CODE (operands[1]) == MEM
+	      && (GET_CODE (XEXP (operands[1], 0)) == LO_SUM
 		  || GET_CODE (XEXP (operands[1], 0)) == PRE_INC
-	      || GET_CODE (XEXP (operands[1], 0)) == PRE_DEC))
+		  || GET_CODE (XEXP (operands[1], 0)) == PRE_DEC)))
 	{
 	  /* If the low-address word is used in the address, we must load
 	     it last.  Otherwise, load it first.  Note that we cannot have
@@ -8093,13 +8130,11 @@
 	    }
 	}
     case 2:
-      if (GET_CODE (operands[0]) == MEM
-          && (rs6000_legitimate_offset_address_p (DFmode, XEXP
(operands[0], 0),
-		    reload_completed || reload_in_progress)
-	      || GET_CODE (XEXP (operands[0], 0)) == REG
-    	      || GET_CODE (XEXP (operands[0], 0)) == LO_SUM
+      if (offsettable_memref_p (operands[0])
+	  || (GET_CODE (operands[0]) == MEM
+	      && (GET_CODE (XEXP (operands[0], 0)) == LO_SUM
 		  || GET_CODE (XEXP (operands[0], 0)) == PRE_INC
-	      || GET_CODE (XEXP (operands[0], 0)) == PRE_DEC))
+		  || GET_CODE (XEXP (operands[0], 0)) == PRE_DEC)))
 	return \"{st%U0|stw%U0} %1,%0\;{st|stw} %L1,%L0\";
       else
 	{