diff -urp /export/home/uros/gcc.back/gcc/config/i386/i386.md i386/i386.md
--- /export/home/uros/gcc.back/gcc/config/i386/i386.md	2005-06-08 05:22:15.000000000 +0200
+++ i386/i386.md	2005-06-15 12:53:29.000000000 +0200
@@ -814,41 +814,26 @@
 ;; We may not use "#" to split and emit these, since the REG_DEAD notes
 ;; used to manage the reg stack popping would not be preserved.
 
-(define_insn "*cmpfp_0_sf"
+(define_insn "*cmpfp_0"
   [(set (match_operand:HI 0 "register_operand" "=a")
 	(unspec:HI
 	  [(compare:CCFP
-	     (match_operand:SF 1 "register_operand" "f")
-	     (match_operand:SF 2 "const0_operand" "X"))]
-	UNSPEC_FNSTSW))]
-  "TARGET_80387"
-  "* return output_fp_compare (insn, operands, 0, 0);"
-  [(set_attr "type" "multi")
-   (set_attr "mode" "SF")])
-
-(define_insn "*cmpfp_0_df"
-  [(set (match_operand:HI 0 "register_operand" "=a")
-	(unspec:HI
-	  [(compare:CCFP
-	     (match_operand:DF 1 "register_operand" "f")
-	     (match_operand:DF 2 "const0_operand" "X"))]
-	UNSPEC_FNSTSW))]
-  "TARGET_80387"
-  "* return output_fp_compare (insn, operands, 0, 0);"
-  [(set_attr "type" "multi")
-   (set_attr "mode" "DF")])
-
-(define_insn "*cmpfp_0_xf"
-  [(set (match_operand:HI 0 "register_operand" "=a")
-	(unspec:HI
-	  [(compare:CCFP
-	     (match_operand:XF 1 "register_operand" "f")
-	     (match_operand:XF 2 "const0_operand" "X"))]
+	     (match_operand 1 "register_operand" "f")
+	     (match_operand 2 "const0_operand" "X"))]
 	UNSPEC_FNSTSW))]
-  "TARGET_80387"
+  "TARGET_80387
+   && FLOAT_MODE_P (GET_MODE (operands[1]))
+   && GET_MODE (operands[1]) == GET_MODE (operands[2])"
   "* return output_fp_compare (insn, operands, 0, 0);"
   [(set_attr "type" "multi")
-   (set_attr "mode" "XF")])
+   (set_attr "unit" "i387")
+   (set (attr "mode")
+     (cond [(match_operand:SF 1 "" "")
+	      (const_string "SF")
+	    (match_operand:DF 1 "" "")
+	      (const_string "DF")
+	   ]
+	   (const_string "XF")))])
 
 (define_insn "*cmpfp_sf"
   [(set (match_operand:HI 0 "register_operand" "=a")
@@ -860,6 +845,7 @@
   "TARGET_80387"
   "* return output_fp_compare (insn, operands, 0, 0);"
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387")
    (set_attr "mode" "SF")])
 
 (define_insn "*cmpfp_df"
@@ -872,6 +858,7 @@
   "TARGET_80387"
   "* return output_fp_compare (insn, operands, 0, 0);"
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387")
    (set_attr "mode" "DF")])
 
 (define_insn "*cmpfp_xf"
@@ -884,6 +871,7 @@
   "TARGET_80387"
   "* return output_fp_compare (insn, operands, 0, 0);"
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387")
    (set_attr "mode" "XF")])
 
 (define_insn "*cmpfp_u"
@@ -898,6 +886,7 @@
    && GET_MODE (operands[1]) == GET_MODE (operands[2])"
   "* return output_fp_compare (insn, operands, 0, 1);"
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387")
    (set (attr "mode")
      (cond [(match_operand:SF 1 "" "")
 	      (const_string "SF")
@@ -919,6 +908,7 @@
    && (GET_MODE (operands [3]) == GET_MODE (operands[1]))"
   "* return output_fp_compare (insn, operands, 0, 0);"
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387")
    (set_attr "fp_int_src" "true")
    (set_attr "mode" "<MODE>")])
 
@@ -2209,6 +2199,7 @@
   return "push{l}\t%1";
 }
   [(set_attr "type" "multi,push,multi")
+   (set_attr "unit" "i387,*,*")
    (set_attr "mode" "SF,SI,SF")])
 
 (define_insn "*pushsf_rex64"
@@ -2221,6 +2212,7 @@
   return "push{q}\t%q1";
 }
   [(set_attr "type" "multi,push,multi")
+   (set_attr "unit" "i387,*,*")
    (set_attr "mode" "SF,DI,SF")])
 
 (define_split
@@ -2374,6 +2366,7 @@
   gcc_unreachable ();
 }
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387,*,*,*")
    (set_attr "mode" "DF,SI,SI,DF")])
 
 (define_insn "*pushdf_integer"
@@ -2385,6 +2378,7 @@
   gcc_unreachable ();
 }
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387,*,*")
    (set_attr "mode" "DF,SI,DF")])
 
 ;; %%% Kill this when call knows how to work this out.
@@ -2707,6 +2701,7 @@
   gcc_unreachable ();
 }
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387,*,*")
    (set_attr "mode" "XF,SI,SI")])
 
 (define_insn "*pushxf_integer"
@@ -2718,6 +2713,7 @@
   gcc_unreachable ();
 }
   [(set_attr "type" "multi")
+   (set_attr "unit" "i387,*")
    (set_attr "mode" "XF,SI")])
 
 (define_split
@@ -3745,6 +3741,7 @@
     }
 }
   [(set_attr "type" "fmov,multi,ssecvt")
+   (set_attr "unit" "*,i387,*")
    (set_attr "mode" "SF")])
 
 (define_insn "*truncdfsf_i387"
@@ -3768,6 +3765,7 @@
     }
 }
   [(set_attr "type" "fmov,multi")
+   (set_attr "unit" "*,i387")
    (set_attr "mode" "SF")])
 
 (define_insn "*truncdfsf2_i387_1"
@@ -3833,6 +3831,7 @@
     return "fst%z0\t%y0";
 }
   [(set_attr "type" "fmov,multi,multi,multi")
+   (set_attr "unit" "*,i387,i387,i387")
    (set_attr "mode" "SF")])
 
 (define_insn "truncxfsf2_i387_noop"
@@ -3859,6 +3858,7 @@
      return "fst%z0\t%y0";
 }
   [(set_attr "type" "fmov,multi,multi")
+   (set_attr "unit" "*,i387,i387")
    (set_attr "mode" "SF")])
 
 (define_insn "*truncxfsf2_i387_1"
@@ -3929,6 +3929,7 @@
     return "fst%z0\t%y0";
 }
   [(set_attr "type" "fmov,multi,multi,multi")
+   (set_attr "unit" "*,i387,i387,i387")
    (set_attr "mode" "DF")])
 
 (define_insn "truncxfdf2_i387_noop"
@@ -3955,6 +3956,7 @@
     return "fst%z0\t%y0";
 }
   [(set_attr "type" "fmov,multi,multi")
+   (set_attr "unit" "*,i387,i387")
    (set_attr "mode" "DF")])
 
 (define_insn "*truncxfdf2_i387_1"
@@ -4405,6 +4407,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "SF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 (define_expand "floatsisf2"
@@ -4424,6 +4427,7 @@
    cvtsi2ss\t{%1, %0|%0, %1}"
   [(set_attr "type" "fmov,multi,sseicvt,sseicvt")
    (set_attr "mode" "SF")
+   (set_attr "unit" "*,i387,*,*")
    (set_attr "athlon_decode" "*,*,vector,double")
    (set_attr "fp_int_src" "true")])
 
@@ -4446,6 +4450,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "SF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 (define_expand "floatdisf2"
@@ -4465,6 +4470,7 @@
    cvtsi2ss{q}\t{%1, %0|%0, %1}"
   [(set_attr "type" "fmov,multi,sseicvt,sseicvt")
    (set_attr "mode" "SF")
+   (set_attr "unit" "*,i387,*,*")
    (set_attr "athlon_decode" "*,*,vector,double")
    (set_attr "fp_int_src" "true")])
 
@@ -4487,6 +4493,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "SF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 (define_expand "floathidf2"
@@ -4511,6 +4518,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "DF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 (define_expand "floatsidf2"
@@ -4530,6 +4538,7 @@
    cvtsi2sd\t{%1, %0|%0, %1}"
   [(set_attr "type" "fmov,multi,sseicvt,sseicvt")
    (set_attr "mode" "DF")
+   (set_attr "unit" "*,i387,*,*")
    (set_attr "athlon_decode" "*,*,double,direct")
    (set_attr "fp_int_src" "true")])
 
@@ -4552,6 +4561,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "DF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 (define_expand "floatdidf2"
@@ -4571,6 +4581,7 @@
    cvtsi2sd{q}\t{%1, %0|%0, %1}"
   [(set_attr "type" "fmov,multi,sseicvt,sseicvt")
    (set_attr "mode" "DF")
+   (set_attr "unit" "*,i387,*,*")
    (set_attr "athlon_decode" "*,*,double,direct")
    (set_attr "fp_int_src" "true")])
 
@@ -4593,6 +4604,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "DF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 (define_insn "floathixf2"
@@ -4604,6 +4616,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "XF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 (define_insn "floatsixf2"
@@ -4615,6 +4628,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "XF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 (define_insn "floatdixf2"
@@ -4626,6 +4640,7 @@
    #"
   [(set_attr "type" "fmov,multi")
    (set_attr "mode" "XF")
+   (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
 ;; %%% Kill these when reload knows how to do it.
diff -urp /export/home/uros/gcc.back/gcc/config/i386/mmx.md i386/mmx.md
--- /export/home/uros/gcc.back/gcc/config/i386/mmx.md	2005-04-20 21:56:15.000000000 +0200
+++ i386/mmx.md	2005-06-15 12:49:55.000000000 +0200
@@ -83,6 +83,7 @@
     movd\t{%1, %0|%0, %1}
     movd\t{%1, %0|%0, %1}"
   [(set_attr "type" "imov,imov,mmxmov,mmxmov,mmxmov,ssecvt,ssecvt,ssemov,ssemov,ssemov,ssemov,ssemov")
+   (set_attr "unit" "*,*,*,*,*,mmx,mmx,*,*,*,*,*")
    (set_attr "mode" "DI")])
 
 (define_insn "*mov<mode>_internal"
@@ -108,6 +109,7 @@
     #
     #"
   [(set_attr "type" "mmxmov,mmxmov,mmxmov,ssecvt,ssecvt,ssemov,ssemov,ssemov,ssemov,ssemov,ssemov,ssemov,*,*")
+   (set_attr "unit" "*,*,*,mmx,mmx,*,*,*,*,*,*,*,*,*")
    (set_attr "mode" "DI,DI,DI,DI,DI,TI,DI,DI,V4SF,V4SF,V2SF,V2SF,DI,DI")])
 
 (define_expand "movv2sf"
@@ -141,6 +143,7 @@
     movd\t{%1, %0|%0, %1}
     movd\t{%1, %0|%0, %1}"
   [(set_attr "type" "imov,imov,mmxmov,mmxmov,mmxmov,ssecvt,ssecvt,ssemov,ssemov,ssemov,ssemov,ssemov,ssemov")
+   (set_attr "unit" "*,*,*,*,*,mmx,mmx,*,*,*,*,*,*")
    (set_attr "mode" "DI,DI,DI,DI,DI,DI,DI,V4SF,V4SF,V2SF,V2SF,DI,DI")])
 
 (define_insn "*movv2sf_internal"
@@ -163,6 +166,7 @@
     #
     #"
   [(set_attr "type" "mmxmov,mmxmov,mmxmov,ssecvt,ssecvt,ssemov,ssemov,ssemov,ssemov,*,*")
+   (set_attr "unit" "*,*,*,mmx,mmx,*,*,*,*,*,*")
    (set_attr "mode" "DI,DI,DI,DI,DI,V4SF,V4SF,V2SF,V2SF,DI,DI")])
 
 ;; %%% This multiword shite has got to go.
@@ -1346,8 +1350,8 @@
 		   UNSPEC_MOVMSK))]
   "TARGET_SSE || TARGET_3DNOW_A"
   "pmovmskb\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
+  [(set_attr "type" "mmxcvt")
+   (set_attr "mode" "DI")])
 
 (define_expand "mmx_maskmovq"
   [(set (match_operand:V8QI 0 "memory_operand" "")
@@ -1382,6 +1386,18 @@
   [(set_attr "type" "mmxcvt")
    (set_attr "mode" "DI")])
 
diff -urp /export/home/uros/gcc.back/gcc/config/i386/sse.md i386/sse.md
--- /export/home/uros/gcc.back/gcc/config/i386/sse.md	2005-05-26 20:14:58.000000000 +0200
+++ i386/sse.md	2005-06-15 13:12:29.000000000 +0200
@@ -857,6 +857,7 @@
   "TARGET_SSE"
   "cvtps2pi\t{%1, %0|%0, %1}"
   [(set_attr "type" "ssecvt")
+   (set_attr "unit" "mmx")
    (set_attr "mode" "DI")])
 
 (define_insn "sse_cvttps2pi"
@@ -867,6 +868,7 @@
   "TARGET_SSE"
   "cvttps2pi\t{%1, %0|%0, %1}"
   [(set_attr "type" "ssecvt")
+   (set_attr "unit" "mmx")
    (set_attr "mode" "SF")])
 
 (define_insn "sse_cvtsi2ss"
@@ -1791,11 +1793,12 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define_insn "sse2_cvtpi2pd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-	(float:V2DF (match_operand:V2SI 1 "nonimmediate_operand" "ym")))]
+  [(set (match_operand:V2DF 0 "register_operand" "=x,x")
+	(float:V2DF (match_operand:V2SI 1 "nonimmediate_operand" "y,m")))]
   "TARGET_SSE2"
   "cvtpi2pd\t{%1, %0|%0, %1}"
   [(set_attr "type" "ssecvt")
+   (set_attr "unit" "mmx,*")
    (set_attr "mode" "V2DF")])
 
 (define_insn "sse2_cvtpd2pi"
@@ -1805,6 +1808,7 @@
   "TARGET_SSE2"
   "cvtpd2pi\t{%1, %0|%0, %1}"
   [(set_attr "type" "ssecvt")
+   (set_attr "unit" "mmx")
    (set_attr "mode" "DI")])
 
 (define_insn "sse2_cvttpd2pi"
@@ -1813,6 +1817,7 @@
   "TARGET_SSE2"
   "cvttpd2pi\t{%1, %0|%0, %1}"
   [(set_attr "type" "ssecvt")
+   (set_attr "unit" "mmx")
    (set_attr "mode" "TI")])
 
 (define_insn "sse2_cvtsi2sd"