7000.md (rm7_impy_si_mult): Just match imul and imadd.

	* config/mips/7000.md (rm7_impy_si_mult): Just match imul and imadd.
	Remove hilo_operand check.
	(rm7_impy_si_mul): Just match imul3.  Remove hilo_operand check.
	* config/mips/predicates.md (hilo_operand): Delete.

From-SVN: r99592

gcc/ChangeLog

 2005-05-11  Richard Sandiford  <rsandifo@redhat.com>
 
+	* config/mips/7000.md (rm7_impy_si_mult): Just match imul and imadd.
+	Remove hilo_operand check.
+	(rm7_impy_si_mul): Just match imul3.  Remove hilo_operand check.
+	* config/mips/predicates.md (hilo_operand): Delete.
+
+2005-05-11  Richard Sandiford  <rsandifo@redhat.com>
+
 	* config/mips/sr71k.md, config/mips/7000.md: Reformat.
 
 2005-05-11  Kazu Hirata  <kazu@cs.umass.edu>

gcc/config/mips/7000.md

@@ -115,17 +115,15 @@
 
 (define_insn_reservation "rm7_impy_si_mult" 5
   (and (eq_attr "cpu" "r7000")
-       (and (eq_attr "type" "imul,imul3,imadd")
-	    (and (eq_attr "mode" "SI")
-		 (match_operand 0 "hilo_operand"))))
+       (and (eq_attr "type" "imul,imadd")
+	    (eq_attr "mode" "SI")))
   "rm7_impydiv+(rm7_impydiv_iter*3)")
 
 ;; There are an additional 2 stall cycles.
 (define_insn_reservation "rm7_impy_si_mul" 2
   (and (eq_attr "cpu" "r7000")
-       (and (eq_attr "type" "imul,imul3,imadd")
-	    (and (eq_attr "mode" "SI")
-		 (not (match_operand 0 "hilo_operand")))))
+       (and (eq_attr "type" "imul3")
+	    (eq_attr "mode" "SI")))
   "rm7_impydiv")
 
 (define_insn_reservation "rm7_impy_di" 9

gcc/config/mips/predicates.md

@@ -69,10 +69,6 @@
   (and (match_code "reg")
        (match_test "FP_REG_P (REGNO (op))")))
 
-(define_predicate "hilo_operand"
-  (and (match_code "reg")
-       (match_test "MD_REG_P (REGNO (op))")))
-
 (define_predicate "lo_operand"
   (and (match_code "reg")
        (match_test "REGNO (op) == LO_REGNUM")))