From 24ffb4d4efac96d05e3271b2371b63f23164f3d7 Mon Sep 17 00:00:00 2001
From: dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 29 Oct 2008 23:33:02 +0000
Subject: [PATCH]         PR target/37878         * config/rs6000/predicates.md
 (word_offset_memref_operand):         Restructure code and look inside
 auto-inc/dec addresses.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141450 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                   |  6 ++++++
 gcc/config/rs6000/predicates.md | 22 +++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c064c103b0a..b3448e3d2c1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-29  David Edelsohn  <edelsohn@gnu.org>
+
+	PR target/37878
+	* config/rs6000/predicates.md (word_offset_memref_operand):
+	Restructure code and look inside auto-inc/dec addresses.
+	
 2008-10-29  Steve Ellcey  <sje@cup.hp.com>
 
 	PR target/32277
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index a04a7d8cdbd..af80ef46b6f 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -373,11 +373,23 @@
 
 ;; Return 1 if the operand is a memory operand with an address divisible by 4
 (define_predicate "word_offset_memref_operand"
-  (and (match_operand 0 "memory_operand")
-       (match_test "GET_CODE (XEXP (op, 0)) != PLUS
-		    || ! REG_P (XEXP (XEXP (op, 0), 0)) 
-		    || GET_CODE (XEXP (XEXP (op, 0), 1)) != CONST_INT
-		    || INTVAL (XEXP (XEXP (op, 0), 1)) % 4 == 0")))
+  (match_operand 0 "memory_operand")
+{
+  /* Address inside MEM.  */
+  op = XEXP (op, 0);
+
+  /* Extract address from auto-inc/dec.  */
+  if (GET_CODE (op) == PRE_INC
+      || GET_CODE (op) == PRE_DEC)
+    op = XEXP (op, 0);
+  else if (GET_CODE (op) == PRE_MODIFY)
+    op = XEXP (op, 1);
+
+  return (GET_CODE (op) != PLUS
+	  || ! REG_P (XEXP (op, 0))
+	  || GET_CODE (XEXP (op, 1)) != CONST_INT
+	  || INTVAL (XEXP (op, 1)) % 4 == 0);
+})
 
 ;; Return 1 if the operand is an indexed or indirect memory operand.
 (define_predicate "indexed_or_indirect_operand"
-- 
2.11.4.GIT