alpha.md (extendqidi2): Use general_operand instead of some_operand for operand[1...

	* config/alpha/alpha.md (extendqidi2): Use general_operand
	instead of some_operand for operand[1] predicate.
	(extendhidi2): Ditto.
	(cbranchdi4): Use general_operand instead of some_operand
	for operand[1] and operands[2] predicates.
	(cstoredi4): Ditto.
	* config/alpha/predicates.md (some_operand): Remove unused predicate.
	(some_ni_operand): Ditto.

From-SVN: r223211

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b6e112255b1e01a35137cb5e651f92c8656b57a..d621d0317d97d86e38f3b53e23b5b4c69b2a8bbe 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2015-05-15  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/alpha/alpha.md (extendqidi2): Use general_operand
+       instead of some_operand for operand[1] predicate.
+       (extendhidi2): Ditto.
+       (cbranchdi4): Use general_operand instead of some_operand
+       for operand[1] and operands[2] predicates.
+       (cstoredi4): Ditto.
+       * config/alpha/predicates.md (some_operand): Remove unused predicate.
+       (some_ni_operand): Ditto.
+
 2015-05-15  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/alpha/alpha.c (alpha_extract_integer): Do not handle

diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md
index 762080b15acdb6cb31d4866eac16fde478adbdb6..81c2d4f53a430e3ec91ebb2de00aeac50ff153d4 100644 (file)
--- a/gcc/config/alpha/alpha.md
+++ b/gcc/config/alpha/alpha.md
@@ -1235,7 +1235,7 @@
 
 (define_expand "extendqidi2"
   [(set (match_operand:DI 0 "register_operand")
-       (sign_extend:DI (match_operand:QI 1 "some_operand")))]
+       (sign_extend:DI (match_operand:QI 1 "general_operand")))]
   ""
 {
   if (TARGET_BWX)
@@ -1280,7 +1280,7 @@
 
 (define_expand "extendhidi2"
   [(set (match_operand:DI 0 "register_operand")
-       (sign_extend:DI (match_operand:HI 1 "some_operand")))]
+       (sign_extend:DI (match_operand:HI 1 "general_operand")))]
   ""
 {
   if (TARGET_BWX)
@@ -2902,8 +2902,8 @@
 
 (define_expand "cbranchdi4"
   [(use (match_operator 0 "alpha_cbranch_operator"
-         [(match_operand:DI 1 "some_operand")
-          (match_operand:DI 2 "some_operand")]))
+         [(match_operand:DI 1 "general_operand")
+          (match_operand:DI 2 "general_operand")]))
    (use (match_operand 3))]
   ""
   "alpha_emit_conditional_branch (operands, DImode); DONE;")
@@ -2936,8 +2936,8 @@
 
 (define_expand "cstoredi4"
   [(use (match_operator:DI 1 "alpha_cbranch_operator"
-         [(match_operand:DI 2 "some_operand")
-          (match_operand:DI 3 "some_operand")]))
+         [(match_operand:DI 2 "general_operand")
+          (match_operand:DI 3 "general_operand")]))
    (clobber (match_operand:DI 0 "register_operand"))]
   ""
 {

diff --git a/gcc/config/alpha/predicates.md b/gcc/config/alpha/predicates.md
index b33044d43a99a2f239e39cfc9bd0e1f1afc66c31..2a76710c4fc876f5fa3135473b8519c40c7988ff 100644 (file)
--- a/gcc/config/alpha/predicates.md
+++ b/gcc/config/alpha/predicates.md
@@ -148,20 +148,6 @@
   return REGNO_REG_CLASS (REGNO (op)) == GENERAL_REGS;
 })
 
-;; Return 1 if OP is something that can be reloaded into a register;
-;; if it is a MEM, it need not be valid.
-(define_predicate "some_operand"
-  (ior (match_code "reg,mem,const_int,const_wide_int,const_double,const_vector,
-                   label_ref,symbol_ref,const,high")
-       (and (match_code "subreg")
-           (match_test "some_operand (SUBREG_REG (op), VOIDmode)"))))
-
-;; Likewise, but don't accept constants.
-(define_predicate "some_ni_operand"
-  (ior (match_code "reg,mem")
-       (and (match_code "subreg")
-           (match_test "some_ni_operand (SUBREG_REG (op), VOIDmode)"))))
-
 ;; Return 1 if OP is a valid operand for the source of a move insn.
 (define_predicate "input_operand"
   (match_code "label_ref,symbol_ref,const,high,reg,subreg,mem,