rs6000: Remove reg_or_none500mem_operand

	* config/rs6000/predicates.md (reg_or_mem_operand): Reformat.
	(reg_or_none500mem_operand): Delete.
	* config/rs6000/rs6000.md (extendsfdf2): Use reg_or_mem_operand
	instead of reg_or_none500mem_operand.

From-SVN: r248982

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4ec245c4632ab404b7b945d2c2202c17ff55b2ac..e10099d3e0928d6022ff435d5945c154a799d2f4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-07  Segher Boessenkool  <segher@kernel.crashing.org>
+
+       * config/rs6000/predicates.md (reg_or_mem_operand): Reformat.
+       (reg_or_none500mem_operand): Delete.
+       * config/rs6000/rs6000.md (extendsfdf2): Use reg_or_mem_operand
+       instead of reg_or_none500mem_operand.
+
 2017-06-07  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * config/rs6000/rs6000.c (rs6000_option_override_internal): Delete

diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 4edfdbbe0d9e0bc71a6a1605b783441cd35f8b77..1bf9194668a1a39463c43e5dc0d04dc067245ba7 100644 (file)
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -970,19 +970,11 @@
 
 ;; Return 1 if the operand is a general non-special register or memory operand.
 (define_predicate "reg_or_mem_operand"
-     (ior (match_operand 0 "memory_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"
-  (if_then_else (match_code "mem")
-     (ior (match_operand 0 "memory_operand")
-         (match_test "macho_lo_sum_memory_operand (op, mode)")
-         (match_operand 0 "volatile_mem_operand"))
-     (match_operand 0 "gpc_reg_operand")))
+  (ior (match_operand 0 "memory_operand")
+       (and (match_code "mem")
+           (match_test "macho_lo_sum_memory_operand (op, mode)"))
+       (match_operand 0 "volatile_mem_operand")
+       (match_operand 0 "gpc_reg_operand")))
 
 ;; Return 1 if the operand is CONST_DOUBLE 0, register or memory operand.
 (define_predicate "zero_reg_mem_operand"

diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 3fea231665ddbe9f82e1447199cfc1c23bf49168..edb520867eae3c2d61667f059e3f13e2438c44f0 100644 (file)
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -4638,7 +4638,7 @@
 ;; Floating point conversions
 (define_expand "extendsfdf2"
   [(set (match_operand:DF 0 "gpc_reg_operand")
-       (float_extend:DF (match_operand:SF 1 "reg_or_none500mem_operand")))]
+       (float_extend:DF (match_operand:SF 1 "reg_or_mem_operand")))]
   "TARGET_HARD_FLOAT && TARGET_DOUBLE_FLOAT"
 {
   if (HONOR_SNANS (SFmode))