diff options
| author | Alan Modra <amodra@gmail.com> | 2019-10-26 18:38:26 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2019-10-26 20:19:28 +1030 |
| commit | 6f69abb0498286297936a178ba81c7e445aa4437 (patch) | |
| tree | 7a5d73d08dad01d2423566cffb48b48cda5971a1 /gas/ehopt.c | |
| parent | 30baf67b6505d903bf678f9a0ba3645eb337ce49 (diff) | |
| download | binutils-gdb-6f69abb0498286297936a178ba81c7e445aa4437.tar.gz | |
Optimise away eh_frame advance_loc 0
These can be generated when multiple cfi directives are emitted for an
instruction and the insn frag is closed off between directives, as
happens when listings are enabled. No doubt the advance_loc of zero
could be avoided by backtracking over frags in dw2gencfi.c before
calling cfi_add_advance_loc, but that seems like more work than
cleaning up afterwards as this patch does.
Noticed when looking at the testcase in PR25125.
PR 25125
* dw2gencfi.c (output_cfi_insn): Don't output DW_CFA_advance_loc+0.
* ehopt.c (eh_frame_estimate_size_before_relax): Return -1 for
an advance_loc of zero.
(eh_frame_relax_frag): Translate fr_subtype of 7 to size -1.
(eh_frame_convert_frag): Handle fr_subtype of 7. Abort on
unexpected fr_subtype.
Diffstat (limited to 'gas/ehopt.c')
| -rw-r--r-- | gas/ehopt.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gas/ehopt.c b/gas/ehopt.c index 207e7994059..bf65602f533 100644 --- a/gas/ehopt.c +++ b/gas/ehopt.c @@ -482,7 +482,9 @@ eh_frame_estimate_size_before_relax (fragS *frag) gas_assert (ca > 0); diff /= ca; - if (diff < 0x40) + if (diff == 0) + ret = -1; + else if (diff < 0x40) ret = 0; else if (diff < 0x100) ret = 1; @@ -491,7 +493,7 @@ eh_frame_estimate_size_before_relax (fragS *frag) else ret = 4; - frag->fr_subtype = (frag->fr_subtype & ~7) | ret; + frag->fr_subtype = (frag->fr_subtype & ~7) | (ret & 7); return ret; } @@ -506,6 +508,8 @@ eh_frame_relax_frag (fragS *frag) int oldsize, newsize; oldsize = frag->fr_subtype & 7; + if (oldsize == 7) + oldsize = -1; newsize = eh_frame_estimate_size_before_relax (frag); return newsize - oldsize; } @@ -548,9 +552,17 @@ eh_frame_convert_frag (fragS *frag) md_number_to_chars (frag->fr_literal + frag->fr_fix, diff, 2); break; - default: + case 4: md_number_to_chars (frag->fr_literal + frag->fr_fix, diff, 4); break; + + case 7: + gas_assert (diff == 0); + frag->fr_fix -= 8; + break; + + default: + abort (); } frag->fr_fix += frag->fr_subtype & 7; |