darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* config/tc-xtensa.c (update_next_frag_state): Always add a NOP if

Browse source 
relaxing at the end of a loop.  Don't mark frags as UNREACHABLE or
	MAYBE_UNREACHABLE.
	(relax_frag_immed): Update call to update_next_frag_state.
This commit is contained in:
Bob Wilson 2004-11-10 22:20:27 +00:00
parent 2315ffec02
commit 1d19a7709a
2 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gas/ChangeLog
View file

@ -1,3 +1,10 @@
2004-11-10 Bob Wilson <bob.wilson@acm.org>
* config/tc-xtensa.c (update_next_frag_state): Always add a NOP if
relaxing at the end of a loop. Don't mark frags as UNREACHABLE or
MAYBE_UNREACHABLE.
(relax_frag_immed): Update call to update_next_frag_state.
2004-11-10 Alan Modra <amodra@bigpond.net.au>
* obj.h (struct format_ops <app_file>): Add int param.

42
gas/config/tc-xtensa.c
View file

@ -4535,7 +4535,7 @@ next_frag_format_size (const fragS *fragP)
switch its state so it will instantiate a NOP. */
static void
update_next_frag_state (fragS *fragP, bfd_boolean unreachable)
update_next_frag_state (fragS *fragP)
{
fragS *next_fragP = fragP->fr_next;
fragS *new_target = NULL;
@ -4563,36 +4563,17 @@ update_next_frag_state (fragS *fragP, bfd_boolean unreachable)
&& (new_target->fr_subtype == RELAX_MAYBE_DESIRE_ALIGN
|| new_target->fr_subtype == RELAX_DESIRE_ALIGN));
}
if (unreachable)
{
if (align_targets)
{
next_fragP->fr_subtype = RELAX_UNREACHABLE;
next_fragP->tc_frag_data.is_unreachable = TRUE;
new_target->fr_subtype = RELAX_DESIRE_ALIGN;
new_target->tc_frag_data.is_branch_target = TRUE;
}
while (next_fragP && next_fragP->fr_fix == 0)
{
if (next_fragP->fr_type == rs_machine_dependent
&& next_fragP->fr_subtype == RELAX_LOOP_END)
{
next_fragP->fr_subtype = RELAX_LOOP_END_ADD_NOP;
return;
}
next_fragP = next_fragP->fr_next;
}
}
else
while (next_fragP && next_fragP->fr_fix == 0)
{
if (align_targets)
if (next_fragP->fr_type == rs_machine_dependent
&& next_fragP->fr_subtype == RELAX_LOOP_END)
{
next_fragP->fr_subtype = RELAX_MAYBE_UNREACHABLE;
next_fragP->tc_frag_data.is_unreachable = FALSE;
new_target->fr_subtype = RELAX_MAYBE_DESIRE_ALIGN;
new_target->tc_frag_data.is_branch_target = FALSE;
next_fragP->fr_subtype = RELAX_LOOP_END_ADD_NOP;
return;
}
next_fragP = next_fragP->fr_next;
}
}
@ -9115,13 +9096,8 @@ relax_frag_immed (segT segP,
}
}
/* FIXME: When a negatable branch expands and then contracts in a
subsequent pass, update_next_frag_state correctly updates the
type of the frag to RELAX_MAYBE_UNREACHABLE, but it doesn't undo
any expansion relax_frag_for_align may have expected it to. For
now, change back to only call it when the branch expands. */
if (negatable_branch && istack.ninsn > 1)
update_next_frag_state (fragP, FALSE /* istack.ninsn > 1 */);
update_next_frag_state (fragP);
return this_text_diff;
}