predicates.md (reg_or_mem_operand): Pair up match_code "mem" with match_test "macho_l...

	* config/rs6000/predicates.md (reg_or_mem_operand): Pair up
	match_code "mem" with match_test "macho_lo_sum_memory_operand".

From-SVN: r109835

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca2c55534c9dc8376a5484249f89567167831741..eb684fbe8ffe3626f20764386507204f221966b0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-18  Ben Elliston  <bje@au.ibm.com>
+
+       * config/rs6000/predicates.md (reg_or_mem_operand): Pair up
+       match_code "mem" with match_test "macho_lo_sum_memory_operand".
+
 2006-01-17  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/25682
@@ -161,9 +166,9 @@
        * config/m68k/m68k.c (output_move_const_into_data_reg):
        Output correct mnemonic for mvz and mvs.
 
-2006-01-16  Gabor Loki <loki@gcc.gnu.org>
+2006-01-16  Gabor Loki  <loki@gcc.gnu.org>
 
-       * rtl-factoring.c : Add sequence abstraction algorithm.
+       * rtl-factoring.c: Add sequence abstraction algorithm.
        * cfgcleanup.c (outgoing_edges_match): Extra checks.
        (try_crossjump_to_edge): Avoid deleting preserve label when redirecting
        ABNORMAL edges.

diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index de31fe2e54f2b069b28640b98d28d44470940492..8d24d8f74c58f853da6778e7c6846b173da7b8d0 100644 (file)
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -620,11 +620,11 @@
 
 ;; Return 1 if the operand is a general non-special register or memory operand.
 (define_predicate "reg_or_mem_operand"
-  (if_then_else (match_code "mem")
      (ior (match_operand 0 "memory_operand")
-         (ior (match_test "macho_lo_sum_memory_operand (op, mode)")
-              (match_operand 0 "volatile_mem_operand")))
-     (match_operand 0 "gpc_reg_operand")))
+         (ior (and (match_code "mem")
+                   (match_test "macho_lo_sum_memory_operand (op, mode)"))
+              (ior (match_operand 0 "volatile_mem_operand")
+                   (match_operand 0 "gpc_reg_operand")))))
 
 ;; Return 1 if the operand is either an easy FP constant or memory or reg.
 (define_predicate "reg_or_none500mem_operand"