From a5af08d26ce1678e462f91bb3fb9336e30d02ca8 Mon Sep 17 00:00:00 2001 From: vmakarov Date: Mon, 28 Mar 2011 01:53:24 +0000 Subject: 2011-03-27 Vladimir Makarov PR bootstrap/48307 Revert the previous patch. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171589 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/sched-deps.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gcc/sched-deps.c') diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c index dcee0190490..7293fc3c972 100644 --- a/gcc/sched-deps.c +++ b/gcc/sched-deps.c @@ -1821,10 +1821,10 @@ mark_insn_pseudo_birth (rtx insn, int regno, bool clobber_p, bool unused_p) enum reg_class cl; gcc_assert (regno >= FIRST_PSEUDO_REGISTER); - cl = sched_regno_pressure_class[regno]; + cl = sched_regno_cover_class[regno]; if (cl != NO_REGS) { - incr = ira_reg_class_max_nregs[cl][PSEUDO_REGNO_MODE (regno)]; + incr = ira_reg_class_nregs[cl][PSEUDO_REGNO_MODE (regno)]; if (clobber_p) { new_incr = reg_pressure_info[cl].clobber_increase + incr; @@ -1861,7 +1861,7 @@ mark_insn_hard_regno_birth (rtx insn, int regno, int nregs, gcc_assert (regno < FIRST_PSEUDO_REGISTER); if (! TEST_HARD_REG_BIT (ira_no_alloc_regs, regno)) { - cl = sched_regno_pressure_class[regno]; + cl = sched_regno_cover_class[regno]; if (cl != NO_REGS) { if (clobber_p) @@ -1922,10 +1922,10 @@ mark_pseudo_death (int regno) enum reg_class cl; gcc_assert (regno >= FIRST_PSEUDO_REGISTER); - cl = sched_regno_pressure_class[regno]; + cl = sched_regno_cover_class[regno]; if (cl != NO_REGS) { - incr = ira_reg_class_max_nregs[cl][PSEUDO_REGNO_MODE (regno)]; + incr = ira_reg_class_nregs[cl][PSEUDO_REGNO_MODE (regno)]; reg_pressure_info[cl].change -= incr; } } @@ -1943,7 +1943,7 @@ mark_hard_regno_death (int regno, int nregs) gcc_assert (regno < FIRST_PSEUDO_REGISTER); if (! TEST_HARD_REG_BIT (ira_no_alloc_regs, regno)) { - cl = sched_regno_pressure_class[regno]; + cl = sched_regno_cover_class[regno]; if (cl != NO_REGS) reg_pressure_info[cl].change -= 1; } @@ -2004,9 +2004,9 @@ setup_insn_reg_pressure_info (rtx insn) if (! INSN_P (insn)) return; - for (i = 0; i < ira_pressure_classes_num; i++) + for (i = 0; i < ira_reg_class_cover_size; i++) { - cl = ira_pressure_classes[i]; + cl = ira_reg_class_cover[i]; reg_pressure_info[cl].clobber_increase = 0; reg_pressure_info[cl].set_increase = 0; reg_pressure_info[cl].unused_set_increase = 0; @@ -2027,14 +2027,14 @@ setup_insn_reg_pressure_info (rtx insn) if (REG_NOTE_KIND (link) == REG_DEAD) mark_reg_death (XEXP (link, 0)); - len = sizeof (struct reg_pressure_data) * ira_pressure_classes_num; + len = sizeof (struct reg_pressure_data) * ira_reg_class_cover_size; pressure_info = INSN_REG_PRESSURE (insn) = (struct reg_pressure_data *) xmalloc (len); - INSN_MAX_REG_PRESSURE (insn) = (int *) xcalloc (ira_pressure_classes_num + INSN_MAX_REG_PRESSURE (insn) = (int *) xcalloc (ira_reg_class_cover_size * sizeof (int), 1); - for (i = 0; i < ira_pressure_classes_num; i++) + for (i = 0; i < ira_reg_class_cover_size; i++) { - cl = ira_pressure_classes[i]; + cl = ira_reg_class_cover[i]; pressure_info[i].clobber_increase = reg_pressure_info[cl].clobber_increase; pressure_info[i].set_increase = reg_pressure_info[cl].set_increase; -- cgit v1.2.1