reg-stack.c (subst_stack_regs_pat): Use replace_reg to swap operands.

	* reg-stack.c (subst_stack_regs_pat):  Use replace_reg to swap
	operands.

	* i386.c (ix86_expand_branch): Mode of comparison in
	IF_THEN_ELSE is VOIDmode.

From-SVN: r35458

gcc/ChangeLog

+Thu Aug  3 20:32:25 MET DST 2000  Jan Hubicka  <jh@suse.cz>
+
+	* reg-stack.c (subst_stack_regs_pat):  Use replace_reg to swap
+	operands.
+
+	* i386.c (ix86_expand_branch): Mode of comparison in
+	IF_THEN_ELSE is VOIDmode.
+
 Thu Aug  3 10:05:53 2000  Akiko Matsushita <matusita@sra.co.jp>
 
 	* gengenrtl.c, rtl.c: Avoid #elif.

gcc/config/i386/i386.c

@@ -4897,7 +4897,7 @@ ix86_expand_branch (code, label)
 	code = ix86_prepare_fp_compare_args (code, &ix86_compare_op0,
 					     &ix86_compare_op1);
 
-	tmp = gen_rtx_fmt_ee (code, ix86_fp_compare_mode (code),
+	tmp = gen_rtx_fmt_ee (code, VOIDmode,
 			      ix86_compare_op0, ix86_compare_op1);
 	tmp = gen_rtx_IF_THEN_ELSE (VOIDmode, tmp,
 				    gen_rtx_LABEL_REF (VOIDmode, label),

gcc/reg-stack.c

@@ -1637,9 +1637,9 @@ subst_stack_regs_pat (insn, regstack, pat)
 		&& REG_P (*src1) && REG_P (*src2)
 		&& REGNO (*src1) != REGNO (*dest))
 	     {
-		rtx tmp = *src1;
-		*src1 = *src2;
-		*src2 = tmp;
+		int tmp = REGNO (*src1);
+		replace_reg (src1, REGNO (*src2));
+		replace_reg (src2, tmp);
 	     }
 	    break;