This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[sel-sched] Merge with trunk rev. 139128
- From: Andrey Belevantsev <abel at ispras dot ru>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Mon, 18 Aug 2008 18:57:11 +0400
- Subject: [sel-sched] Merge with trunk rev. 139128
Hello,
The merge only required avoiding 'new' and 'class' names in the
selective scheduler files.
Andrey
2008-08-18 Andrey Belevantsev <abel@ispras.ru>
Merge with trunk rev. 139128.
* sel-sched-ir.c (vinsn_init): Rename `class' to `insn_class'.
* sel-sched.c (substitute_reg_in_expr): Rename `new' to `new_rtx'.
Index: gcc/sel-sched-ir.c
===================================================================
*** gcc/sel-sched-ir.c (revision 139128)
--- gcc/sel-sched-ir.c (working copy)
*************** static void
*** 1120,1126 ****
vinsn_init (vinsn_t vi, insn_t insn, bool force_unique_p)
{
hash_rtx_callback_function hrcf;
! int class;
VINSN_INSN_RTX (vi) = insn;
VINSN_COUNT (vi) = 0;
--- 1120,1126 ----
vinsn_init (vinsn_t vi, insn_t insn, bool force_unique_p)
{
hash_rtx_callback_function hrcf;
! int insn_class;
VINSN_INSN_RTX (vi) = insn;
VINSN_COUNT (vi) = 0;
*************** vinsn_init (vinsn_t vi, insn_t insn, boo
*** 1150,1157 ****
VINSN_HASH_RTX (vi) = VINSN_HASH (vi);
}
! class = haifa_classify_insn (insn);
! if (class >= 2
&& (!targetm.sched.get_insn_spec_ds
|| ((targetm.sched.get_insn_spec_ds (insn) & BEGIN_CONTROL)
== 0)))
--- 1150,1157 ----
VINSN_HASH_RTX (vi) = VINSN_HASH (vi);
}
! insn_class = haifa_classify_insn (insn);
! if (insn_class >= 2
&& (!targetm.sched.get_insn_spec_ds
|| ((targetm.sched.get_insn_spec_ds (insn) & BEGIN_CONTROL)
== 0)))
Index: gcc/sel-sched.c
===================================================================
*** gcc/sel-sched.c (revision 139128)
--- gcc/sel-sched.c (working copy)
*************** substitute_reg_in_expr (expr_t expr, ins
*** 722,729 ****
bool new_insn_valid;
vinsn_t *vi = &EXPR_VINSN (expr);
bool has_rhs = VINSN_RHS (*vi) != NULL;
! rtx old, new;
!
/* Do not try to replace in SET_DEST. Although we'll choose new
register for the RHS, we don't want to change RHS' original reg.
--- 722,728 ----
bool new_insn_valid;
vinsn_t *vi = &EXPR_VINSN (expr);
bool has_rhs = VINSN_RHS (*vi) != NULL;
! rtx old, new_rtx;
/* Do not try to replace in SET_DEST. Although we'll choose new
register for the RHS, we don't want to change RHS' original reg.
*************** substitute_reg_in_expr (expr_t expr, ins
*** 742,748 ****
rtx *where_replace;
/* We should copy these rtxes before substitution. */
! new = copy_rtx (undo ? INSN_LHS (insn) : INSN_RHS (insn));
new_insn = create_copy_of_insn_rtx (VINSN_INSN_RTX (*vi));
/* Where we'll replace.
--- 741,747 ----
rtx *where_replace;
/* We should copy these rtxes before substitution. */
! new_rtx = copy_rtx (undo ? INSN_LHS (insn) : INSN_RHS (insn));
new_insn = create_copy_of_insn_rtx (VINSN_INSN_RTX (*vi));
/* Where we'll replace.
*************** substitute_reg_in_expr (expr_t expr, ins
*** 753,759 ****
: &PATTERN (new_insn));
new_insn_valid
! = validate_replace_rtx_part_nosimplify (old, new, where_replace,
new_insn);
/* ??? Actually, constrain_operands result depends upon choice of
--- 752,758 ----
: &PATTERN (new_insn));
new_insn_valid
! = validate_replace_rtx_part_nosimplify (old, new_rtx, where_replace,
new_insn);
/* ??? Actually, constrain_operands result depends upon choice of