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

flow.c (tidy_fallthru_edge): Be more careful finding the last BARRIER of a list.

Browse Source 
* flow.c (tidy_fallthru_edge): Be more careful finding the last
BARRIER of a list.  Delete the cc0 setter as well as a cond jump.

From-SVN: r25656
This commit is contained in:
Richard Henderson 1999-03-09 07:49:53 -08:00 committed by Richard Henderson
parent 39842893a1
commit 86a1db6049
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
Tue Mar 9 15:48:15 1999 Richard Henderson <rth@cygnus.com>
* flow.c (tidy_fallthru_edge): Be more careful finding the last
BARRIER of a list. Delete the cc0 setter as well as a cond jump.
Tue Mar 9 15:26:02 1999 Hans-Peter Nilsson <hp@bitrange.com> Tue Mar 9 15:26:02 1999 Hans-Peter Nilsson <hp@bitrange.com>
* i386.md (ashlsi3 splitter): Fix typo in last change. * i386.md (ashlsi3 splitter): Fix typo in last change.

22
gcc/flow.c
View File

@ -1933,7 +1933,7 @@ tidy_fallthru_edge (e, b, c)
edge e; edge e;
basic_block b, c; basic_block b, c;
{ {
rtx p, q, h; rtx q, h;
/* ??? In a late-running flow pass, other folks may have deleted basic /* ??? In a late-running flow pass, other folks may have deleted basic
blocks by nopping out blocks, leaving multiple BARRIERs between here blocks by nopping out blocks, leaving multiple BARRIERs between here
@ -1943,12 +1943,10 @@ tidy_fallthru_edge (e, b, c)
barriers and notes. */ barriers and notes. */
q = NEXT_INSN (b->end); q = NEXT_INSN (b->end);
do if (q && GET_CODE (q) == NOTE)
{ q = next_nonnote_insn (q);
p = q; while (q && GET_CODE (q) == BARRIER)
q = next_nonnote_insn (q); q = next_nonnote_insn (q);
}
while (GET_CODE (q) == BARRIER);
/* Assert that we now actually do fall through. */ /* Assert that we now actually do fall through. */
h = c->head; h = c->head;
@ -1963,6 +1961,13 @@ tidy_fallthru_edge (e, b, c)
q = b->end; q = b->end;
if (GET_CODE (q) == JUMP_INSN) if (GET_CODE (q) == JUMP_INSN)
{ {
#ifdef HAVE_cc0
/* If this was a conditional jump, we need to also delete
the insn that set cc0. */
if (! simplejump_p (q) && condjump_p (q))
q = PREV_INSN (q);
#endif
if (b->head == q) if (b->head == q)
{ {
PUT_CODE (q, NOTE); PUT_CODE (q, NOTE);
@ -1974,7 +1979,8 @@ tidy_fallthru_edge (e, b, c)
} }
/* Selectively unlink the sequence. */ /* Selectively unlink the sequence. */
delete_insn_chain (NEXT_INSN (q), p); if (q != PREV_INSN (c->head))
delete_insn_chain (NEXT_INSN (q), PREV_INSN (c->head));
e->flags |= EDGE_FALLTHRU; e->flags |= EDGE_FALLTHRU;
} }