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

re PR middle-end/39927 (build breakage for cris-elf building libstdc++-v3)

Browse Source 
PR middle-end/39927
        PR bootstrap/39929
        * tree-outof-ssa.c (emit_partition_copy): New function.
        (insert_partition_copy_on_edge, insert_rtx_to_part_on_edge,
        insert_part_to_rtx_on_edge): Perform the partition base var
        copy using emit_partition_copy.
        (insert_value_copy_on_edge): Convert constants to the right mode.
        (insert_rtx_to_part_on_edge): Add UNSIGNEDSRCP parameter.
        (elim_create): Pass the sign of the src to insert_rtx_to_part_on_edge.

Co-Authored-By: Michael Matz <matz@suse.de>

From-SVN: r146982
This commit is contained in:
Andreas Krebbel 2009-04-29 17:36:21 +00:00 committed by Michael Matz
parent 4e5d521bb5
commit 8e00168078
2 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/ChangeLog
View File

@ -1,3 +1,16 @@
2009-04-29 Andreas Krebbel <krebbel1@de.ibm.com>
Michael Matz <matz@suse.de>
PR middle-end/39927
PR bootstrap/39929
* tree-outof-ssa.c (emit_partition_copy): New function.
(insert_partition_copy_on_edge, insert_rtx_to_part_on_edge,
insert_part_to_rtx_on_edge): Perform the partition base var
copy using emit_partition_copy.
(insert_value_copy_on_edge): Convert constants to the right mode.
(insert_rtx_to_part_on_edge): Add UNSIGNEDSRCP parameter.
(elim_create): Pass the sign of the src to insert_rtx_to_part_on_edge.
2009-04-29 Bernd Schmidt <bernd.schmidt@analog.com> 2009-04-29 Bernd Schmidt <bernd.schmidt@analog.com>
* config/bfin/bfin.c (bfin_optimize_loop): If we need a scratch reg, * config/bfin/bfin.c (bfin_optimize_loop): If we need a scratch reg,

59
gcc/tree-outof-ssa.c
View File

@ -128,6 +128,25 @@ set_location_for_edge (edge e)
} }
} }
/* Emit insns to copy SRC into DEST converting SRC if necessary. */
static inline rtx
emit_partition_copy (rtx dest, rtx src, int unsignedsrcp)
{
rtx seq;
start_sequence ();
if (GET_MODE (src) != VOIDmode && GET_MODE (src) != GET_MODE (dest))
src = convert_to_mode (GET_MODE (dest), src, unsignedsrcp);
emit_move_insn (dest, src);
seq = get_insns ();
end_sequence ();
return seq;
}
/* Insert a copy instruction from partition SRC to DEST onto edge E. */ /* Insert a copy instruction from partition SRC to DEST onto edge E. */
static void static void
@ -149,12 +168,10 @@ insert_partition_copy_on_edge (edge e, int dest, int src)
set_location_for_edge (e); set_location_for_edge (e);
/* Partition copy between same base variables only, so it's the same mode, seq = emit_partition_copy (SA.partition_to_pseudo[dest],
hence we can use emit_move_insn. */ SA.partition_to_pseudo[src],
start_sequence (); TYPE_UNSIGNED (TREE_TYPE (
emit_move_insn (SA.partition_to_pseudo[dest], SA.partition_to_pseudo[src]); partition_to_var (SA.map, src))));
seq = get_insns ();
end_sequence ();
insert_insn_on_edge (seq, e); insert_insn_on_edge (seq, e);
} }
@ -186,6 +203,10 @@ insert_value_copy_on_edge (edge e, int dest, tree src)
x = expand_expr (src, SA.partition_to_pseudo[dest], mode, EXPAND_NORMAL); x = expand_expr (src, SA.partition_to_pseudo[dest], mode, EXPAND_NORMAL);
if (GET_MODE (x) != VOIDmode && GET_MODE (x) != mode) if (GET_MODE (x) != VOIDmode && GET_MODE (x) != mode)
x = convert_to_mode (mode, x, TYPE_UNSIGNED (TREE_TYPE (src))); x = convert_to_mode (mode, x, TYPE_UNSIGNED (TREE_TYPE (src)));
if (CONSTANT_P (x) && GET_MODE (x) == VOIDmode
&& mode != TYPE_MODE (TREE_TYPE (src)))
x = convert_modes (mode, TYPE_MODE (TREE_TYPE (src)),
x, TYPE_UNSIGNED (TREE_TYPE (src)));
if (x != SA.partition_to_pseudo[dest]) if (x != SA.partition_to_pseudo[dest])
emit_move_insn (SA.partition_to_pseudo[dest], x); emit_move_insn (SA.partition_to_pseudo[dest], x);
seq = get_insns (); seq = get_insns ();
@ -198,7 +219,7 @@ insert_value_copy_on_edge (edge e, int dest, tree src)
onto edge E. */ onto edge E. */
static void static void
insert_rtx_to_part_on_edge (edge e, int dest, rtx src) insert_rtx_to_part_on_edge (edge e, int dest, rtx src, int unsignedsrcp)
{ {
rtx seq; rtx seq;
if (dump_file && (dump_flags & TDF_DETAILS)) if (dump_file && (dump_flags & TDF_DETAILS))
@ -214,11 +235,9 @@ insert_rtx_to_part_on_edge (edge e, int dest, rtx src)
gcc_assert (SA.partition_to_pseudo[dest]); gcc_assert (SA.partition_to_pseudo[dest]);
set_location_for_edge (e); set_location_for_edge (e);
start_sequence (); seq = emit_partition_copy (SA.partition_to_pseudo[dest],
gcc_assert (GET_MODE (src) == GET_MODE (SA.partition_to_pseudo[dest])); src,
emit_move_insn (SA.partition_to_pseudo[dest], src); unsignedsrcp);
seq = get_insns ();
end_sequence ();
insert_insn_on_edge (seq, e); insert_insn_on_edge (seq, e);
} }
@ -243,11 +262,10 @@ insert_part_to_rtx_on_edge (edge e, rtx dest, int src)
gcc_assert (SA.partition_to_pseudo[src]); gcc_assert (SA.partition_to_pseudo[src]);
set_location_for_edge (e); set_location_for_edge (e);
start_sequence (); seq = emit_partition_copy (dest,
gcc_assert (GET_MODE (dest) == GET_MODE (SA.partition_to_pseudo[src])); SA.partition_to_pseudo[src],
emit_move_insn (dest, SA.partition_to_pseudo[src]); TYPE_UNSIGNED (TREE_TYPE (
seq = get_insns (); partition_to_var (SA.map, src))));
end_sequence ();
insert_insn_on_edge (seq, e); insert_insn_on_edge (seq, e);
} }
@ -522,14 +540,17 @@ elim_create (elim_graph g, int T)
if (elim_unvisited_predecessor (g, T)) if (elim_unvisited_predecessor (g, T))
{ {
rtx U = get_temp_reg (partition_to_var (g->map, T)); tree var = partition_to_var (g->map, T);
rtx U = get_temp_reg (var);
int unsignedsrcp = TYPE_UNSIGNED (TREE_TYPE (var));
insert_part_to_rtx_on_edge (g->e, U, T); insert_part_to_rtx_on_edge (g->e, U, T);
FOR_EACH_ELIM_GRAPH_PRED (g, T, P, FOR_EACH_ELIM_GRAPH_PRED (g, T, P,
{ {
if (!TEST_BIT (g->visited, P)) if (!TEST_BIT (g->visited, P))
{ {
elim_backward (g, P); elim_backward (g, P);
insert_rtx_to_part_on_edge (g->e, P, U); insert_rtx_to_part_on_edge (g->e, P, U, unsignedsrcp);
} }
}); });
} }