diff options
Diffstat (limited to 'contrib/binutils/gas/write.c')
| -rw-r--r-- | contrib/binutils/gas/write.c | 1082 |
1 files changed, 598 insertions, 484 deletions
diff --git a/contrib/binutils/gas/write.c b/contrib/binutils/gas/write.c index 9186717..29ea284 100644 --- a/contrib/binutils/gas/write.c +++ b/contrib/binutils/gas/write.c @@ -1,6 +1,6 @@ /* write.c - emit .o file Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -27,6 +27,7 @@ #include "obstack.h" #include "output-file.h" #include "dwarf2dbg.h" +#include "libbfd.h" #ifndef TC_ADJUST_RELOC_COUNT #define TC_ADJUST_RELOC_COUNT(FIX, COUNT) @@ -45,7 +46,6 @@ #ifndef TC_FORCE_RELOCATION_LOCAL #define TC_FORCE_RELOCATION_LOCAL(FIX) \ (!(FIX)->fx_pcrel \ - || (FIX)->fx_plt \ || TC_FORCE_RELOCATION (FIX)) #endif @@ -97,6 +97,16 @@ #define TC_FAKE_LABEL(NAME) (strcmp ((NAME), FAKE_LABEL_NAME) == 0) #endif +/* Positive values of TC_FX_SIZE_SLACK allow a target to define + fixups that far past the end of a frag. Having such fixups + is of course most most likely a bug in setting fx_size correctly. + A negative value disables the fixup check entirely, which is + appropriate for something like the Renesas / SuperH SH_COUNT + reloc. */ +#ifndef TC_FX_SIZE_SLACK +#define TC_FX_SIZE_SLACK(FIX) 0 +#endif + /* Used to control final evaluation of expressions. */ int finalize_syms = 0; @@ -107,9 +117,10 @@ symbolS *abs_section_sym; /* Remember the value of dot when parsing expressions. */ addressT dot_value; -void print_fixup (fixS *); +/* Relocs generated by ".reloc" pseudo. */ +struct reloc_list* reloc_list; -static void renumber_sections (bfd *, asection *, PTR); +void print_fixup (fixS *); /* We generally attach relocs to frag chains. However, after we have chained these all together into a segment, any relocs we add after @@ -121,22 +132,6 @@ static int n_fixups; #define RELOC_ENUM enum bfd_reloc_code_real -static fixS *fix_new_internal (fragS *, int where, int size, - symbolS *add, symbolS *sub, - offsetT offset, int pcrel, - RELOC_ENUM r_type); -static long fixup_segment (fixS *, segT); -static relax_addressT relax_align (relax_addressT addr, int align); -static fragS *chain_frchains_together_1 (segT, struct frchain *); -static void chain_frchains_together (bfd *, segT, PTR); -static void cvt_frag_to_fill (segT, fragS *); -static void adjust_reloc_syms (bfd *, asection *, PTR); -static void fix_segment (bfd *, asection *, PTR); -static void write_relocs (bfd *, asection *, PTR); -static void write_contents (bfd *, asection *, PTR); -static void set_symtab (void); -static void merge_data_into_text (void); - /* Create a fixS in obstack 'notes'. */ static fixS * @@ -153,7 +148,7 @@ fix_new_internal (fragS *frag, /* Which frag? */ n_fixups++; - fixP = (fixS *) obstack_alloc (¬es, sizeof (fixS)); + fixP = obstack_alloc (¬es, sizeof (fixS)); fixP->fx_frag = frag; fixP->fx_where = where; @@ -169,13 +164,13 @@ fix_new_internal (fragS *frag, /* Which frag? */ fixP->fx_offset = offset; fixP->fx_dot_value = dot_value; fixP->fx_pcrel = pcrel; - fixP->fx_plt = 0; fixP->fx_r_type = r_type; fixP->fx_im_disp = 0; fixP->fx_pcrel_adjust = 0; fixP->fx_bit_fixP = 0; fixP->fx_addnumber = 0; fixP->fx_tcbit = 0; + fixP->fx_tcbit2 = 0; fixP->fx_done = 0; fixP->fx_no_overflow = 0; fixP->fx_signed = 0; @@ -365,7 +360,7 @@ get_recorded_alignment (segT seg) /* Reset the section indices after removing the gas created sections. */ static void -renumber_sections (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, PTR countparg) +renumber_sections (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *countparg) { int *countp = (int *) countparg; @@ -379,7 +374,7 @@ chain_frchains_together_1 (segT section, struct frchain *frchp) fragS dummy, *prev_frag = &dummy; fixS fix_dummy, *prev_fix = &fix_dummy; - for (; frchp && frchp->frch_seg == section; frchp = frchp->frch_next) + for (; frchp; frchp = frchp->frch_next) { prev_frag->fr_next = frchp->frch_root; prev_frag = frchp->frch_last; @@ -394,6 +389,7 @@ chain_frchains_together_1 (segT section, struct frchain *frchp) } } assert (prev_frag->fr_type != 0); + assert (prev_frag != &dummy); prev_frag->fr_next = 0; return prev_frag; } @@ -401,7 +397,7 @@ chain_frchains_together_1 (segT section, struct frchain *frchp) static void chain_frchains_together (bfd *abfd ATTRIBUTE_UNUSED, segT section, - PTR xxx ATTRIBUTE_UNUSED) + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *info; @@ -529,10 +525,8 @@ relax_seg (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *xxx) info->changed = 1; } -static void size_seg (bfd *, asection *, PTR); - static void -size_seg (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) +size_seg (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) { flagword flags; fragS *fragp; @@ -562,11 +556,7 @@ size_seg (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) if (size > 0 && ! seginfo->bss) flags |= SEC_HAS_CONTENTS; - /* @@ This is just an approximation. */ - if (seginfo && seginfo->fix_root) - flags |= SEC_RELOC; - else - flags &= ~SEC_RELOC; + flags &= ~SEC_RELOC; x = bfd_set_section_flags (abfd, sec, flags); assert (x); @@ -637,13 +627,93 @@ dump_section_relocs (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, FILE *stream) #define EMIT_SECTION_SYMBOLS 1 #endif +/* Resolve U.A.OFFSET_SYM and U.A.SYM fields of RELOC_LIST entries, + and check for validity. Convert RELOC_LIST from using U.A fields + to U.B fields. */ +static void +resolve_reloc_expr_symbols (void) +{ + struct reloc_list *r; + + for (r = reloc_list; r; r = r->next) + { + expressionS *symval; + symbolS *sym; + bfd_vma offset, addend; + asection *sec; + reloc_howto_type *howto; + + resolve_symbol_value (r->u.a.offset_sym); + symval = symbol_get_value_expression (r->u.a.offset_sym); + + offset = 0; + sym = NULL; + if (symval->X_op == O_constant) + sym = r->u.a.offset_sym; + else if (symval->X_op == O_symbol) + { + sym = symval->X_add_symbol; + offset = symval->X_add_number; + symval = symbol_get_value_expression (symval->X_add_symbol); + } + if (sym == NULL + || symval->X_op != O_constant + || (sec = S_GET_SEGMENT (sym)) == NULL + || !SEG_NORMAL (sec)) + { + as_bad_where (r->file, r->line, _("invalid offset expression")); + sec = NULL; + } + else + offset += S_GET_VALUE (sym); + + sym = NULL; + addend = r->u.a.addend; + if (r->u.a.sym != NULL) + { + resolve_symbol_value (r->u.a.sym); + symval = symbol_get_value_expression (r->u.a.sym); + if (symval->X_op == O_constant) + sym = r->u.a.sym; + else if (symval->X_op == O_symbol) + { + sym = symval->X_add_symbol; + addend += symval->X_add_number; + symval = symbol_get_value_expression (symval->X_add_symbol); + } + if (symval->X_op != O_constant) + { + as_bad_where (r->file, r->line, _("invalid reloc expression")); + sec = NULL; + } + else if (sym != NULL) + symbol_mark_used_in_reloc (sym); + } + if (sym == NULL) + { + if (abs_section_sym == NULL) + abs_section_sym = section_symbol (absolute_section); + sym = abs_section_sym; + } + + howto = r->u.a.howto; + + r->u.b.sec = sec; + r->u.b.s = symbol_get_bfdsym (sym); + r->u.b.r.sym_ptr_ptr = &r->u.b.s; + r->u.b.r.address = offset; + r->u.b.r.addend = addend; + r->u.b.r.howto = howto; + } +} + /* This pass over fixups decides whether symbols can be replaced with section symbols. */ static void adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, - PTR xxx ATTRIBUTE_UNUSED) + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); fixS *fixp; @@ -680,17 +750,21 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, /* If this symbol is equated to an undefined or common symbol, convert the fixup to being against that symbol. */ - if (symbol_equated_reloc_p (sym) - || S_IS_WEAKREFR (sym)) + while (symbol_equated_reloc_p (sym) + || S_IS_WEAKREFR (sym)) { + symbolS *newsym = symbol_get_value_expression (sym)->X_add_symbol; + if (sym == newsym) + break; fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; - sym = symbol_get_value_expression (sym)->X_add_symbol; - fixp->fx_addsy = sym; + fixp->fx_addsy = newsym; + sym = newsym; } if (symbol_mri_common_p (sym)) { - /* These symbols are handled specially in fixup_segment. */ + fixp->fx_offset += S_GET_VALUE (sym); + fixp->fx_addsy = symbol_get_value_expression (sym)->X_add_symbol; continue; } @@ -719,14 +793,14 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, if (bfd_is_abs_section (symsec)) { /* The fixup_segment routine normally will not use this - symbol in a relocation. */ + symbol in a relocation. */ continue; } /* Don't try to reduce relocs which refer to non-local symbols - in .linkonce sections. It can lead to confusion when a - debugging section refers to a .linkonce section. I hope - this will always be correct. */ + in .linkonce sections. It can lead to confusion when a + debugging section refers to a .linkonce section. I hope + this will always be correct. */ if (symsec != sec && ! S_IS_LOCAL (sym)) { if ((symsec->flags & SEC_LINK_ONCE) != 0 @@ -763,10 +837,241 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, dump_section_relocs (abfd, sec, stderr); } +/* fixup_segment() + + Go through all the fixS's in a segment and see which ones can be + handled now. (These consist of fixS where we have since discovered + the value of a symbol, or the address of the frag involved.) + For each one, call md_apply_fix to put the fix into the frag data. + + Result is a count of how many relocation structs will be needed to + handle the remaining fixS's that we couldn't completely handle here. + These will be output later by emit_relocations(). */ + +static long +fixup_segment (fixS *fixP, segT this_segment) +{ + long seg_reloc_count = 0; + valueT add_number; + fragS *fragP; + segT add_symbol_segment = absolute_section; + + if (fixP != NULL && abs_section_sym == NULL) + abs_section_sym = section_symbol (absolute_section); + + /* If the linker is doing the relaxing, we must not do any fixups. + + Well, strictly speaking that's not true -- we could do any that + are PC-relative and don't cross regions that could change size. + And for the i960 we might be able to turn callx/callj into bal + anyways in cases where we know the maximum displacement. */ + if (linkrelax && TC_LINKRELAX_FIXUP (this_segment)) + { + for (; fixP; fixP = fixP->fx_next) + if (!fixP->fx_done) + { + if (fixP->fx_addsy == NULL) + { + /* There was no symbol required by this relocation. + However, BFD doesn't really handle relocations + without symbols well. So fake up a local symbol in + the absolute section. */ + fixP->fx_addsy = abs_section_sym; + } + symbol_mark_used_in_reloc (fixP->fx_addsy); + if (fixP->fx_subsy != NULL) + symbol_mark_used_in_reloc (fixP->fx_subsy); + seg_reloc_count++; + } + TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); + return seg_reloc_count; + } + + for (; fixP; fixP = fixP->fx_next) + { +#ifdef DEBUG5 + fprintf (stderr, "\nprocessing fixup:\n"); + print_fixup (fixP); +#endif + + fragP = fixP->fx_frag; + know (fragP); +#ifdef TC_VALIDATE_FIX + TC_VALIDATE_FIX (fixP, this_segment, skip); +#endif + add_number = fixP->fx_offset; + + if (fixP->fx_addsy != NULL) + add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy); + + if (fixP->fx_subsy != NULL) + { + segT sub_symbol_segment; + resolve_symbol_value (fixP->fx_subsy); + sub_symbol_segment = S_GET_SEGMENT (fixP->fx_subsy); + if (fixP->fx_addsy != NULL + && sub_symbol_segment == add_symbol_segment + && !TC_FORCE_RELOCATION_SUB_SAME (fixP, add_symbol_segment)) + { + add_number += S_GET_VALUE (fixP->fx_addsy); + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = add_number; + fixP->fx_addsy = NULL; + fixP->fx_subsy = NULL; +#ifdef TC_M68K + /* See the comment below about 68k weirdness. */ + fixP->fx_pcrel = 0; +#endif + } + else if (sub_symbol_segment == absolute_section + && !TC_FORCE_RELOCATION_SUB_ABS (fixP)) + { + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = add_number; + fixP->fx_subsy = NULL; + } + else if (sub_symbol_segment == this_segment + && !TC_FORCE_RELOCATION_SUB_LOCAL (fixP)) + { + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = (add_number + fixP->fx_dot_value + + fixP->fx_frag->fr_address); + + /* Make it pc-relative. If the back-end code has not + selected a pc-relative reloc, cancel the adjustment + we do later on all pc-relative relocs. */ + if (0 +#ifdef TC_M68K + /* Do this for m68k even if it's already described + as pc-relative. On the m68k, an operand of + "pc@(foo-.-2)" should address "foo" in a + pc-relative mode. */ + || 1 +#endif + || !fixP->fx_pcrel) + add_number += MD_PCREL_FROM_SECTION (fixP, this_segment); + fixP->fx_subsy = NULL; + fixP->fx_pcrel = 1; + } + else if (!TC_VALIDATE_FIX_SUB (fixP)) + { + as_bad_where (fixP->fx_file, fixP->fx_line, + _("can't resolve `%s' {%s section} - `%s' {%s section}"), + fixP->fx_addsy ? S_GET_NAME (fixP->fx_addsy) : "0", + segment_name (add_symbol_segment), + S_GET_NAME (fixP->fx_subsy), + segment_name (sub_symbol_segment)); + } + } + + if (fixP->fx_addsy) + { + if (add_symbol_segment == this_segment + && !TC_FORCE_RELOCATION_LOCAL (fixP)) + { + /* This fixup was made when the symbol's segment was + SEG_UNKNOWN, but it is now in the local segment. + So we know how to do the address without relocation. */ + add_number += S_GET_VALUE (fixP->fx_addsy); + fixP->fx_offset = add_number; + if (fixP->fx_pcrel) + add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); + fixP->fx_addsy = NULL; + fixP->fx_pcrel = 0; + } + else if (add_symbol_segment == absolute_section + && !TC_FORCE_RELOCATION_ABS (fixP)) + { + add_number += S_GET_VALUE (fixP->fx_addsy); + fixP->fx_offset = add_number; + fixP->fx_addsy = NULL; + } + else if (add_symbol_segment != undefined_section + && ! bfd_is_com_section (add_symbol_segment) + && MD_APPLY_SYM_VALUE (fixP)) + add_number += S_GET_VALUE (fixP->fx_addsy); + } + + if (fixP->fx_pcrel) + { + add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); + if (!fixP->fx_done && fixP->fx_addsy == NULL) + { + /* There was no symbol required by this relocation. + However, BFD doesn't really handle relocations + without symbols well. So fake up a local symbol in + the absolute section. */ + fixP->fx_addsy = abs_section_sym; + } + } + + if (!fixP->fx_done) + md_apply_fix (fixP, &add_number, this_segment); + + if (!fixP->fx_done) + { + ++seg_reloc_count; + if (fixP->fx_addsy == NULL) + fixP->fx_addsy = abs_section_sym; + symbol_mark_used_in_reloc (fixP->fx_addsy); + if (fixP->fx_subsy != NULL) + symbol_mark_used_in_reloc (fixP->fx_subsy); + } + + if (!fixP->fx_bit_fixP && !fixP->fx_no_overflow && fixP->fx_size != 0) + { + if (fixP->fx_size < sizeof (valueT)) + { + valueT mask; + + mask = 0; + mask--; /* Set all bits to one. */ + mask <<= fixP->fx_size * 8 - (fixP->fx_signed ? 1 : 0); + if ((add_number & mask) != 0 && (add_number & mask) != mask) + { + char buf[50], buf2[50]; + sprint_value (buf, fragP->fr_address + fixP->fx_where); + if (add_number > 1000) + sprint_value (buf2, add_number); + else + sprintf (buf2, "%ld", (long) add_number); + as_bad_where (fixP->fx_file, fixP->fx_line, + _("value of %s too large for field of %d bytes at %s"), + buf2, fixP->fx_size, buf); + } /* Generic error checking. */ + } +#ifdef WARN_SIGNED_OVERFLOW_WORD + /* Warn if a .word value is too large when treated as a signed + number. We already know it is not too negative. This is to + catch over-large switches generated by gcc on the 68k. */ + if (!flag_signed_overflow_ok + && fixP->fx_size == 2 + && add_number > 0x7fff) + as_bad_where (fixP->fx_file, fixP->fx_line, + _("signed .word overflow; switch may be too large; %ld at 0x%lx"), + (long) add_number, + (long) (fragP->fr_address + fixP->fx_where)); +#endif + } /* Not a bit fix. */ + +#ifdef TC_VALIDATE_FIX + skip: ATTRIBUTE_UNUSED_LABEL + ; +#endif +#ifdef DEBUG5 + fprintf (stderr, "result:\n"); + print_fixup (fixP); +#endif + } /* For each fixS in this segment. */ + + TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); + return seg_reloc_count; +} + static void fix_segment (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, - PTR xxx ATTRIBUTE_UNUSED) + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); @@ -774,14 +1079,40 @@ fix_segment (bfd *abfd ATTRIBUTE_UNUSED, } static void -write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) +install_reloc (asection *sec, arelent *reloc, fragS *fragp, + char *file, unsigned int line) +{ + char *err; + bfd_reloc_status_type s; + + s = bfd_install_relocation (stdoutput, reloc, + fragp->fr_literal, fragp->fr_address, + sec, &err); + switch (s) + { + case bfd_reloc_ok: + break; + case bfd_reloc_overflow: + as_bad_where (file, line, _("relocation overflow")); + break; + case bfd_reloc_outofrange: + as_bad_where (file, line, _("relocation out of range")); + break; + default: + as_fatal (_("%s:%u: bad return from bfd_install_relocation: %x"), + file, line, s); + } +} + +static void +write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); unsigned int i; unsigned int n; + struct reloc_list *my_reloc_list, **rp, *r; arelent **relocs; fixS *fixp; - char *err; /* If seginfo is NULL, we did not create this section; don't do anything with it. */ @@ -790,153 +1121,73 @@ write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) n = 0; for (fixp = seginfo->fix_root; fixp; fixp = fixp->fx_next) - n++; + if (!fixp->fx_done) + n++; -#ifndef RELOC_EXPANSION_POSSIBLE - /* Set up reloc information as well. */ - relocs = (arelent **) xcalloc (n, sizeof (arelent *)); +#ifdef RELOC_EXPANSION_POSSIBLE + n *= MAX_RELOC_EXPANSION; +#endif - i = 0; - for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) + /* Extract relocs for this section from reloc_list. */ + rp = &reloc_list; + my_reloc_list = NULL; + while ((r = *rp) != NULL) { - arelent *reloc; - bfd_reloc_status_type s; - symbolS *sym; - - if (fixp->fx_done) - { - n--; - continue; - } - - /* If this is an undefined symbol which was equated to another - symbol, then generate the reloc against the latter symbol - rather than the former. */ - sym = fixp->fx_addsy; - while (symbol_equated_reloc_p (sym)) - { - symbolS *n; - - /* We must avoid looping, as that can occur with a badly - written program. */ - n = symbol_get_value_expression (sym)->X_add_symbol; - if (n == sym) - break; - fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; - sym = n; - } - fixp->fx_addsy = sym; - - reloc = tc_gen_reloc (sec, fixp); - if (!reloc) + if (r->u.b.sec == sec) { - n--; - continue; + *rp = r->next; + r->next = my_reloc_list; + my_reloc_list = r; + n++; } - - /* - This test is triggered inappropriately for the SH: - if (fixp->fx_where + fixp->fx_size - > fixp->fx_frag->fr_fix + fixp->fx_frag->fr_offset) - abort (); - */ - - s = bfd_install_relocation (stdoutput, reloc, - fixp->fx_frag->fr_literal, - fixp->fx_frag->fr_address, - sec, &err); - switch (s) - { - case bfd_reloc_ok: - break; - case bfd_reloc_overflow: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation overflow")); - break; - case bfd_reloc_outofrange: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation out of range")); - break; - default: - as_fatal (_("%s:%u: bad return from bfd_install_relocation: %x"), - fixp->fx_file, fixp->fx_line, s); - } - relocs[i++] = reloc; + else + rp = &r->next; } -#else - n = n * MAX_RELOC_EXPANSION; - /* Set up reloc information as well. */ - relocs = (arelent **) xcalloc (n, sizeof (arelent *)); + + relocs = xcalloc (n, sizeof (arelent *)); i = 0; for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) { - arelent **reloc; - bfd_reloc_status_type s; - symbolS *sym; int j; + int fx_size, slack; + offsetT loc; if (fixp->fx_done) - { - n--; - continue; - } + continue; + + fx_size = fixp->fx_size; + slack = TC_FX_SIZE_SLACK (fixp); + if (slack > 0) + fx_size = fx_size > slack ? fx_size - slack : 0; + loc = fixp->fx_where + fx_size; + if (slack >= 0 && loc > fixp->fx_frag->fr_fix) + as_bad_where (fixp->fx_file, fixp->fx_line, + _("internal error: fixup not contained within frag")); - /* If this is an undefined symbol which was equated to another - symbol, then generate the reloc against the latter symbol - rather than the former. */ - sym = fixp->fx_addsy; - while (symbol_equated_reloc_p (sym)) - { - symbolS *n; - - /* We must avoid looping, as that can occur with a badly - written program. */ - n = symbol_get_value_expression (sym)->X_add_symbol; - if (n == sym) - break; - fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; - sym = n; - } - fixp->fx_addsy = sym; +#ifndef RELOC_EXPANSION_POSSIBLE + { + arelent *reloc = tc_gen_reloc (sec, fixp); - reloc = tc_gen_reloc (sec, fixp); + if (!reloc) + continue; + relocs[i++] = reloc; + j = 1; + } +#else + { + arelent **reloc = tc_gen_reloc (sec, fixp); - for (j = 0; reloc[j]; j++) - { + for (j = 0; reloc[j]; j++) relocs[i++] = reloc[j]; - assert (i <= n); - } - if (fixp->fx_where + fixp->fx_size - > fixp->fx_frag->fr_fix + fixp->fx_frag->fr_offset) - as_bad_where (fixp->fx_file, fixp->fx_line, - _("internal error: fixup not contained within frag")); - for (j = 0; reloc[j]; j++) - { - s = bfd_install_relocation (stdoutput, reloc[j], - fixp->fx_frag->fr_literal, - fixp->fx_frag->fr_address, - sec, &err); - switch (s) - { - case bfd_reloc_ok: - break; - case bfd_reloc_overflow: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation overflow")); - break; - case bfd_reloc_outofrange: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation out of range")); - break; - default: - as_fatal (_("%s:%u: bad return from bfd_install_relocation: %x"), - fixp->fx_file, fixp->fx_line, s); - } - } + } +#endif + + for ( ; j != 0; --j) + install_reloc (sec, relocs[i - j], fixp->fx_frag, + fixp->fx_file, fixp->fx_line); } n = i; -#endif #ifdef DEBUG4 { @@ -956,12 +1207,30 @@ write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) } #endif + for (r = my_reloc_list; r != NULL; r = r->next) + { + fragS *f; + for (f = seginfo->frchainP->frch_root; f; f = f->fr_next) + if (f->fr_address <= r->u.b.r.address + && r->u.b.r.address < f->fr_address + f->fr_fix) + break; + if (f == NULL) + as_bad_where (r->file, r->line, + _("reloc not within (fixed part of) section")); + else + { + relocs[n++] = &r->u.b.r; + install_reloc (sec, &r->u.b.r, f, r->file, r->line); + } + } + if (n) - bfd_set_reloc (stdoutput, sec, relocs, n); - else - bfd_set_section_flags (abfd, sec, - (bfd_get_section_flags (abfd, sec) - & (flagword) ~SEC_RELOC)); + { + flagword flags = bfd_get_section_flags (abfd, sec); + flags |= SEC_RELOC; + bfd_set_section_flags (abfd, sec, flags); + bfd_set_reloc (stdoutput, sec, relocs, n); + } #ifdef SET_SECTION_RELOCS SET_SECTION_RELOCS (sec, relocs, n); @@ -987,7 +1256,7 @@ write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) static void write_contents (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, - PTR xxx ATTRIBUTE_UNUSED) + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); addressT offset = 0; @@ -1014,11 +1283,8 @@ write_contents (bfd *abfd ATTRIBUTE_UNUSED, f->fr_literal, (file_ptr) offset, (bfd_size_type) f->fr_fix); if (!x) - { - bfd_perror (stdoutput->filename); - as_perror (_("FATAL: Can't write %s"), stdoutput->filename); - exit (EXIT_FAILURE); - } + as_fatal (_("can't write %s: %s"), stdoutput->filename, + bfd_errmsg (bfd_get_error ())); offset += f->fr_fix; } fill_literal = f->fr_literal + f->fr_fix; @@ -1038,12 +1304,8 @@ write_contents (bfd *abfd ATTRIBUTE_UNUSED, (file_ptr) offset, (bfd_size_type) fill_size); if (!x) - { - bfd_perror (stdoutput->filename); - as_perror (_("FATAL: Can't write %s"), - stdoutput->filename); - exit (EXIT_FAILURE); - } + as_fatal (_("can't write %s: %s"), stdoutput->filename, + bfd_errmsg (bfd_get_error ())); offset += fill_size; } } @@ -1097,7 +1359,6 @@ set_symtab (void) asymbol **asympp; symbolS *symp; bfd_boolean result; - extern PTR bfd_alloc (bfd *, bfd_size_type); /* Count symbols. We can't rely on a count made by the loop in write_object_file, because *_frob_file may add a new symbol or @@ -1111,7 +1372,7 @@ set_symtab (void) int i; bfd_size_type amt = (bfd_size_type) nsyms * sizeof (asymbol *); - asympp = (asymbol **) bfd_alloc (stdoutput, amt); + asympp = bfd_alloc (stdoutput, amt); symp = symbol_rootP; for (i = 0; i < nsyms; i++, symp = symbol_next (symp)) { @@ -1138,8 +1399,7 @@ set_symtab (void) of the section. This allows proper nop-filling at the end of code-bearing sections. */ #define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) \ - (!(FRCHAIN)->frch_next || (FRCHAIN)->frch_next->frch_seg != (SEG) \ - ? get_recorded_alignment (SEG) : 0) + (!(FRCHAIN)->frch_next ? get_recorded_alignment (SEG) : 0) #else #define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) 0 #endif @@ -1149,48 +1409,58 @@ void subsegs_finish (void) { struct frchain *frchainP; + asection *s; - for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) + for (s = stdoutput->sections; s; s = s->next) { - int alignment = 0; - - subseg_set (frchainP->frch_seg, frchainP->frch_subseg); + segment_info_type *seginfo = seg_info (s); + if (!seginfo) + continue; - /* This now gets called even if we had errors. In that case, - any alignment is meaningless, and, moreover, will look weird - if we are generating a listing. */ - if (!had_errors ()) + for (frchainP = seginfo->frchainP; + frchainP != NULL; + frchainP = frchainP->frch_next) { - alignment = SUB_SEGMENT_ALIGN (now_seg, frchainP); - if ((bfd_get_section_flags (now_seg->owner, now_seg) & SEC_MERGE) - && now_seg->entsize) - { - unsigned int entsize = now_seg->entsize; - int entalign = 0; + int alignment = 0; + + subseg_set (s, frchainP->frch_subseg); - while ((entsize & 1) == 0) + /* This now gets called even if we had errors. In that case, + any alignment is meaningless, and, moreover, will look weird + if we are generating a listing. */ + if (!had_errors ()) + { + alignment = SUB_SEGMENT_ALIGN (now_seg, frchainP); + if ((bfd_get_section_flags (now_seg->owner, now_seg) & SEC_MERGE) + && now_seg->entsize) { - ++entalign; - entsize >>= 1; + unsigned int entsize = now_seg->entsize; + int entalign = 0; + + while ((entsize & 1) == 0) + { + ++entalign; + entsize >>= 1; + } + if (entalign > alignment) + alignment = entalign; } - if (entalign > alignment) - alignment = entalign; } - } - if (subseg_text_p (now_seg)) - frag_align_code (alignment, 0); - else - frag_align (alignment, 0, 0); + if (subseg_text_p (now_seg)) + frag_align_code (alignment, 0); + else + frag_align (alignment, 0, 0); - /* frag_align will have left a new frag. - Use this last frag for an empty ".fill". + /* frag_align will have left a new frag. + Use this last frag for an empty ".fill". - For this segment ... - Create a last frag. Do not leave a "being filled in frag". */ - frag_wane (frag_now); - frag_now->fr_fix = 0; - know (frag_now->fr_next == NULL); + For this segment ... + Create a last frag. Do not leave a "being filled in frag". */ + frag_wane (frag_now); + frag_now->fr_fix = 0; + know (frag_now->fr_next == NULL); + } } } @@ -1411,6 +1681,7 @@ write_object_file (void) resolve_symbol_value (symp); } resolve_local_symbol_values (); + resolve_reloc_expr_symbols (); PROGRESS (1); @@ -1478,7 +1749,7 @@ write_object_file (void) resolve_symbol_value (symp); /* Skip symbols which were equated to undefined or common - symbols. */ + symbols. */ if (symbol_equated_reloc_p (symp) || S_IS_WEAKREFR (symp)) { @@ -1807,23 +2078,48 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass) /* Do relax(). */ { unsigned long max_iterations; - offsetT stretch; /* May be any size, 0 or negative. */ - /* Cumulative number of addresses we have relaxed this pass. - We may have relaxed more than one address. */ - int stretched; /* Have we stretched on this pass? */ - /* This is 'cuz stretch may be zero, when, in fact some piece of code - grew, and another shrank. If a branch instruction doesn't fit anymore, - we could be scrod. */ + + /* Cumulative address adjustment. */ + offsetT stretch; + + /* Have we made any adjustment this pass? We can't just test + stretch because one piece of code may have grown and another + shrank. */ + int stretched; + + /* Most horrible, but gcc may give us some exception data that + is impossible to assemble, of the form + + .align 4 + .byte 0, 0 + .uleb128 end - start + start: + .space 128*128 - 1 + .align 4 + end: + + If the leb128 is two bytes in size, then end-start is 128*128, + which requires a three byte leb128. If the leb128 is three + bytes in size, then end-start is 128*128-1, which requires a + two byte leb128. We work around this dilemma by inserting + an extra 4 bytes of alignment just after the .align. This + works because the data after the align is accessed relative to + the end label. + + This counter is used in a tiny state machine to detect + whether a leb128 followed by an align is impossible to + relax. */ + int rs_leb128_fudge = 0; /* We want to prevent going into an infinite loop where one frag grows depending upon the location of a symbol which is in turn moved by the growing frag. eg: - foo = . - .org foo+16 - foo = . + foo = . + .org foo+16 + foo = . - So we dictate that this algorithm can be at most O2. */ + So we dictate that this algorithm can be at most O2. */ max_iterations = frag_count * frag_count; /* Check for overflow. */ if (max_iterations < frag_count) @@ -1936,6 +2232,49 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass) } growth = newoff - oldoff; + + /* If this align happens to follow a leb128 and + we have determined that the leb128 is bouncing + in size, then break the cycle by inserting an + extra alignment. */ + if (growth < 0 + && (rs_leb128_fudge & 16) != 0 + && (rs_leb128_fudge & 15) >= 2) + { + segment_info_type *seginfo = seg_info (segment); + struct obstack *ob = &seginfo->frchainP->frch_obstack; + struct frag *newf; + + newf = frag_alloc (ob); + obstack_blank_fast (ob, fragP->fr_var); + obstack_finish (ob); + memcpy (newf, fragP, SIZEOF_STRUCT_FRAG); + memcpy (newf->fr_literal, + fragP->fr_literal + fragP->fr_fix, + fragP->fr_var); + newf->fr_type = rs_fill; + newf->fr_fix = 0; + newf->fr_offset = (((offsetT) 1 << fragP->fr_offset) + / fragP->fr_var); + if (newf->fr_offset * newf->fr_var + != (offsetT) 1 << fragP->fr_offset) + { + newf->fr_offset = (offsetT) 1 << fragP->fr_offset; + newf->fr_var = 1; + } + /* Include growth of new frag, because rs_fill + frags don't normally grow. */ + growth += newf->fr_offset * newf->fr_var; + /* The new frag address is newoff. Adjust this + for the amount we'll add when we process the + new frag. */ + newf->fr_address = newoff - stretch - growth; + newf->relax_marker ^= 1; + fragP->fr_next = newf; +#ifdef DEBUG + as_warn (_("padding added")); +#endif + } } break; @@ -1946,11 +2285,11 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass) if (symbolP) { - /* Convert from an actual address to an octet offset - into the section. Here it is assumed that the - section's VMA is zero, and can omit subtracting it - from the symbol's value to get the address offset. */ - know (S_GET_SEGMENT (symbolP)->vma == 0); + /* Convert from an actual address to an octet offset + into the section. Here it is assumed that the + section's VMA is zero, and can omit subtracting it + from the symbol's value to get the address offset. */ + know (S_GET_SEGMENT (symbolP)->vma == 0); target += S_GET_VALUE (symbolP) * OCTETS_PER_BYTE; } @@ -1986,7 +2325,7 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass) _("attempt to move .org backwards")); /* We've issued an error message. Change the - frag to avoid cascading errors. */ + frag to avoid cascading errors. */ fragP->fr_type = rs_align; fragP->fr_subtype = 0; fragP->fr_offset = 0; @@ -2075,8 +2414,23 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass) { stretch += growth; stretched = 1; + if (fragP->fr_type == rs_leb128) + rs_leb128_fudge += 16; + else if (fragP->fr_type == rs_align + && (rs_leb128_fudge & 16) != 0 + && stretch == 0) + rs_leb128_fudge += 16; + else + rs_leb128_fudge = 0; } } + + if (stretch == 0 + && (rs_leb128_fudge & 16) == 0 + && (rs_leb128_fudge & -16) != 0) + rs_leb128_fudge += 1; + else + rs_leb128_fudge = 0; } /* Until nothing further to relax. */ while (stretched && -- max_iterations); @@ -2095,246 +2449,6 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass) return ret; } -/* fixup_segment() - - Go through all the fixS's in a segment and see which ones can be - handled now. (These consist of fixS where we have since discovered - the value of a symbol, or the address of the frag involved.) - For each one, call md_apply_fix to put the fix into the frag data. - - Result is a count of how many relocation structs will be needed to - handle the remaining fixS's that we couldn't completely handle here. - These will be output later by emit_relocations(). */ - -static long -fixup_segment (fixS *fixP, segT this_segment) -{ - long seg_reloc_count = 0; - valueT add_number; - fragS *fragP; - segT add_symbol_segment = absolute_section; - - if (fixP != NULL && abs_section_sym == NULL) - abs_section_sym = section_symbol (absolute_section); - - /* If the linker is doing the relaxing, we must not do any fixups. - - Well, strictly speaking that's not true -- we could do any that - are PC-relative and don't cross regions that could change size. - And for the i960 we might be able to turn callx/callj into bal - anyways in cases where we know the maximum displacement. */ - if (linkrelax && TC_LINKRELAX_FIXUP (this_segment)) - { - for (; fixP; fixP = fixP->fx_next) - if (!fixP->fx_done) - { - if (fixP->fx_addsy == NULL) - { - /* There was no symbol required by this relocation. - However, BFD doesn't really handle relocations - without symbols well. So fake up a local symbol in - the absolute section. */ - fixP->fx_addsy = abs_section_sym; - } - symbol_mark_used_in_reloc (fixP->fx_addsy); - if (fixP->fx_subsy != NULL) - symbol_mark_used_in_reloc (fixP->fx_subsy); - seg_reloc_count++; - } - TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); - return seg_reloc_count; - } - - for (; fixP; fixP = fixP->fx_next) - { -#ifdef DEBUG5 - fprintf (stderr, "\nprocessing fixup:\n"); - print_fixup (fixP); -#endif - - fragP = fixP->fx_frag; - know (fragP); -#ifdef TC_VALIDATE_FIX - TC_VALIDATE_FIX (fixP, this_segment, skip); -#endif - add_number = fixP->fx_offset; - - if (fixP->fx_addsy != NULL - && symbol_mri_common_p (fixP->fx_addsy)) - { - add_number += S_GET_VALUE (fixP->fx_addsy); - fixP->fx_offset = add_number; - fixP->fx_addsy - = symbol_get_value_expression (fixP->fx_addsy)->X_add_symbol; - } - - if (fixP->fx_addsy != NULL) - add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy); - - if (fixP->fx_subsy != NULL) - { - segT sub_symbol_segment; - resolve_symbol_value (fixP->fx_subsy); - sub_symbol_segment = S_GET_SEGMENT (fixP->fx_subsy); - if (fixP->fx_addsy != NULL - && sub_symbol_segment == add_symbol_segment - && !TC_FORCE_RELOCATION_SUB_SAME (fixP, add_symbol_segment)) - { - add_number += S_GET_VALUE (fixP->fx_addsy); - add_number -= S_GET_VALUE (fixP->fx_subsy); - fixP->fx_offset = add_number; - fixP->fx_addsy = NULL; - fixP->fx_subsy = NULL; -#ifdef TC_M68K - /* See the comment below about 68k weirdness. */ - fixP->fx_pcrel = 0; -#endif - } - else if (sub_symbol_segment == absolute_section - && !TC_FORCE_RELOCATION_SUB_ABS (fixP)) - { - add_number -= S_GET_VALUE (fixP->fx_subsy); - fixP->fx_offset = add_number; - fixP->fx_subsy = NULL; - } - else if (sub_symbol_segment == this_segment - && !TC_FORCE_RELOCATION_SUB_LOCAL (fixP)) - { - add_number -= S_GET_VALUE (fixP->fx_subsy); - fixP->fx_offset = (add_number + fixP->fx_dot_value - + fixP->fx_frag->fr_address); - - /* Make it pc-relative. If the back-end code has not - selected a pc-relative reloc, cancel the adjustment - we do later on all pc-relative relocs. */ - if (0 -#ifdef TC_M68K - /* Do this for m68k even if it's already described - as pc-relative. On the m68k, an operand of - "pc@(foo-.-2)" should address "foo" in a - pc-relative mode. */ - || 1 -#endif - || !fixP->fx_pcrel) - add_number += MD_PCREL_FROM_SECTION (fixP, this_segment); - fixP->fx_subsy = NULL; - fixP->fx_pcrel = 1; - } - else if (!TC_VALIDATE_FIX_SUB (fixP)) - { - as_bad_where (fixP->fx_file, fixP->fx_line, - _("can't resolve `%s' {%s section} - `%s' {%s section}"), - fixP->fx_addsy ? S_GET_NAME (fixP->fx_addsy) : "0", - segment_name (add_symbol_segment), - S_GET_NAME (fixP->fx_subsy), - segment_name (sub_symbol_segment)); - } - } - - if (fixP->fx_addsy) - { - if (add_symbol_segment == this_segment - && !TC_FORCE_RELOCATION_LOCAL (fixP)) - { - /* This fixup was made when the symbol's segment was - SEG_UNKNOWN, but it is now in the local segment. - So we know how to do the address without relocation. */ - add_number += S_GET_VALUE (fixP->fx_addsy); - fixP->fx_offset = add_number; - if (fixP->fx_pcrel) - add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); - fixP->fx_addsy = NULL; - fixP->fx_pcrel = 0; - } - else if (add_symbol_segment == absolute_section - && !TC_FORCE_RELOCATION_ABS (fixP)) - { - add_number += S_GET_VALUE (fixP->fx_addsy); - fixP->fx_offset = add_number; - fixP->fx_addsy = NULL; - } - else if (add_symbol_segment != undefined_section - && ! bfd_is_com_section (add_symbol_segment) - && MD_APPLY_SYM_VALUE (fixP)) - add_number += S_GET_VALUE (fixP->fx_addsy); - } - - if (fixP->fx_pcrel) - { - add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); - if (!fixP->fx_done && fixP->fx_addsy == NULL) - { - /* There was no symbol required by this relocation. - However, BFD doesn't really handle relocations - without symbols well. So fake up a local symbol in - the absolute section. */ - fixP->fx_addsy = abs_section_sym; - } - } - - if (!fixP->fx_done) - md_apply_fix (fixP, &add_number, this_segment); - - if (!fixP->fx_done) - { - ++seg_reloc_count; - if (fixP->fx_addsy == NULL) - fixP->fx_addsy = abs_section_sym; - symbol_mark_used_in_reloc (fixP->fx_addsy); - if (fixP->fx_subsy != NULL) - symbol_mark_used_in_reloc (fixP->fx_subsy); - } - - if (!fixP->fx_bit_fixP && !fixP->fx_no_overflow && fixP->fx_size != 0) - { - if (fixP->fx_size < sizeof (valueT)) - { - valueT mask; - - mask = 0; - mask--; /* Set all bits to one. */ - mask <<= fixP->fx_size * 8 - (fixP->fx_signed ? 1 : 0); - if ((add_number & mask) != 0 && (add_number & mask) != mask) - { - char buf[50], buf2[50]; - sprint_value (buf, fragP->fr_address + fixP->fx_where); - if (add_number > 1000) - sprint_value (buf2, add_number); - else - sprintf (buf2, "%ld", (long) add_number); - as_bad_where (fixP->fx_file, fixP->fx_line, - _("value of %s too large for field of %d bytes at %s"), - buf2, fixP->fx_size, buf); - } /* Generic error checking. */ - } -#ifdef WARN_SIGNED_OVERFLOW_WORD - /* Warn if a .word value is too large when treated as a signed - number. We already know it is not too negative. This is to - catch over-large switches generated by gcc on the 68k. */ - if (!flag_signed_overflow_ok - && fixP->fx_size == 2 - && add_number > 0x7fff) - as_bad_where (fixP->fx_file, fixP->fx_line, - _("signed .word overflow; switch may be too large; %ld at 0x%lx"), - (long) add_number, - (long) (fragP->fr_address + fixP->fx_where)); -#endif - } /* Not a bit fix. */ - -#ifdef TC_VALIDATE_FIX - skip: ATTRIBUTE_UNUSED_LABEL - ; -#endif -#ifdef DEBUG5 - fprintf (stderr, "result:\n"); - print_fixup (fixP); -#endif - } /* For each fixS in this segment. */ - - TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); - return seg_reloc_count; -} - void number_to_chars_bigendian (char *buf, valueT val, int n) { |
