diff mbox

[09/14] rs6000: Remove reg_or_none500mem_operand

Message ID 3a49a10d8ace8eca19b701fb8440558e1facb2fa.1496745183.git.segher@kernel.crashing.org
State New
Headers show

Commit Message

Segher Boessenkool June 6, 2017, 3:56 p.m. UTC 
2017-06-06  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.

---
 gcc/config/rs6000/predicates.md | 18 +++++-------------
 gcc/config/rs6000/rs6000.md     |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

Comments

David Edelsohn June 6, 2017, 5:06 p.m. UTC | #1 
On Tue, Jun 6, 2017 at 11:56 AM, Segher Boessenkool
<segher@kernel.crashing.org> wrote:
> 2017-06-06  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.

Okay.

Thanks, David
diff mbox

Patch

diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 4edfdbb..1bf9194 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -970,19 +970,11 @@  (define_predicate "scc_eq_operand"
 
 ;; 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 3fea231..edb5208 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -4638,7 +4638,7 @@  (define_insn "*cmp<mode>_fpr"
 ;; 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))