OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sh.c: Do not include algorithm.

Browse Source 
* config/sh/sh.c: Do not include algorithm.
	(sh_emit_scc_to_t): Replace open-coded swap with std::swap
	to swap values.
	(sh_emit_compare_and_branch): Ditto.
	(sh_emit_compare_and_set): Ditto.
	* config/sh/sh.md (replacement peephole2): Ditto.
	(cstore4_media): Ditto.
	(*fmasf4): Ditto.

From-SVN: r217626
This commit is contained in:
Uros Bizjak 2014-11-16 12:50:29 +01:00 committed by Uros Bizjak
parent 24b5038632
commit 6f23a2d089
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2014-11-16 Uros Bizjak <ubizjak@gmail.com>
* config/sh/sh.c: Do not include algorithm.
(sh_emit_scc_to_t): Replace open-coded swap with std::swap
to swap values.
(sh_emit_compare_and_branch): Ditto.
(sh_emit_compare_and_set): Ditto.
* config/sh/sh.md (replacement peephole2): Ditto.
(cstore4_media): Ditto.
(*fmasf4): Ditto.
2014-11-15 Vladimir Makarov <vmakarov@redhat.com> 2014-11-15 Vladimir Makarov <vmakarov@redhat.com>
* lra-remat.c (cand_transf_func): Process regno for * lra-remat.c (cand_transf_func): Process regno for

14
gcc/config/sh/sh.c
View File

@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <algorithm>
#include "config.h" #include "config.h"
#include "system.h" #include "system.h"
@ -2351,11 +2350,7 @@ sh_emit_scc_to_t (enum rtx_code code, rtx op0, rtx op1)
break; break;
} }
if (code != oldcode) if (code != oldcode)
{ std::swap (op0, op1);
rtx tmp = op0;
op0 = op1;
op1 = tmp;
}
mode = GET_MODE (op0); mode = GET_MODE (op0);
if (mode == VOIDmode) if (mode == VOIDmode)
@ -2436,7 +2431,7 @@ sh_emit_compare_and_branch (rtx *operands, machine_mode mode)
enum rtx_code branch_code; enum rtx_code branch_code;
rtx op0 = operands[1]; rtx op0 = operands[1];
rtx op1 = operands[2]; rtx op1 = operands[2];
rtx insn, tem; rtx insn;
bool need_ccmpeq = false; bool need_ccmpeq = false;
if (TARGET_SH2E && GET_MODE_CLASS (mode) == MODE_FLOAT) if (TARGET_SH2E && GET_MODE_CLASS (mode) == MODE_FLOAT)
@ -2461,7 +2456,7 @@ sh_emit_compare_and_branch (rtx *operands, machine_mode mode)
|| (code == LE && TARGET_IEEE && TARGET_SH2E) || (code == LE && TARGET_IEEE && TARGET_SH2E)
|| (code == GE && !(TARGET_IEEE && TARGET_SH2E))) || (code == GE && !(TARGET_IEEE && TARGET_SH2E)))
{ {
tem = op0, op0 = op1, op1 = tem; std::swap (op0, op1);
code = swap_condition (code); code = swap_condition (code);
} }
@ -2520,7 +2515,6 @@ sh_emit_compare_and_set (rtx *operands, machine_mode mode)
rtx op1 = operands[3]; rtx op1 = operands[3];
rtx_code_label *lab = NULL; rtx_code_label *lab = NULL;
bool invert = false; bool invert = false;
rtx tem;
op0 = force_reg (mode, op0); op0 = force_reg (mode, op0);
if ((code != EQ && code != NE if ((code != EQ && code != NE
@ -2534,8 +2528,8 @@ sh_emit_compare_and_set (rtx *operands, machine_mode mode)
{ {
if (code == LT || code == LE) if (code == LT || code == LE)
{ {
std::swap (op0, op1);
code = swap_condition (code); code = swap_condition (code);
tem = op0, op0 = op1, op1 = tem;
} }
if (code == GE) if (code == GE)
{ {

19
gcc/config/sh/sh.md
View File

@ -1618,14 +1618,9 @@
extract_insn (insn2); extract_insn (insn2);
if (! constrain_operands (1, get_preferred_alternatives (insn2, bb))) if (! constrain_operands (1, get_preferred_alternatives (insn2, bb)))
{ {
rtx tmp;
failure: failure:
tmp = replacements[0]; std::swap (replacements[0], replacements[1]);
replacements[0] = replacements[1]; std::swap (replacements[2], replacements[3]);
replacements[1] = tmp;
tmp = replacements[2];
replacements[2] = replacements[3];
replacements[3] = tmp;
replace_n_hard_rtx (SET_DEST (set1), replacements, 2, 1); replace_n_hard_rtx (SET_DEST (set1), replacements, 2, 1);
replace_n_hard_rtx (SET_DEST (set2), replacements, 2, 1); replace_n_hard_rtx (SET_DEST (set2), replacements, 2, 1);
replace_n_hard_rtx (SET_SRC (set2), replacements, 2, 1); replace_n_hard_rtx (SET_SRC (set2), replacements, 2, 1);
@ -11348,9 +11343,7 @@ label:
if (swap) if (swap)
{ {
rtx tem = operands[2]; std::swap (operands[2], operands[3]);
operands[2] = operands[3];
operands[3] = tem;
code = swap_condition (code); code = swap_condition (code);
} }
@ -12538,11 +12531,7 @@ label:
/* Change 'b * a + a' into 'a * b + a'. /* Change 'b * a + a' into 'a * b + a'.
This is better for register allocation. */ This is better for register allocation. */
if (REGNO (operands[2]) == REGNO (operands[3])) if (REGNO (operands[2]) == REGNO (operands[3]))
{ std::swap (operands[1], operands[2]);
rtx tmp = operands[1];
operands[1] = operands[2];
operands[2] = tmp;
}
} }
[(set_attr "type" "fp") [(set_attr "type" "fp")
(set_attr "fp_mode" "single")]) (set_attr "fp_mode" "single")])