aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorBob Wilson <bob.wilson@acm.org>2004-11-10 22:20:27 +0000
committerBob Wilson <bob.wilson@acm.org>2004-11-10 22:20:27 +0000
commit1d19a7709abb08ce59eaa2ee0e1e0db3c93189e2 (patch)
tree6722b8663fa72c98451548ca1dedd86d74177777 /gas
parent2315ffec021c6c665bb4bfade30c21dba72e6018 (diff)
downloadgdb-1d19a7709abb08ce59eaa2ee0e1e0db3c93189e2.zip
gdb-1d19a7709abb08ce59eaa2ee0e1e0db3c93189e2.tar.gz
gdb-1d19a7709abb08ce59eaa2ee0e1e0db3c93189e2.tar.bz2
* 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.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/config/tc-xtensa.c42
2 files changed, 16 insertions, 33 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5faf004..1c74fa6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -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.
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 340fb18..11bd872 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -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;
}