i386.c (ix86_legitimize_address): Use std::swap.

* config/i386/i386.c (ix86_legitimize_address): Use std::swap.
	(ix86_split_fp_branch): Ditto.
	(ix86_expand_int_movcc): Ditto.
	(ix86_expand_sse_compare): Ditto.

From-SVN: r219109
This commit is contained in:
Uros Bizjak 2014-12-30 15:49:18 +01:00 committed by Uros Bizjak
parent bc9b4a9285
commit 7aa358f2fd
2 changed files with 15 additions and 21 deletions

View File

@ -1,3 +1,10 @@
2014-12-30 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.c (ix86_legitimize_address): Use std::swap.
(ix86_split_fp_branch): Ditto.
(ix86_expand_int_movcc): Ditto.
(ix86_expand_sse_compare): Ditto.
2014-12-30 Jan Hubicka <hubicka@ucw.cz> 2014-12-30 Jan Hubicka <hubicka@ucw.cz>
* ipa-inline-analysis.c (edge_set_predicate): Reset size/time when * ipa-inline-analysis.c (edge_set_predicate): Reset size/time when

View File

@ -14362,9 +14362,7 @@ ix86_legitimize_address (rtx x, rtx, machine_mode mode)
/* Put multiply first if it isn't already. */ /* Put multiply first if it isn't already. */
if (GET_CODE (XEXP (x, 1)) == MULT) if (GET_CODE (XEXP (x, 1)) == MULT)
{ {
rtx tmp = XEXP (x, 0); std::swap (XEXP (x, 0), XEXP (x, 1));
XEXP (x, 0) = XEXP (x, 1);
XEXP (x, 1) = tmp;
changed = 1; changed = 1;
} }
@ -20497,10 +20495,8 @@ ix86_split_fp_branch (enum rtx_code code, rtx op1, rtx op2,
if (target2 != pc_rtx) if (target2 != pc_rtx)
{ {
rtx tmp = target2; std::swap (target1, target2);
code = reverse_condition_maybe_unordered (code); code = reverse_condition_maybe_unordered (code);
target2 = target1;
target1 = tmp;
} }
condition = ix86_expand_fp_compare (code, op1, op2, condition = ix86_expand_fp_compare (code, op1, op2,
@ -20615,7 +20611,7 @@ ix86_expand_carry_flag_compare (enum rtx_code code, rtx op0, rtx op1, rtx *pop)
} }
else else
{ {
std::swap (op1, op0); std::swap (op0, op1);
code = (code == GTU ? LTU : GEU); code = (code == GTU ? LTU : GEU);
} }
break; break;
@ -20720,9 +20716,7 @@ ix86_expand_int_movcc (rtx operands[])
/* To simplify rest of code, restrict to the GEU case. */ /* To simplify rest of code, restrict to the GEU case. */
if (compare_code == LTU) if (compare_code == LTU)
{ {
HOST_WIDE_INT tmp = ct; std::swap (ct, cf);
ct = cf;
cf = tmp;
compare_code = reverse_condition (compare_code); compare_code = reverse_condition (compare_code);
code = reverse_condition (code); code = reverse_condition (code);
} }
@ -20754,9 +20748,7 @@ ix86_expand_int_movcc (rtx operands[])
code = reverse_condition (code); code = reverse_condition (code);
else else
{ {
HOST_WIDE_INT tmp = ct; std::swap (ct, cf);
ct = cf;
cf = tmp;
diff = ct - cf; diff = ct - cf;
} }
tmp = emit_store_flag (tmp, code, op0, op1, VOIDmode, 0, -1); tmp = emit_store_flag (tmp, code, op0, op1, VOIDmode, 0, -1);
@ -21041,7 +21033,7 @@ ix86_expand_int_movcc (rtx operands[])
compare_code = LT; compare_code = LT;
} }
else else
std::swap (cf, ct); std::swap (ct, cf);
out = emit_store_flag (out, code, op0, op1, VOIDmode, 0, -1); out = emit_store_flag (out, code, op0, op1, VOIDmode, 0, -1);
} }
@ -36036,12 +36028,7 @@ ix86_expand_sse_compare (const struct builtin_description *d,
/* Swap operands if we have a comparison that isn't available in /* Swap operands if we have a comparison that isn't available in
hardware. */ hardware. */
if (swap) if (swap)
{ std::swap (op0, op1);
rtx tmp = gen_reg_rtx (mode1);
emit_move_insn (tmp, op1);
op1 = op0;
op0 = tmp;
}
if (optimize || !target if (optimize || !target
|| GET_MODE (target) != tmode || GET_MODE (target) != tmode
@ -36086,7 +36073,7 @@ ix86_expand_sse_comi (const struct builtin_description *d, tree exp,
/* Swap operands if we have a comparison that isn't available in /* Swap operands if we have a comparison that isn't available in
hardware. */ hardware. */
if (d->flag & BUILTIN_DESC_SWAP_OPERANDS) if (d->flag & BUILTIN_DESC_SWAP_OPERANDS)
std::swap (op1, op0); std::swap (op0, op1);
target = gen_reg_rtx (SImode); target = gen_reg_rtx (SImode);
emit_move_insn (target, const0_rtx); emit_move_insn (target, const0_rtx);