i386.md (ashr<mode>3): Macroize expander from ashr{qi,hi,si,di,ti}3_1 using SDWIM mode iterator.

	* config/i386/i386.md (ashr<mode>3): Macroize expander from
	ashr{qi,hi,si,di,ti}3_1 using SDWIM mode iterator.
	(*ashr<mode>3_doubleword): New insn_and_split_pattern.  Macroize
	pattern from *ashr{di,ti}3_1 and corresponding splitters using
	DWI mode iterator.
	(*ashr<mode>3_doubleword peephole2): Macroize peephole2 pattern
	from corresponding peephole2 patterns.
	(ashrdi3_cvt): Rename from ashrdi3_63_rex64.
	(ashrsi3_cvt): Rename from ashrsi3_31.
	(*ashrsi3_cvt_zext): Rename from *ashrsi3_31_zext.
	(x86_shift<mode>_adj_3): Macroize expander from x86_shift_adj_3
	and x86_64_shift_adj_3 using SWI48 mode iterator.
	(*ashr<mode>3_1): Merge with *ashr{qi,hi,si}3_1_one_bit and
	*ashrdi3_1_one_bit_rex64. Macroize insn from *ashr{qi,hi,si}3_cmp
	and *ashrdi3_cmp_rex64 using SWI mode iterator.
	(*ashrqi3_1_slp): Merge with *ashrqi3_1_one_bit_slp.
	(*ashr<mode>3_cmp): Merge with *ashr{qi,hi,si}3_one_bit_cmp and
	*ashrdi3_one_bit_cmp_rex64. Macroize insn from *ashr{qi,hi,si}3_cmp
	and *ashrdi3_cmp_rex64 using SWI mode iterator.
	(*ashrsi3_cmp_zext): Merge with *ashrsi3_cmp_one_bit_zext.
	(*ashr<mode>3_cconly): Merge with *ashr{qi,hi,si}3_one_bit_cconly and
	*ashrdi3_one_bit_cconly_rex64. Macroize insn from
	*ashr{qi,hi,si}3_cconly and *ashrdi3_cconly_rex64 using
	SWI mode iterator.
	(sign_extend splitters): Update for renamed ashr{di,si}3_patterns.
	* config/i386/i386.c (ix86_split_ashr): Update for renamed
	x86_shift<mode>_adj_3 expander.

From-SVN: r158195

gcc/ChangeLog

+2010-04-10  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.md (ashr<mode>3): Macroize expander from
+	ashr{qi,hi,si,di,ti}3_1 using SDWIM mode iterator.
+	(*ashr<mode>3_doubleword): New insn_and_split_pattern.  Macroize
+	pattern from *ashr{di,ti}3_1 and corresponding splitters using
+	DWI mode iterator.
+	(*ashr<mode>3_doubleword peephole2): Macroize peephole2 pattern
+	from corresponding peephole2 patterns.
+	(ashrdi3_cvt): Rename from ashrdi3_63_rex64.
+	(ashrsi3_cvt): Rename from ashrsi3_31.
+	(*ashrsi3_cvt_zext): Rename from *ashrsi3_31_zext.
+	(x86_shift<mode>_adj_3): Macroize expander from x86_shift_adj_3
+	and x86_64_shift_adj_3 using SWI48 mode iterator.
+	(*ashr<mode>3_1): Merge with *ashr{qi,hi,si}3_1_one_bit and
+	*ashrdi3_1_one_bit_rex64. Macroize insn from *ashr{qi,hi,si}3_cmp
+	and *ashrdi3_cmp_rex64 using SWI mode iterator.
+	(*ashrqi3_1_slp): Merge with *ashrqi3_1_one_bit_slp.
+	(*ashr<mode>3_cmp): Merge with *ashr{qi,hi,si}3_one_bit_cmp and
+	*ashrdi3_one_bit_cmp_rex64. Macroize insn from *ashr{qi,hi,si}3_cmp
+	and *ashrdi3_cmp_rex64 using SWI mode iterator.
+	(*ashrsi3_cmp_zext): Merge with *ashrsi3_cmp_one_bit_zext.
+	(*ashr<mode>3_cconly): Merge with *ashr{qi,hi,si}3_one_bit_cconly and
+	*ashrdi3_one_bit_cconly_rex64. Macroize insn from
+	*ashr{qi,hi,si}3_cconly and *ashrdi3_cconly_rex64 using
+	SWI mode iterator.
+	(sign_extend splitters): Update for renamed ashr{di,si}3_patterns.
+	* config/i386/i386.c (ix86_split_ashr): Update for renamed
+	x86_shift<mode>_adj_3 expander.
+
 2010-04-10  Wei Guozhi  <carrot@google.com>
 
 	PR target/42601
@@ -44,8 +74,8 @@
 
 2010-04-09  Hariharan Sandanagobalane  <hariharan@picochip.com>
 
-	* config/picochip/picochip.c (picochip_rtx_costs): Use correct function
-	template.
+	* config/picochip/picochip.c (picochip_rtx_costs): Use correct
+	function template.
 	(picochip_override_options): Enable section anchors only above -O1.
 	(picochip_reorg): Fixed a couple of build warnings.
 

gcc/config/i386/i386.c

@@ -17224,8 +17224,8 @@ ix86_split_ashr (rtx *operands, rtx scratch, enum machine_mode mode)
 	}
       else
 	emit_insn ((mode == DImode
-		    ? gen_x86_shift_adj_3
-		    : gen_x86_64_shift_adj_3) (low[0], high[0], operands[2]));
+		    ? gen_x86_shiftsi_adj_3
+		    : gen_x86_shiftdi_adj_3) (low[0], high[0], operands[2]));
     }
 }
 

gcc/testsuite/ChangeLog

@@ -791,8 +791,7 @@
 	* objc.dg/try-catch-5.m: Ditto.
 	* objc.dg/const-str-10.m: Use shared wrapper headers (Object1.h,
 	Protocol1.h) and next-mapping.h as required. Use new NeXT
-	interface as required.  Skip for gnu-runtime.  Test for .quad
-	at m64.
+	interface as required.  Skip for gnu-runtime.  Test for .quad at m64.
 	* objc.dg/const-str-11.m: Ditto.
 	* objc.dg/const-str-9.m: Ditto.
 	* objc.dg/method-4.m: Skip for 64Bit NeXT.