X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gas%2Fwrite.c;h=9d681f2687473a8d3c6230314518fa1446929605;hb=c7c7219d3a06a714e04e73ebd029811e6bd5bd37;hp=aca53b670d68f43444ac62e89b1b9504f4b60677;hpb=4111faa5792ba8a46e62b64f44ecda09a1e9c9a1;p=binutils-gdb.git diff --git a/gas/write.c b/gas/write.c index aca53b670d6..9d681f26874 100644 --- a/gas/write.c +++ b/gas/write.c @@ -1,13 +1,13 @@ /* 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, 2008 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + the Free Software Foundation; either version 3, or (at your option) any later version. GAS is distributed in the hope that it will be useful, @@ -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 @@ -54,26 +54,34 @@ (! SEG_NORMAL (SEG)) #endif +#ifndef md_register_arithmetic +# define md_register_arithmetic 1 +#endif + #ifndef TC_FORCE_RELOCATION_SUB_ABS -#define TC_FORCE_RELOCATION_SUB_ABS(FIX) 0 +#define TC_FORCE_RELOCATION_SUB_ABS(FIX, SEG) \ + (!md_register_arithmetic && (SEG) == reg_section) #endif #ifndef TC_FORCE_RELOCATION_SUB_LOCAL #ifdef DIFF_EXPR_OK -#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX) 0 +#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX, SEG) \ + (!md_register_arithmetic && (SEG) == reg_section) #else -#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX) 1 +#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX, SEG) 1 #endif #endif #ifndef TC_VALIDATE_FIX_SUB #ifdef UNDEFINED_DIFFERENCE_OK /* The PA needs this for PIC code generation. */ -#define TC_VALIDATE_FIX_SUB(FIX) 1 +#define TC_VALIDATE_FIX_SUB(FIX, SEG) \ + (md_register_arithmetic || (SEG) != reg_section) #else -#define TC_VALIDATE_FIX_SUB(FIX) \ - ((FIX)->fx_r_type == BFD_RELOC_GPREL32 \ - || (FIX)->fx_r_type == BFD_RELOC_GPREL16) +#define TC_VALIDATE_FIX_SUB(FIX, SEG) \ + ((md_register_arithmetic || (SEG) != reg_section) \ + && ((FIX)->fx_r_type == BFD_RELOC_GPREL32 \ + || (FIX)->fx_r_type == BFD_RELOC_GPREL16)) #endif #endif @@ -97,6 +105,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 +125,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 +140,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 +156,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 +172,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; @@ -316,6 +319,9 @@ generic_force_reloc (fixS *fix) || fix->fx_r_type == BFD_RELOC_VTABLE_ENTRY) return 1; + if (fix->fx_addsy == NULL) + return 0; + return S_FORCE_RELOC (fix->fx_addsy, fix->fx_subsy == NULL); } @@ -362,7 +368,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; @@ -376,7 +382,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; @@ -391,6 +397,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; } @@ -398,7 +405,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; @@ -509,25 +516,25 @@ cvt_frag_to_fill (segT sec ATTRIBUTE_UNUSED, fragS *fragP) #endif } -static void relax_seg (bfd *, asection *, PTR); +struct relax_seg_info +{ + int pass; + int changed; +}; static void -relax_seg (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, PTR xxx) +relax_seg (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *xxx) { segment_info_type *seginfo = seg_info (sec); + struct relax_seg_info *info = (struct relax_seg_info *) xxx; if (seginfo && seginfo->frchainP - && relax_segment (seginfo->frchainP->frch_root, sec)) - { - int *result = (int *) xxx; - *result = 1; - } + && relax_segment (seginfo->frchainP->frch_root, sec, info->pass)) + 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; @@ -557,11 +564,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); @@ -632,13 +635,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; @@ -675,24 +758,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)) + while (symbol_equated_reloc_p (sym) + || S_IS_WEAKREFR (sym)) { - symbolS *new_sym - = symbol_get_value_expression (sym)->X_add_symbol; - const char *name = S_GET_NAME (sym); - if (!S_IS_COMMON (new_sym) - && !TC_FAKE_LABEL (name) - && (!S_IS_EXTERNAL (sym) || S_IS_LOCAL (sym))) - as_bad (_("Local symbol `%s' can't be equated to undefined symbol `%s'"), - name, S_GET_NAME (new_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 = new_sym; - 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; } @@ -721,14 +801,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 @@ -765,10 +845,247 @@ 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_symbol_segment)) + { + 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_symbol_segment)) + { + 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, add_symbol_segment)) + { + if (!md_register_arithmetic + && (add_symbol_segment == reg_section + || sub_symbol_segment == reg_section)) + as_bad_where (fixP->fx_file, fixP->fx_line, + _("register value used as expression")); + else + 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); @@ -776,14 +1093,49 @@ 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; + asymbol *sym; + + if (reloc->sym_ptr_ptr != NULL + && (sym = *reloc->sym_ptr_ptr) != NULL + && (sym->flags & BSF_KEEP) == 0 + && ((sym->flags & BSF_SECTION_SYM) == 0 + || (EMIT_SECTION_SYMBOLS + && !bfd_is_abs_section (sym->section)))) + as_bad_where (file, line, _("redefined symbol cannot be used on reloc")); + + 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. */ @@ -792,153 +1144,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 { @@ -958,12 +1230,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); @@ -989,7 +1279,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; @@ -1016,11 +1306,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; @@ -1040,12 +1327,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; } } @@ -1099,7 +1382,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 @@ -1113,11 +1395,15 @@ 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)) { asympp[i] = symbol_get_bfdsym (symp); + if (asympp[i]->flags != BSF_SECTION_SYM + || !(bfd_is_const_section (asympp[i]->section) + && asympp[i]->section->symbol == asympp[i])) + asympp[i]->flags |= BSF_KEEP; symbol_mark_written (symp); } } @@ -1140,8 +1426,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 @@ -1151,48 +1436,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); + } } } @@ -1201,6 +1496,7 @@ subsegs_finish (void) void write_object_file (void) { + struct relax_seg_info rsi; #ifndef WORKING_DOT_WORD fragS *fragP; /* Track along all frags. */ #endif @@ -1259,10 +1555,9 @@ write_object_file (void) merge_data_into_text (); } + rsi.pass = 0; while (1) { - int changed; - #ifndef WORKING_DOT_WORD /* We need to reset the markers in the broken word list and associated frags between calls to relax_segment (via @@ -1283,9 +1578,10 @@ write_object_file (void) } #endif - changed = 0; - bfd_map_over_sections (stdoutput, relax_seg, &changed); - if (!changed) + rsi.changed = 0; + bfd_map_over_sections (stdoutput, relax_seg, &rsi); + rsi.pass++; + if (!rsi.changed) break; } @@ -1375,18 +1671,22 @@ write_object_file (void) if (lie->added == 2) continue; /* Patch the jump table. */ - /* This is the offset from ??? to table_ptr+0. */ - to_addr = table_addr - S_GET_VALUE (lie->sub); -#ifdef TC_CHECK_ADJUSTED_BROKEN_DOT_WORD - TC_CHECK_ADJUSTED_BROKEN_DOT_WORD (to_addr, lie); -#endif - md_number_to_chars (lie->word_goes_here, to_addr, 2); - for (untruth = lie->next_broken_word; + for (untruth = (struct broken_word *) (fragP->fr_symbol); untruth && untruth->dispfrag == fragP; untruth = untruth->next_broken_word) { if (untruth->use_jump == lie) - md_number_to_chars (untruth->word_goes_here, to_addr, 2); + { + /* This is the offset from ??? to table_ptr+0. + The target is the same for all users of this + md_long_jump, but the "sub" bases (and hence the + offsets) may be different. */ + addressT to_word = table_addr - S_GET_VALUE (untruth->sub); +#ifdef TC_CHECK_ADJUSTED_BROKEN_DOT_WORD + TC_CHECK_ADJUSTED_BROKEN_DOT_WORD (to_word, untruth); +#endif + md_number_to_chars (untruth->word_goes_here, to_word, 2); + } } /* Install the long jump. */ @@ -1412,6 +1712,7 @@ write_object_file (void) resolve_symbol_value (symp); } resolve_local_symbol_values (); + resolve_reloc_expr_symbols (); PROGRESS (1); @@ -1479,28 +1780,31 @@ write_object_file (void) resolve_symbol_value (symp); /* Skip symbols which were equated to undefined or common - symbols. */ - if (symbol_equated_reloc_p (symp)) + symbols. */ + if (symbol_equated_reloc_p (symp) + || S_IS_WEAKREFR (symp)) { const char *name = S_GET_NAME (symp); if (S_IS_COMMON (symp) && !TC_FAKE_LABEL (name) + && !S_IS_WEAKREFR (symp) && (!S_IS_EXTERNAL (symp) || S_IS_LOCAL (symp))) { expressionS *e = symbol_get_value_expression (symp); as_bad (_("Local symbol `%s' can't be equated to common symbol `%s'"), name, S_GET_NAME (e->X_add_symbol)); } + if (S_GET_SEGMENT (symp) == reg_section) + { + /* Report error only if we know the symbol name. */ + if (S_GET_NAME (symp) != reg_section->name) + as_bad (_("can't make global register symbol `%s'"), + name); + } symbol_remove (symp, &symbol_rootP, &symbol_lastP); continue; } - /* So far, common symbols have been treated like undefined symbols. - Put them in the common section now. */ - if (S_IS_DEFINED (symp) == 0 - && S_GET_VALUE (symp) != 0) - S_SET_SEGMENT (symp, bfd_com_section_ptr); - #ifdef obj_frob_symbol obj_frob_symbol (symp, punt); #endif @@ -1521,7 +1825,8 @@ write_object_file (void) opposites. Sometimes the former checks flags and the latter examines the name... */ || (!S_IS_EXTERNAL (symp) - && (punt || S_IS_LOCAL (symp)) + && (punt || S_IS_LOCAL (symp) || + (S_IS_WEAKREFD (symp) && ! symbol_used_p (symp))) && ! symbol_used_in_reloc_p (symp))) { symbol_remove (symp, &symbol_rootP, &symbol_lastP); @@ -1563,6 +1868,10 @@ write_object_file (void) obj_adjust_symtab (); #endif + /* Stop if there is an error. */ + if (had_errors ()) + return; + /* Now that all the sizes are known, and contents correct, we can start writing to the file. */ set_symtab (); @@ -1719,7 +2028,7 @@ relax_align (register relax_addressT address, /* Address now. */ addresses. */ int -relax_segment (struct frag *segment_frag_root, segT segment) +relax_segment (struct frag *segment_frag_root, segT segment, int pass) { unsigned long frag_count; struct frag *fragP; @@ -1811,28 +2120,54 @@ relax_segment (struct frag *segment_frag_root, segT segment) /* 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) max_iterations = frag_count; + ret = 0; do { stretch = 0; @@ -1895,13 +2230,17 @@ relax_segment (struct frag *segment_frag_root, segT segment) S_GET_NAME (lie->sub), buf); } - lie->added = 1; if (fragP->fr_subtype == 0) { fragP->fr_subtype++; growth += md_short_jump_size; } - for (untruth = lie->next_broken_word; + + /* Redirect *all* words of this table with the same + target, lest we have to handle the case where the + same target but with a offset that fits on this + round overflows at the next relaxation round. */ + for (untruth = (struct broken_word *) (fragP->fr_symbol); untruth && untruth->dispfrag == lie->dispfrag; untruth = untruth->next_broken_word) if ((symbol_get_frag (untruth->add) @@ -1912,6 +2251,8 @@ relax_segment (struct frag *segment_frag_root, segT segment) untruth->added = 2; untruth->use_jump = lie; } + + lie->added = 1; growth += md_long_jump_size; } } @@ -1939,6 +2280,49 @@ relax_segment (struct frag *segment_frag_root, segT segment) } 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; @@ -1949,19 +2333,39 @@ relax_segment (struct frag *segment_frag_root, segT segment) 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; } know (fragP->fr_next); - after = fragP->fr_next->fr_address; + after = fragP->fr_next->fr_address + stretch; growth = target - after; if (growth < 0) { + growth = 0; + + /* Don't error on first few frag relax passes. + The symbol might be an expression involving + symbol values from other sections. If those + sections have not yet been processed their + frags will all have zero addresses, so we + will calculate incorrect values for them. The + number of passes we allow before giving an + error is somewhat arbitrary. It should be at + least one, with larger values requiring + increasingly contrived dependencies between + frags to trigger a false error. */ + if (pass < 2) + { + /* Force another pass. */ + ret = 1; + break; + } + /* Growth may be negative, but variable part of frag cannot have fewer than 0 chars. That is, we can't .org backwards. */ @@ -1969,18 +2373,14 @@ relax_segment (struct frag *segment_frag_root, segT segment) _("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; - fragP->fr_fix = after - was_address; - growth = stretch; + fragP->fr_fix = after - address; } - - /* This is an absolute growth factor */ - growth -= stretch; - break; } + break; case rs_space: growth = 0; @@ -2000,6 +2400,14 @@ relax_segment (struct frag *segment_frag_root, segT segment) } else if (amount < 0) { + /* Don't error on first few frag relax passes. + See rs_org comment for a longer explanation. */ + if (pass < 2) + { + ret = 1; + break; + } + as_warn_where (fragP->fr_file, fragP->fr_line, _(".space or .fill with negative value, ignored")); fragP->fr_symbol = 0; @@ -2050,8 +2458,23 @@ relax_segment (struct frag *segment_frag_root, segT segment) { 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); @@ -2061,7 +2484,6 @@ relax_segment (struct frag *segment_frag_root, segT segment) segment_name (segment)); } - ret = 0; for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) if (fragP->last_fr_address != fragP->fr_address) { @@ -2071,246 +2493,6 @@ relax_segment (struct frag *segment_frag_root, segT segment) 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) { @@ -2348,7 +2530,9 @@ void print_fixup (fixS *fixp) { indent_level = 1; - fprintf (stderr, "fix %lx %s:%d", (long) fixp, fixp->fx_file, fixp->fx_line); + fprintf (stderr, "fix "); + fprintf_vma (stderr, (bfd_vma)((bfd_hostptr_t) fixp)); + fprintf (stderr, " %s:%d",fixp->fx_file, fixp->fx_line); if (fixp->fx_pcrel) fprintf (stderr, " pcrel"); if (fixp->fx_pcrel_adjust) @@ -2365,9 +2549,12 @@ print_fixup (fixS *fixp) fprintf (stderr, " tcbit"); if (fixp->fx_done) fprintf (stderr, " done"); - fprintf (stderr, "\n size=%d frag=%lx where=%ld offset=%lx addnumber=%lx", - fixp->fx_size, (long) fixp->fx_frag, (long) fixp->fx_where, - (long) fixp->fx_offset, (long) fixp->fx_addnumber); + fprintf (stderr, "\n size=%d frag=", fixp->fx_size); + fprintf_vma (stderr, (bfd_vma) ((bfd_hostptr_t) fixp->fx_frag)); + fprintf (stderr, " where=%ld offset=%lx addnumber=%lx", + (long) fixp->fx_where, + (unsigned long) fixp->fx_offset, + (unsigned long) fixp->fx_addnumber); fprintf (stderr, "\n %s (%d)", bfd_get_reloc_code_name (fixp->fx_r_type), fixp->fx_r_type); if (fixp->fx_addsy)