i386.md: Use default value in "isa" attribute.

	* config/i386/i386.md: Use default value in "isa" attribute.
	* config/i386/sse.md: Ditto.
	* config/i386/mmx.md: Ditto.

From-SVN: r174945

gcc/config/i386/i386.md

@@ -2151,7 +2151,7 @@
   [(set (attr "isa")
      (if_then_else (eq_attr "alternative" "9,10,11,12")
        (const_string "noavx")
-       (const_string "base")))
+       (const_string "*")))
    (set (attr "type")
      (cond [(eq_attr "alternative" "0,1")
 	      (const_string "multi")
@@ -12700,7 +12700,7 @@
 	   (if_then_else (match_operand:MODEF 3 "mult_operator" "")
 	      (const_string "fmul")
 	      (const_string "fop"))))
-   (set_attr "isa" "base,noavx,avx")
+   (set_attr "isa" "*,noavx,avx")
    (set_attr "prefix" "orig,orig,vex")
    (set_attr "mode" "<MODE>")])
 
@@ -12760,7 +12760,7 @@
                  (const_string "fdiv")
               ]
               (const_string "fop")))
-   (set_attr "isa" "base,base,noavx,avx")
+   (set_attr "isa" "*,*,noavx,avx")
    (set_attr "prefix" "orig,orig,orig,vex")
    (set_attr "mode" "<MODE>")])
 

gcc/config/i386/mmx.md

@@ -85,7 +85,19 @@
     %vmovq\t{%1, %0|%0, %1}
     %vmovd\t{%1, %0|%0, %1}
     %vmovd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "imov,imov,mmx,mmxmov,mmxmov,mmxmov,ssecvt,ssecvt,sselog1,ssemov,ssemov,ssemov,ssemov")
+  [(set (attr "type")
+     (cond [(eq_attr "alternative" "0,1")
+	      (const_string "imov")
+	    (eq_attr "alternative" "2")
+	      (const_string "mmx")
+	    (eq_attr "alternative" "3,4,5")
+	      (const_string "mmxmov")
+	    (eq_attr "alternative" "6,7")
+	      (const_string "ssecvt")
+	    (eq_attr "alternative" "8")
+	      (const_string "sselog1")
+	   ]
+	   (const_string "ssemov")))
    (set_attr "unit" "*,*,*,*,*,*,mmx,mmx,*,*,*,*,*")
    (set_attr "prefix_rep" "*,*,*,*,*,*,1,1,*,1,*,*,*")
    (set_attr "prefix_data16" "*,*,*,*,*,*,*,*,*,*,1,1,1")
@@ -125,8 +137,20 @@
   [(set (attr "isa")
      (if_then_else (eq_attr "alternative" "9,10,11,12")
        (const_string "noavx")
-       (const_string "base")))
-   (set_attr "type" "mmx,mmxmov,mmxmov,mmxmov,ssecvt,ssecvt,sselog1,ssemov,ssemov,sselog1,ssemov,ssemov,ssemov,*,*")
+       (const_string "*")))
+   (set (attr "type")
+     (cond [(eq_attr "alternative" "0")
+	      (const_string "mmx")
+	    (eq_attr "alternative" "1,2,3")
+	      (const_string "mmxmov")
+	    (eq_attr "alternative" "4,5")
+	      (const_string "ssecvt")
+	    (eq_attr "alternative" "6,9")
+	      (const_string "sselog1")
+	    (eq_attr "alternative" "13,14")
+	      (const_string "multi")
+	   ]
+	   (const_string "ssemov")))
    (set_attr "unit" "*,*,*,*,mmx,mmx,*,*,*,*,*,*,*,*,*")
    (set (attr "prefix_rep")
      (if_then_else
@@ -179,7 +203,19 @@
     %vmovlps\t{%1, %0|%0, %1}
     %vmovd\t{%1, %0|%0, %1}
     %vmovd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "imov,imov,mmx,mmxmov,mmxmov,mmxmov,ssecvt,ssecvt,ssemov,sselog1,ssemov,ssemov,ssemov,ssemov")
+  [(set (attr "type")
+     (cond [(eq_attr "alternative" "0,1")
+	      (const_string "imov")
+	    (eq_attr "alternative" "2")
+	      (const_string "mmx")
+	    (eq_attr "alternative" "3,4,5")
+	      (const_string "mmxmov")
+	    (eq_attr "alternative" "6,7")
+	      (const_string "ssecvt")
+	    (eq_attr "alternative" "9")
+	      (const_string "sselog1")
+	   ]
+	   (const_string "ssemov")))
    (set_attr "unit" "*,*,*,*,*,*,mmx,mmx,*,*,*,*,*,*")
    (set_attr "prefix_rep" "*,*,*,*,*,*,1,1,*,*,*,*,*,*")
    (set (attr "length_vex")
@@ -214,7 +250,19 @@
     %vmovlps\t{%1, %0|%0, %1}
     #
     #"
-  [(set_attr "type" "mmx,mmxmov,mmxmov,mmxmov,ssecvt,ssecvt,sselog1,ssemov,ssemov,ssemov,*,*")
+  [(set (attr "type")
+     (cond [(eq_attr "alternative" "0")
+	      (const_string "mmx")
+	    (eq_attr "alternative" "1,2,3")
+	      (const_string "mmxmov")
+	    (eq_attr "alternative" "4,5")
+	      (const_string "ssecvt")
+	    (eq_attr "alternative" "6")
+	      (const_string "sselog1")
+	    (eq_attr "alternative" "10,11")
+	      (const_string "multi")
+	   ]
+	   (const_string "ssemov")))
    (set_attr "unit" "*,*,*,*,mmx,mmx,*,*,*,*,*,*")
    (set_attr "prefix_rep" "*,*,*,*,1,1,*,*,*,*,*,*")
    (set (attr "prefix")
@@ -228,8 +276,8 @@
   [(set (match_operand:MMXMODE 0 "nonimmediate_operand" "")
         (match_operand:MMXMODE 1 "general_operand" ""))]
   "!TARGET_64BIT && reload_completed
-   && (!MMX_REG_P (operands[0]) && !SSE_REG_P (operands[0]))
-   && (!MMX_REG_P (operands[1]) && !SSE_REG_P (operands[1]))"
+   && !(MMX_REG_P (operands[0]) || SSE_REG_P (operands[0])
+	|| MMX_REG_P (operands[1]) || SSE_REG_P (operands[1]))"
   [(const_int 0)]
   "ix86_split_long_move (operands); DONE;")