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

haifa-sched.c (free_list): Rename from free_pnd_lst. 

* haifa-sched.c (free_list): Rename from free_pnd_lst.
(free_pending_lists): Rename free_pnd_lst uses.
(remove_dependence): Place expunged element on unused_insn_list.
(alloc_INSN_LIST, alloc_EXPR_LIST): New.  Change all callers of
gen_rtx_*_LIST and alloc_rtx to use them.
(compute_block_backward_dependences): Free the reg_last_* lists.

From-SVN: r18415
This commit is contained in:
Richard Henderson 1998-03-04 18:15:23 -08:00 committed by Richard Henderson
parent c940e6278c
commit ebb7b10b6d
2 changed files with 168 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
Thu Mar 5 02:14:44 1998 Richard Henderson <rth@cygnus.com>
* haifa-sched.c (free_list): Rename from free_pnd_lst.
(free_pending_lists): Rename free_pnd_lst uses.
(remove_dependence): Place expunged element on unused_insn_list.
(alloc_INSN_LIST, alloc_EXPR_LIST): New. Change all callers of
gen_rtx_*_LIST and alloc_rtx to use them.
(compute_block_backward_dependences): Free the reg_last_* lists.
Thu Mar 5 00:05:40 1998 Jeffrey A Law (law@cygnus.com) Thu Mar 5 00:05:40 1998 Jeffrey A Law (law@cygnus.com)
* cccp.c (main): Avoid undefined behavior when setting pend_includes * cccp.c (main): Avoid undefined behavior when setting pend_includes

298
gcc/haifa-sched.c
View File

@ -791,6 +791,80 @@ static void split_block_insns PROTO ((int));
/* Helper functions for instruction scheduling. */ /* Helper functions for instruction scheduling. */
/* An INSN_LIST containing all INSN_LISTs allocated but currently unused. */
static rtx unused_insn_list;
/* An EXPR_LIST containing all EXPR_LISTs allocated but currently unused. */
static rtx unused_expr_list;
static void free_list PROTO ((rtx *, rtx *));
static rtx alloc_INSN_LIST PROTO ((rtx, rtx));
static rtx alloc_EXPR_LIST PROTO ((int, rtx, rtx));
static void
free_list (listp, unused_listp)
rtx *listp, *unused_listp;
{
register rtx link, prev_link;
if (*listp == 0)
return;
prev_link = *listp;
link = XEXP (prev_link, 1);
while (link)
{
prev_link = link;
link = XEXP (link, 1);
}
XEXP (prev_link, 1) = *unused_listp;
*unused_listp = *listp;
*listp = 0;
}
rtx
alloc_INSN_LIST (val, next)
rtx val, next;
{
rtx r;
if (unused_insn_list)
{
r = unused_insn_list;
unused_insn_list = XEXP (r, 1);
XEXP (r, 0) = val;
XEXP (r, 1) = next;
PUT_REG_NOTE_KIND (r, VOIDmode);
}
else
r = gen_rtx_INSN_LIST (VOIDmode, val, next);
return r;
}
rtx
alloc_EXPR_LIST (kind, val, next)
int kind;
rtx val, next;
{
rtx r;
if (unused_insn_list)
{
r = unused_insn_list;
unused_insn_list = XEXP (r, 1);
XEXP (r, 0) = val;
XEXP (r, 1) = next;
PUT_REG_NOTE_KIND (r, kind);
}
else
r = gen_rtx_EXPR_LIST (kind, val, next);
return r;
}
/* Add ELEM wrapped in an INSN_LIST with reg note kind DEP_TYPE to the /* Add ELEM wrapped in an INSN_LIST with reg note kind DEP_TYPE to the
LOG_LINKS of INSN, if not already there. DEP_TYPE indicates the type LOG_LINKS of INSN, if not already there. DEP_TYPE indicates the type
of dependence that this link represents. */ of dependence that this link represents. */
@ -865,12 +939,11 @@ add_dependence (insn, elem, dep_type)
} }
/* Might want to check one level of transitivity to save conses. */ /* Might want to check one level of transitivity to save conses. */
link = rtx_alloc (INSN_LIST); link = alloc_INSN_LIST (elem, LOG_LINKS (insn));
LOG_LINKS (insn) = link;
/* Insn dependency, not data dependency. */ /* Insn dependency, not data dependency. */
PUT_REG_NOTE_KIND (link, dep_type); PUT_REG_NOTE_KIND (link, dep_type);
XEXP (link, 0) = elem;
XEXP (link, 1) = LOG_LINKS (insn);
LOG_LINKS (insn) = link;
} }
/* Remove ELEM wrapped in an INSN_LIST from the LOG_LINKS /* Remove ELEM wrapped in an INSN_LIST from the LOG_LINKS
@ -881,18 +954,22 @@ remove_dependence (insn, elem)
rtx insn; rtx insn;
rtx elem; rtx elem;
{ {
rtx prev, link; rtx prev, link, next;
int found = 0; int found = 0;
for (prev = 0, link = LOG_LINKS (insn); link; link = XEXP (link, 1)) for (prev = 0, link = LOG_LINKS (insn); link; link = next)
{ {
next = XEXP (link, 1);
if (XEXP (link, 0) == elem) if (XEXP (link, 0) == elem)
{ {
RTX_INTEGRATED_P (link) = 1;
if (prev) if (prev)
XEXP (prev, 1) = XEXP (link, 1); XEXP (prev, 1) = next;
else else
LOG_LINKS (insn) = XEXP (link, 1); LOG_LINKS (insn) = next;
XEXP (link, 1) = unused_insn_list;
unused_insn_list = link;
found = 1; found = 1;
} }
else else
@ -945,14 +1022,6 @@ static rtx pending_write_mems;
static int pending_lists_length; static int pending_lists_length;
/* An INSN_LIST containing all INSN_LISTs allocated but currently unused. */
static rtx unused_insn_list;
/* An EXPR_LIST containing all EXPR_LISTs allocated but currently unused. */
static rtx unused_expr_list;
/* The last insn upon which all memory references must depend. /* The last insn upon which all memory references must depend.
This is an insn which flushed the pending lists, creating a dependency This is an insn which flushed the pending lists, creating a dependency
between it and all previously pending memory references. This creates between it and all previously pending memory references. This creates
@ -3232,40 +3301,15 @@ priority (insn)
/* Remove all INSN_LISTs and EXPR_LISTs from the pending lists and add /* Remove all INSN_LISTs and EXPR_LISTs from the pending lists and add
them to the unused_*_list variables, so that they can be reused. */ them to the unused_*_list variables, so that they can be reused. */
__inline static void
free_pnd_lst (listp, unused_listp)
rtx *listp, *unused_listp;
{
register rtx link, prev_link;
if (*listp == 0)
return;
prev_link = *listp;
link = XEXP (prev_link, 1);
while (link)
{
prev_link = link;
link = XEXP (link, 1);
}
XEXP (prev_link, 1) = *unused_listp;
*unused_listp = *listp;
*listp = 0;
}
static void static void
free_pending_lists () free_pending_lists ()
{ {
if (current_nr_blocks <= 1) if (current_nr_blocks <= 1)
{ {
free_pnd_lst (&pending_read_insns, &unused_insn_list); free_list (&pending_read_insns, &unused_insn_list);
free_pnd_lst (&pending_write_insns, &unused_insn_list); free_list (&pending_write_insns, &unused_insn_list);
free_pnd_lst (&pending_read_mems, &unused_expr_list); free_list (&pending_read_mems, &unused_expr_list);
free_pnd_lst (&pending_write_mems, &unused_expr_list); free_list (&pending_write_mems, &unused_expr_list);
} }
else else
{ {
@ -3274,10 +3318,10 @@ free_pending_lists ()
for (bb = 0; bb < current_nr_blocks; bb++) for (bb = 0; bb < current_nr_blocks; bb++)
{ {
free_pnd_lst (&bb_pending_read_insns[bb], &unused_insn_list); free_list (&bb_pending_read_insns[bb], &unused_insn_list);
free_pnd_lst (&bb_pending_write_insns[bb], &unused_insn_list); free_list (&bb_pending_write_insns[bb], &unused_insn_list);
free_pnd_lst (&bb_pending_read_mems[bb], &unused_expr_list); free_list (&bb_pending_read_mems[bb], &unused_expr_list);
free_pnd_lst (&bb_pending_write_mems[bb], &unused_expr_list); free_list (&bb_pending_write_mems[bb], &unused_expr_list);
} }
} }
} }
@ -3292,26 +3336,10 @@ add_insn_mem_dependence (insn_list, mem_list, insn, mem)
{ {
register rtx link; register rtx link;
if (unused_insn_list) link = alloc_INSN_LIST (insn, *insn_list);
{
link = unused_insn_list;
unused_insn_list = XEXP (link, 1);
}
else
link = rtx_alloc (INSN_LIST);
XEXP (link, 0) = insn;
XEXP (link, 1) = *insn_list;
*insn_list = link; *insn_list = link;
if (unused_expr_list) link = alloc_EXPR_LIST (VOIDmode, mem, *mem_list);
{
link = unused_expr_list;
unused_expr_list = XEXP (link, 1);
}
else
link = rtx_alloc (EXPR_LIST);
XEXP (link, 0) = mem;
XEXP (link, 1) = *mem_list;
*mem_list = link; *mem_list = link;
pending_lists_length++; pending_lists_length++;
@ -3364,8 +3392,8 @@ flush_pending_lists (insn, only_write)
for (u = last_pending_memory_flush; u; u = XEXP (u, 1)) for (u = last_pending_memory_flush; u; u = XEXP (u, 1))
add_dependence (insn, XEXP (u, 0), REG_DEP_ANTI); add_dependence (insn, XEXP (u, 0), REG_DEP_ANTI);
last_pending_memory_flush = free_list (&last_pending_memory_flush, &unused_insn_list);
gen_rtx_INSN_LIST (VOIDmode, insn, NULL_RTX); last_pending_memory_flush = alloc_INSN_LIST (insn, NULL_RTX);
} }
/* Analyze a single SET or CLOBBER rtx, X, creating all dependencies generated /* Analyze a single SET or CLOBBER rtx, X, creating all dependencies generated
@ -3581,8 +3609,7 @@ sched_analyze_2 (x, insn)
while (--i >= 0) while (--i >= 0)
{ {
reg_last_uses[regno + i] reg_last_uses[regno + i]
= gen_rtx_INSN_LIST (VOIDmode, = alloc_INSN_LIST (insn, reg_last_uses[regno + i]);
insn, reg_last_uses[regno + i]);
for (u = reg_last_sets[regno + i]; u; u = XEXP (u, 1)) for (u = reg_last_sets[regno + i]; u; u = XEXP (u, 1))
add_dependence (insn, XEXP (u, 0), 0); add_dependence (insn, XEXP (u, 0), 0);
@ -3595,8 +3622,7 @@ sched_analyze_2 (x, insn)
} }
else else
{ {
reg_last_uses[regno] reg_last_uses[regno] = alloc_INSN_LIST (insn, reg_last_uses[regno]);
= gen_rtx_INSN_LIST (VOIDmode, insn, reg_last_uses[regno]);
for (u = reg_last_sets[regno]; u; u = XEXP (u, 1)) for (u = reg_last_sets[regno]; u; u = XEXP (u, 1))
add_dependence (insn, XEXP (u, 0), 0); add_dependence (insn, XEXP (u, 0), 0);
@ -3835,18 +3861,20 @@ sched_analyze_insn (x, insn, loop_notes)
EXECUTE_IF_SET_IN_REG_SET (reg_pending_sets, 0, i, EXECUTE_IF_SET_IN_REG_SET (reg_pending_sets, 0, i,
{ {
/* reg_last_sets[r] is now a list of insns */ /* reg_last_sets[r] is now a list of insns */
free_list (&reg_last_sets[i], &unused_insn_list);
reg_last_sets[i] reg_last_sets[i]
= gen_rtx_INSN_LIST (VOIDmode, insn, NULL_RTX); = alloc_INSN_LIST (insn, NULL_RTX);
}); });
CLEAR_REG_SET (reg_pending_sets); CLEAR_REG_SET (reg_pending_sets);
if (reg_pending_sets_all) if (reg_pending_sets_all)
{ {
for (i = 0; i < maxreg; i++) for (i = 0; i < maxreg; i++)
{
/* reg_last_sets[r] is now a list of insns */ /* reg_last_sets[r] is now a list of insns */
reg_last_sets[i] free_list (&reg_last_sets[i], &unused_insn_list);
= gen_rtx_INSN_LIST (VOIDmode, insn, NULL_RTX); reg_last_sets[i] = alloc_INSN_LIST (insn, NULL_RTX);
}
reg_pending_sets_all = 0; reg_pending_sets_all = 0;
} }
@ -3946,12 +3974,12 @@ sched_analyze (head, tail)
/* Add a pair of fake REG_NOTE which we will later /* Add a pair of fake REG_NOTE which we will later
convert back into a NOTE_INSN_SETJMP note. See convert back into a NOTE_INSN_SETJMP note. See
reemit_notes for why we use a pair of NOTEs. */ reemit_notes for why we use a pair of NOTEs. */
REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_DEAD, REG_NOTES (insn) = alloc_EXPR_LIST (REG_DEAD,
GEN_INT (0), GEN_INT (0),
REG_NOTES (insn)); REG_NOTES (insn));
REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_DEAD, REG_NOTES (insn) = alloc_EXPR_LIST (REG_DEAD,
GEN_INT (NOTE_INSN_SETJMP), GEN_INT (NOTE_INSN_SETJMP),
REG_NOTES (insn)); REG_NOTES (insn));
} }
else else
{ {
@ -3993,8 +4021,8 @@ sched_analyze (head, tail)
function call) on all hard register clobberage. */ function call) on all hard register clobberage. */
/* last_function_call is now a list of insns */ /* last_function_call is now a list of insns */
last_function_call free_list(&last_function_call, &unused_insn_list);
= gen_rtx_INSN_LIST (VOIDmode, insn, NULL_RTX); last_function_call = alloc_INSN_LIST (insn, NULL_RTX);
} }
/* See comments on reemit_notes as to why we do this. */ /* See comments on reemit_notes as to why we do this. */
@ -4006,12 +4034,12 @@ sched_analyze (head, tail)
|| (NOTE_LINE_NUMBER (insn) == NOTE_INSN_SETJMP || (NOTE_LINE_NUMBER (insn) == NOTE_INSN_SETJMP
&& GET_CODE (PREV_INSN (insn)) != CALL_INSN))) && GET_CODE (PREV_INSN (insn)) != CALL_INSN)))
{ {
loop_notes = gen_rtx_EXPR_LIST (REG_DEAD, loop_notes = alloc_EXPR_LIST (REG_DEAD,
GEN_INT (NOTE_BLOCK_NUMBER (insn)), GEN_INT (NOTE_BLOCK_NUMBER (insn)),
loop_notes); loop_notes);
loop_notes = gen_rtx_EXPR_LIST (REG_DEAD, loop_notes = alloc_EXPR_LIST (REG_DEAD,
GEN_INT (NOTE_LINE_NUMBER (insn)), GEN_INT (NOTE_LINE_NUMBER (insn)),
loop_notes); loop_notes);
CONST_CALL_P (loop_notes) = CONST_CALL_P (insn); CONST_CALL_P (loop_notes) = CONST_CALL_P (insn);
} }
@ -4226,9 +4254,7 @@ queue_insn (insn, n_cycles)
int n_cycles; int n_cycles;
{ {
int next_q = NEXT_Q_AFTER (q_ptr, n_cycles); int next_q = NEXT_Q_AFTER (q_ptr, n_cycles);
rtx link = rtx_alloc (INSN_LIST); rtx link = alloc_INSN_LIST (insn, insn_queue[next_q]);
XEXP (link, 0) = insn;
XEXP (link, 1) = insn_queue[next_q];
insn_queue[next_q] = link; insn_queue[next_q] = link;
q_size += 1; q_size += 1;
@ -4443,10 +4469,7 @@ create_reg_dead_note (reg, insn)
if (current_nr_blocks <= 1) if (current_nr_blocks <= 1)
abort (); abort ();
else else
{ link = alloc_EXPR_LIST (REG_DEAD, NULL_RTX, NULL_RTX);
link = rtx_alloc (EXPR_LIST);
PUT_REG_NOTE_KIND (link, REG_DEAD);
}
} }
else else
{ {
@ -4473,12 +4496,8 @@ create_reg_dead_note (reg, insn)
if (link == NULL_RTX && current_nr_blocks <= 1) if (link == NULL_RTX && current_nr_blocks <= 1)
abort (); abort ();
else if (link == NULL_RTX) else if (link == NULL_RTX)
{ link = alloc_EXPR_LIST (REG_DEAD, gen_rtx_REG (word_mode, 0),
link = rtx_alloc (EXPR_LIST); NULL_RTX);
PUT_REG_NOTE_KIND (link, REG_DEAD);
XEXP (link, 0) = gen_rtx_REG (word_mode, 0);
XEXP (link, 1) = NULL_RTX;
}
reg_note_regs += (REGNO (XEXP (link, 0)) >= FIRST_PSEUDO_REGISTER ? 1 reg_note_regs += (REGNO (XEXP (link, 0)) >= FIRST_PSEUDO_REGISTER ? 1
: HARD_REGNO_NREGS (REGNO (XEXP (link, 0)), : HARD_REGNO_NREGS (REGNO (XEXP (link, 0)),
@ -4492,10 +4511,7 @@ create_reg_dead_note (reg, insn)
rtx temp_reg, temp_link; rtx temp_reg, temp_link;
temp_reg = gen_rtx_REG (word_mode, 0); temp_reg = gen_rtx_REG (word_mode, 0);
temp_link = rtx_alloc (EXPR_LIST); temp_link = alloc_EXPR_LIST (REG_DEAD, temp_reg, dead_notes);
PUT_REG_NOTE_KIND (temp_link, REG_DEAD);
XEXP (temp_link, 0) = temp_reg;
XEXP (temp_link, 1) = dead_notes;
dead_notes = temp_link; dead_notes = temp_link;
reg_note_regs--; reg_note_regs--;
} }
@ -7054,14 +7070,11 @@ compute_block_forward_dependences (bb)
if (find_insn_list (insn, INSN_DEPEND (x))) if (find_insn_list (insn, INSN_DEPEND (x)))
continue; continue;
new_link = rtx_alloc (INSN_LIST); new_link = alloc_INSN_LIST (insn, INSN_DEPEND (x));
dep_type = REG_NOTE_KIND (link); dep_type = REG_NOTE_KIND (link);
PUT_REG_NOTE_KIND (new_link, dep_type); PUT_REG_NOTE_KIND (new_link, dep_type);
XEXP (new_link, 0) = insn;
XEXP (new_link, 1) = INSN_DEPEND (x);
INSN_DEPEND (x) = new_link; INSN_DEPEND (x) = new_link;
INSN_DEP_COUNT (insn) += 1; INSN_DEP_COUNT (insn) += 1;
} }
@ -7287,8 +7300,8 @@ compute_block_backward_dependences (bb)
continue; continue;
(bb_reg_last_uses[bb_succ])[reg] (bb_reg_last_uses[bb_succ])[reg]
= gen_rtx_INSN_LIST (VOIDmode, XEXP (u, 0), = alloc_INSN_LIST (XEXP (u, 0),
(bb_reg_last_uses[bb_succ])[reg]); (bb_reg_last_uses[bb_succ])[reg]);
} }
/* reg-last-defs lists are inherited by bb_succ */ /* reg-last-defs lists are inherited by bb_succ */
@ -7298,8 +7311,8 @@ compute_block_backward_dependences (bb)
continue; continue;
(bb_reg_last_sets[bb_succ])[reg] (bb_reg_last_sets[bb_succ])[reg]
= gen_rtx_INSN_LIST (VOIDmode, XEXP (u, 0), = alloc_INSN_LIST (XEXP (u, 0),
(bb_reg_last_sets[bb_succ])[reg]); (bb_reg_last_sets[bb_succ])[reg]);
} }
} }
@ -7340,8 +7353,8 @@ compute_block_backward_dependences (bb)
continue; continue;
bb_last_function_call[bb_succ] bb_last_function_call[bb_succ]
= gen_rtx_INSN_LIST (VOIDmode, XEXP (u, 0), = alloc_INSN_LIST (XEXP (u, 0),
bb_last_function_call[bb_succ]); bb_last_function_call[bb_succ]);
} }
/* last_pending_memory_flush is inherited by bb_succ */ /* last_pending_memory_flush is inherited by bb_succ */
@ -7351,8 +7364,8 @@ compute_block_backward_dependences (bb)
continue; continue;
bb_last_pending_memory_flush[bb_succ] bb_last_pending_memory_flush[bb_succ]
= gen_rtx_INSN_LIST (VOIDmode, XEXP (u, 0), = alloc_INSN_LIST (XEXP (u, 0),
bb_last_pending_memory_flush[bb_succ]); bb_last_pending_memory_flush[bb_succ]);
} }
/* sched_before_next_call is inherited by bb_succ */ /* sched_before_next_call is inherited by bb_succ */
@ -7365,6 +7378,20 @@ compute_block_backward_dependences (bb)
} }
while (e != first_edge); while (e != first_edge);
} }
/* Free up the INSN_LISTs */
for (b = 0; b < max_reg; ++b)
{
free_list (&reg_last_sets[b], &unused_insn_list);
free_list (&reg_last_uses[b], &unused_insn_list);
}
/* Assert that we won't need bb_reg_last_* for this block anymore. */
if (current_nr_blocks > 1)
{
bb_reg_last_uses[bb] = (rtx *) NULL_RTX;
bb_reg_last_sets[bb] = (rtx *) NULL_RTX;
}
} }
/* Print dependences for debugging, callable from debugger */ /* Print dependences for debugging, callable from debugger */
@ -7729,10 +7756,7 @@ split_hard_reg_notes (note, first, last)
&& (temp = regno_use_in (new_reg, PATTERN (insn)))) && (temp = regno_use_in (new_reg, PATTERN (insn))))
{ {
/* Create a new reg dead note ere. */ /* Create a new reg dead note ere. */
link = rtx_alloc (EXPR_LIST); link = alloc_EXPR_LIST (REG_DEAD, temp, REG_NOTES (insn));
PUT_REG_NOTE_KIND (link, REG_DEAD);
XEXP (link, 0) = temp;
XEXP (link, 1) = REG_NOTES (insn);
REG_NOTES (insn) = link; REG_NOTES (insn) = link;
/* If killed multiple registers here, then add in the excess. */ /* If killed multiple registers here, then add in the excess. */
@ -7788,10 +7812,8 @@ new_insn_dead_notes (pat, insn, last, orig_insn)
if (!find_regno_note (tem, REG_UNUSED, REGNO (dest)) if (!find_regno_note (tem, REG_UNUSED, REGNO (dest))
&& !find_regno_note (tem, REG_DEAD, REGNO (dest))) && !find_regno_note (tem, REG_DEAD, REGNO (dest)))
{ {
rtx note = rtx_alloc (EXPR_LIST); rtx note = alloc_EXPR_LIST (REG_DEAD, dest,
PUT_REG_NOTE_KIND (note, REG_DEAD); REG_NOTES (tem));
XEXP (note, 0) = dest;
XEXP (note, 1) = REG_NOTES (tem);
REG_NOTES (tem) = note; REG_NOTES (tem) = note;
} }
/* The reg only dies in one insn, the last one that uses /* The reg only dies in one insn, the last one that uses
@ -7817,10 +7839,7 @@ new_insn_dead_notes (pat, insn, last, orig_insn)
if (GET_CODE (pat) == CLOBBER) if (GET_CODE (pat) == CLOBBER)
{ {
rtx note = rtx_alloc (EXPR_LIST); rtx note = alloc_EXPR_LIST (REG_UNUSED, dest, REG_NOTES (insn));
PUT_REG_NOTE_KIND (note, REG_UNUSED);
XEXP (note, 0) = dest;
XEXP (note, 1) = REG_NOTES (insn);
REG_NOTES (insn) = note; REG_NOTES (insn) = note;
return; return;
} }
@ -8124,9 +8143,11 @@ update_flow_info (notes, first, last, orig_insn)
for (insn = first; insn != NEXT_INSN (last); insn = NEXT_INSN (insn)) for (insn = first; insn != NEXT_INSN (last); insn = NEXT_INSN (insn))
if (GET_RTX_CLASS (GET_CODE (insn)) == 'i' if (GET_RTX_CLASS (GET_CODE (insn)) == 'i'
&& reg_mentioned_p (XEXP (note, 0), PATTERN (insn))) && reg_mentioned_p (XEXP (note, 0), PATTERN (insn)))
REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_LABEL, {
REG_NOTES (insn) = alloc_EXPR_LIST (REG_LABEL,
XEXP (note, 0), XEXP (note, 0),
REG_NOTES (insn)); REG_NOTES (insn));
}
break; break;
case REG_CC_SETTER: case REG_CC_SETTER:
@ -8222,10 +8243,7 @@ update_flow_info (notes, first, last, orig_insn)
if (insn_dest != dest) if (insn_dest != dest)
{ {
note = rtx_alloc (EXPR_LIST); note = alloc_EXPR_LIST (REG_DEAD, dest, REG_NOTES (insn));
PUT_REG_NOTE_KIND (note, REG_DEAD);
XEXP (note, 0) = dest;
XEXP (note, 1) = REG_NOTES (insn);
REG_NOTES (insn) = note; REG_NOTES (insn) = note;
/* The reg only dies in one insn, the last one /* The reg only dies in one insn, the last one
that uses it. */ that uses it. */
@ -8700,6 +8718,8 @@ schedule_insns (dump_file)
emit_note_after (NOTE_INSN_DELETED, basic_block_end[n_basic_blocks - 1]); emit_note_after (NOTE_INSN_DELETED, basic_block_end[n_basic_blocks - 1]);
/* Schedule every region in the subroutine */ /* Schedule every region in the subroutine */
fprintf(stderr, "HELLO: nr_regions=%d max_reg_num=%d\n",
(int)nr_regions, (int)max_reg_num());
for (rgn = 0; rgn < nr_regions; rgn++) for (rgn = 0; rgn < nr_regions; rgn++)
{ {
schedule_region (rgn); schedule_region (rgn);