X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fwrite.c;h=ce40572749cc967079f327ee23b413425d559b06;hb=a4447b93785ea7fd86d583bb892f3cb5f6db71d3;hp=0c28ac7fd916bb22b253e3f4bea7fa379f528615;hpb=14ad458a39b44fffd593ced9a6311e56e0326c5d;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/write.c b/gas/write.c index 0c28ac7fd9..ce40572749 100644 --- a/gas/write.c +++ b/gas/write.c @@ -1,5 +1,6 @@ /* write.c - emit .o file - Copyright (C) 1986, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,45 +20,98 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* This thing should be set up to do byteordering correctly. But... */ +/* This thing should be set up to do byteordering correctly. But... */ #include "as.h" #include "subsegs.h" #include "obstack.h" #include "output-file.h" +#include "dwarf2dbg.h" -/* This looks like a good idea. Let's try turning it on always, for now. */ -#undef BFD_FAST_SECTION_FILL -#define BFD_FAST_SECTION_FILL +#ifndef TC_ADJUST_RELOC_COUNT +#define TC_ADJUST_RELOC_COUNT(FIX, COUNT) +#endif -/* The NOP_OPCODE is for the alignment fill value. Fill it with a nop - instruction so that the disassembler does not choke on it. */ -#ifndef NOP_OPCODE -#define NOP_OPCODE 0x00 +#ifndef TC_FORCE_RELOCATION +#define TC_FORCE_RELOCATION(FIX) \ + (generic_force_reloc (FIX)) #endif -#ifndef TC_ADJUST_RELOC_COUNT -#define TC_ADJUST_RELOC_COUNT(FIXP,COUNT) +#ifndef TC_FORCE_RELOCATION_ABS +#define TC_FORCE_RELOCATION_ABS(FIX) \ + (TC_FORCE_RELOCATION (FIX)) #endif -#ifndef TC_FORCE_RELOCATION -#define TC_FORCE_RELOCATION(FIXP) 0 +#ifndef TC_FORCE_RELOCATION_LOCAL +#define TC_FORCE_RELOCATION_LOCAL(FIX) \ + (!(FIX)->fx_pcrel \ + || (FIX)->fx_plt \ + || TC_FORCE_RELOCATION (FIX)) +#endif + +#ifndef TC_FORCE_RELOCATION_SUB_SAME +#define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEG) \ + (! SEG_NORMAL (SEG)) +#endif + +#ifndef TC_FORCE_RELOCATION_SUB_ABS +#define TC_FORCE_RELOCATION_SUB_ABS(FIX) 0 +#endif + +#ifndef TC_FORCE_RELOCATION_SUB_LOCAL +#ifdef DIFF_EXPR_OK +#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX) 0 +#else +#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX) 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 +#else +#ifdef BFD_ASSEMBLER +#define TC_VALIDATE_FIX_SUB(FIX) \ + ((FIX)->fx_r_type == BFD_RELOC_GPREL32 \ + || (FIX)->fx_r_type == BFD_RELOC_GPREL16) +#else +#define TC_VALIDATE_FIX_SUB(FIX) 0 +#endif +#endif +#endif + +#ifndef TC_LINKRELAX_FIXUP +#define TC_LINKRELAX_FIXUP(SEG) 1 #endif -#ifndef TC_FORCE_RELOCATION_SECTION -#define TC_FORCE_RELOCATION_SECTION(FIXP,SEG) TC_FORCE_RELOCATION(FIXP) +#ifndef MD_APPLY_SYM_VALUE +#define MD_APPLY_SYM_VALUE(FIX) 1 +#endif + +#ifndef TC_FINALIZE_SYMS_BEFORE_SIZE_SEG +#define TC_FINALIZE_SYMS_BEFORE_SIZE_SEG 1 #endif #ifndef MD_PCREL_FROM_SECTION -#define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from(FIXP) +#define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from (FIX) #endif #ifndef WORKING_DOT_WORD -extern CONST int md_short_jump_size; -extern CONST int md_long_jump_size; +extern const int md_short_jump_size; +extern const int md_long_jump_size; #endif +/* Used to control final evaluation of expressions. */ +int finalize_syms = 0; + int symbol_table_frozen; + +symbolS *abs_section_sym; + +/* Remember the value of dot when parsing expressions. */ +addressT dot_value; + void print_fixup PARAMS ((fixS *)); #ifdef BFD_ASSEMBLER @@ -77,9 +131,9 @@ struct frag *text_frag_root; struct frag *data_frag_root; struct frag *bss_frag_root; -struct frag *text_last_frag; /* Last frag in segment. */ -struct frag *data_last_frag; /* Last frag in segment. */ -static struct frag *bss_last_frag; /* Last frag in segment. */ +struct frag *text_last_frag; /* Last frag in segment. */ +struct frag *data_last_frag; /* Last frag in segment. */ +static struct frag *bss_last_frag; /* Last frag in segment. */ #endif #ifndef BFD @@ -87,29 +141,28 @@ static object_headers headers; #endif long string_byte_count; -char *next_object_file_charP; /* Tracks object file bytes. */ +char *next_object_file_charP; /* Tracks object file bytes. */ #ifndef OBJ_VMS int magic_number_for_object_file = DEFAULT_MAGIC_NUMBER_FOR_OBJECT_FILE; #endif -#endif /* BFD_ASSEMBLER */ +#endif /* BFD_ASSEMBLER */ static int n_fixups; #ifdef BFD_ASSEMBLER -static fixS *fix_new_internal PARAMS ((fragS *, int where, int size, - symbolS *add, symbolS *sub, - offsetT offset, int pcrel, - bfd_reloc_code_real_type r_type)); +#define RELOC_ENUM enum bfd_reloc_code_real #else +#define RELOC_ENUM int +#endif + static fixS *fix_new_internal PARAMS ((fragS *, int where, int size, symbolS *add, symbolS *sub, offsetT offset, int pcrel, - int r_type)); -#endif + RELOC_ENUM r_type)); #if defined (BFD_ASSEMBLER) || (!defined (BFD) && !defined (OBJ_VMS)) -static long fixup_segment PARAMS ((fixS * fixP, segT this_segment_type)); +static long fixup_segment PARAMS ((fixS *, segT)); #endif static relax_addressT relax_align PARAMS ((relax_addressT addr, int align)); #if defined (BFD_ASSEMBLER) || ! defined (BFD) @@ -118,8 +171,8 @@ static fragS *chain_frchains_together_1 PARAMS ((segT, struct frchain *)); #ifdef BFD_ASSEMBLER static void chain_frchains_together PARAMS ((bfd *, segT, PTR)); static void cvt_frag_to_fill PARAMS ((segT, fragS *)); -static void relax_and_size_seg PARAMS ((bfd *, asection *, PTR)); static void adjust_reloc_syms PARAMS ((bfd *, asection *, PTR)); +static void fix_segment PARAMS ((bfd *, asection *, PTR)); static void write_relocs PARAMS ((bfd *, asection *, PTR)); static void write_contents PARAMS ((bfd *, asection *, PTR)); static void set_symtab PARAMS ((void)); @@ -133,26 +186,19 @@ static void remove_subsegs PARAMS ((frchainS *, int, fragS **, fragS **)); static void relax_and_size_all_segments PARAMS ((void)); #endif -/* - * fix_new() - * - * Create a fixS in obstack 'notes'. - */ +/* Create a fixS in obstack 'notes'. */ + static fixS * fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, r_type) - fragS *frag; /* Which frag? */ - int where; /* Where in that frag? */ - int size; /* 1, 2, or 4 usually. */ - symbolS *add_symbol; /* X_add_symbol. */ - symbolS *sub_symbol; /* X_op_symbol. */ - offsetT offset; /* X_add_number. */ - int pcrel; /* TRUE if PC-relative relocation. */ -#ifdef BFD_ASSEMBLER - bfd_reloc_code_real_type r_type; /* Relocation type */ -#else - int r_type; /* Relocation type */ -#endif + fragS *frag; /* Which frag? */ + int where; /* Where in that frag? */ + int size; /* 1, 2, or 4 usually. */ + symbolS *add_symbol; /* X_add_symbol. */ + symbolS *sub_symbol; /* X_op_symbol. */ + offsetT offset; /* X_add_number. */ + int pcrel; /* TRUE if PC-relative relocation. */ + RELOC_ENUM r_type ATTRIBUTE_UNUSED; /* Relocation type. */ { fixS *fixP; @@ -172,6 +218,7 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, fixP->fx_addsy = add_symbol; fixP->fx_subsy = sub_symbol; fixP->fx_offset = offset; + fixP->fx_dot_value = dot_value; fixP->fx_pcrel = pcrel; fixP->fx_plt = 0; #if defined(NEED_FX_R_TYPE) || defined (BFD_ASSEMBLER) @@ -192,7 +239,7 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, #endif #ifdef TC_FIX_TYPE - TC_INIT_FIX_DATA(fixP); + TC_INIT_FIX_DATA (fixP); #endif as_where (&fixP->fx_file, &fixP->fx_line); @@ -200,8 +247,7 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, /* Usually, we want relocs sorted numerically, but while comparing to older versions of gas that have relocs reverse sorted, it is convenient to have this compile - time option. xoxorich. */ - + time option. xoxorich. */ { #ifdef BFD_ASSEMBLER @@ -218,7 +264,7 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, fixP->fx_next = *seg_fix_rootP; *seg_fix_rootP = fixP; -#else /* REVERSE_SORT_RELOCS */ +#else /* REVERSE_SORT_RELOCS */ fixP->fx_next = NULL; @@ -228,8 +274,7 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, *seg_fix_rootP = fixP; *seg_fix_tailP = fixP; -#endif /* REVERSE_SORT_RELOCS */ - +#endif /* REVERSE_SORT_RELOCS */ } return fixP; @@ -239,17 +284,13 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, fixS * fix_new (frag, where, size, add_symbol, offset, pcrel, r_type) - fragS *frag; /* Which frag? */ - int where; /* Where in that frag? */ - int size; /* 1, 2, or 4 usually. */ - symbolS *add_symbol; /* X_add_symbol. */ - offsetT offset; /* X_add_number. */ - int pcrel; /* TRUE if PC-relative relocation. */ -#ifdef BFD_ASSEMBLER - bfd_reloc_code_real_type r_type; /* Relocation type */ -#else - int r_type; /* Relocation type */ -#endif + fragS *frag; /* Which frag? */ + int where; /* Where in that frag? */ + int size; /* 1, 2, or 4 usually. */ + symbolS *add_symbol; /* X_add_symbol. */ + offsetT offset; /* X_add_number. */ + int pcrel; /* TRUE if PC-relative relocation. */ + RELOC_ENUM r_type; /* Relocation type. */ { return fix_new_internal (frag, where, size, add_symbol, (symbolS *) NULL, offset, pcrel, r_type); @@ -261,16 +302,12 @@ fix_new (frag, where, size, add_symbol, offset, pcrel, r_type) fixS * fix_new_exp (frag, where, size, exp, pcrel, r_type) - fragS *frag; /* Which frag? */ - int where; /* Where in that frag? */ - int size; /* 1, 2, or 4 usually. */ + fragS *frag; /* Which frag? */ + int where; /* Where in that frag? */ + int size; /* 1, 2, or 4 usually. */ expressionS *exp; /* Expression. */ - int pcrel; /* TRUE if PC-relative relocation. */ -#ifdef BFD_ASSEMBLER - bfd_reloc_code_real_type r_type; /* Relocation type */ -#else - int r_type; /* Relocation type */ -#endif + int pcrel; /* TRUE if PC-relative relocation. */ + RELOC_ENUM r_type; /* Relocation type. */ { symbolS *add = NULL; symbolS *sub = NULL; @@ -281,15 +318,21 @@ fix_new_exp (frag, where, size, exp, pcrel, r_type) case O_absent: break; + case O_register: + as_bad (_("register value used as expression")); + break; + case O_add: /* This comes up when _GLOBAL_OFFSET_TABLE_+(.-L0) is read, if the difference expression cannot immediately be reduced. */ { symbolS *stmp = make_expr_symbol (exp); + exp->X_op = O_symbol; exp->X_op_symbol = 0; exp->X_add_symbol = stmp; exp->X_add_number = 0; + return fix_new_exp (frag, where, size, exp, pcrel, r_type); } @@ -303,7 +346,7 @@ fix_new_exp (frag, where, size, exp, pcrel, r_type) #if defined(TC_RVA_RELOC) r_type = TC_RVA_RELOC; #else - as_fatal(_("rva not supported")); + as_fatal (_("rva not supported")); #endif #endif break; @@ -318,7 +361,7 @@ fix_new_exp (frag, where, size, exp, pcrel, r_type) /* Fall through. */ case O_symbol: add = exp->X_add_symbol; - /* Fall through. */ + /* Fall through. */ case O_constant: off = exp->X_add_number; break; @@ -328,8 +371,20 @@ fix_new_exp (frag, where, size, exp, pcrel, r_type) break; } - return fix_new_internal (frag, where, size, add, sub, off, - pcrel, r_type); + return fix_new_internal (frag, where, size, add, sub, off, pcrel, r_type); +} + +/* Generic function to determine whether a fixup requires a relocation. */ +int +generic_force_reloc (fix) + fixS *fix; +{ +#ifdef BFD_ASSEMBLER + if (fix->fx_r_type == BFD_RELOC_VTABLE_INHERIT + || fix->fx_r_type == BFD_RELOC_VTABLE_ENTRY) + return 1; +#endif + return S_FORCE_RELOC (fix->fx_addsy, fix->fx_subsy == NULL); } /* Append a string onto another string, bumping the pointer along. */ @@ -339,7 +394,7 @@ append (charPP, fromP, length) char *fromP; unsigned long length; { - /* Don't trust memcpy() of 0 chars. */ + /* Don't trust memcpy() of 0 chars. */ if (length == 0) return; @@ -351,15 +406,14 @@ append (charPP, fromP, length) int section_alignment[SEG_MAXIMUM_ORDINAL]; #endif -/* - * This routine records the largest alignment seen for each segment. - * If the beginning of the segment is aligned on the worst-case - * boundary, all of the other alignments within it will work. At - * least one object format really uses this info. - */ +/* This routine records the largest alignment seen for each segment. + If the beginning of the segment is aligned on the worst-case + boundary, all of the other alignments within it will work. At + least one object format really uses this info. */ + void record_alignment (seg, align) - /* Segment to which alignment pertains */ + /* Segment to which alignment pertains. */ segT seg; /* Alignment, as a power of 2 (e.g., 1 => 2-byte boundary, 2 => 4-byte boundary, etc.) */ @@ -376,6 +430,19 @@ record_alignment (seg, align) #endif } +int +get_recorded_alignment (seg) + segT seg; +{ + if (seg == absolute_section) + return 0; +#ifdef BFD_ASSEMBLER + return bfd_get_section_alignment (stdoutput, seg); +#else + return section_alignment[(int) seg]; +#endif +} + #ifdef BFD_ASSEMBLER /* Reset the section indices after removing the gas created sections. */ @@ -392,7 +459,7 @@ renumber_sections (abfd, sec, countparg) ++*countp; } -#endif /* defined (BFD_ASSEMBLER) */ +#endif /* defined (BFD_ASSEMBLER) */ #if defined (BFD_ASSEMBLER) || ! defined (BFD) @@ -443,8 +510,8 @@ chain_frchains_together (abfd, section, xxx) subseg_new, so it is possible that seg_info is NULL. */ info = seg_info (section); if (info != (segment_info_type *) NULL) - info->frchainP->frch_last - = chain_frchains_together_1 (section, info->frchainP); + info->frchainP->frch_last + = chain_frchains_together_1 (section, info->frchainP); /* Now that we've chained the frags together, we must add new fixups to the segment, not to the frag chain. */ @@ -466,14 +533,14 @@ remove_subsegs (head, seg, root, last) *last = chain_frchains_together_1 (seg, head); } -#endif /* BFD */ +#endif /* BFD */ #if defined (BFD_ASSEMBLER) || !defined (BFD) #ifdef BFD_ASSEMBLER static void cvt_frag_to_fill (sec, fragP) - segT sec; + segT sec ATTRIBUTE_UNUSED; fragS *fragP; #else static void @@ -487,6 +554,7 @@ cvt_frag_to_fill (headersP, sec, fragP) { case rs_align: case rs_align_code: + case rs_align_test: case rs_org: case rs_space: #ifdef HANDLE_ALIGN @@ -501,6 +569,7 @@ cvt_frag_to_fill (headersP, sec, fragP) as_bad_where (fragP->fr_file, fragP->fr_line, _("attempt to .org/.space backwards? (%ld)"), (long) fragP->fr_offset); + fragP->fr_offset = 0; } fragP->fr_type = rs_fill; break; @@ -528,6 +597,10 @@ cvt_frag_to_fill (headersP, sec, fragP) eh_frame_convert_frag (fragP); break; + case rs_dwarf2dbg: + dwarf2dbg_convert_frag (fragP); + break; + case rs_machine_dependent: #ifdef BFD_ASSEMBLER md_convert_frag (stdoutput, sec, fragP); @@ -539,11 +612,9 @@ cvt_frag_to_fill (headersP, sec, fragP) || ((offsetT) (fragP->fr_next->fr_address - fragP->fr_address) == fragP->fr_fix)); - /* - * After md_convert_frag, we make the frag into a ".space 0". - * Md_convert_frag() should set up any fixSs and constants - * required. - */ + /* After md_convert_frag, we make the frag into a ".space 0". + md_convert_frag() should set up any fixSs and constants + required. */ frag_wane (fragP); break; @@ -572,11 +643,29 @@ cvt_frag_to_fill (headersP, sec, fragP) } } -#endif /* defined (BFD_ASSEMBLER) || !defined (BFD) */ +#endif /* defined (BFD_ASSEMBLER) || !defined (BFD) */ #ifdef BFD_ASSEMBLER +static void relax_seg PARAMS ((bfd *, asection *, PTR)); static void -relax_and_size_seg (abfd, sec, xxx) +relax_seg (abfd, sec, xxx) + bfd *abfd ATTRIBUTE_UNUSED; + asection *sec; + PTR xxx; +{ + segment_info_type *seginfo = seg_info (sec); + + if (seginfo && seginfo->frchainP + && relax_segment (seginfo->frchainP->frch_root, sec)) + { + int *result = (int *) xxx; + *result = 1; + } +} + +static void size_seg PARAMS ((bfd *, asection *, PTR)); +static void +size_seg (abfd, sec, xxx) bfd *abfd; asection *sec; PTR xxx ATTRIBUTE_UNUSED; @@ -589,23 +678,23 @@ relax_and_size_seg (abfd, sec, xxx) subseg_change (sec, 0); - flags = bfd_get_section_flags (abfd, sec); - seginfo = seg_info (sec); if (seginfo && seginfo->frchainP) { - relax_segment (seginfo->frchainP->frch_root, sec); for (fragp = seginfo->frchainP->frch_root; fragp; fragp = fragp->fr_next) cvt_frag_to_fill (sec, fragp); for (fragp = seginfo->frchainP->frch_root; fragp->fr_next; fragp = fragp->fr_next) - /* walk to last elt */; + /* Walk to last elt. */ + ; size = fragp->fr_address + fragp->fr_fix; } else size = 0; + flags = bfd_get_section_flags (abfd, sec); + if (size > 0 && ! seginfo->bss) flags |= SEC_HAS_CONTENTS; @@ -615,11 +704,11 @@ relax_and_size_seg (abfd, sec, xxx) else flags &= ~SEC_RELOC; x = bfd_set_section_flags (abfd, sec, flags); - assert (x == true); + assert (x); newsize = md_section_align (sec, size); x = bfd_set_section_size (abfd, sec, newsize); - assert (x == true); + assert (x); /* If the size had to be rounded up, add some padding in the last non-empty frag. */ @@ -631,7 +720,14 @@ relax_and_size_seg (abfd, sec, xxx) while (fragp->fr_next != last) fragp = fragp->fr_next; last->fr_address = size; - fragp->fr_offset += newsize - size; + if ((newsize - size) % fragp->fr_var == 0) + fragp->fr_offset += (newsize - size) / fragp->fr_var; + else + /* If we hit this abort, it's likely due to subsegs_finish not + providing sufficient alignment on the last frag, and the + machine dependent code using alignment frags with fr_var + greater than 1. */ + abort (); } #ifdef tc_frob_section @@ -645,7 +741,7 @@ relax_and_size_seg (abfd, sec, xxx) #ifdef DEBUG2 static void dump_section_relocs (abfd, sec, stream_) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; char *stream_; { @@ -660,22 +756,16 @@ dump_section_relocs (abfd, sec, stream_) while (fixp) { symbolS *s = fixp->fx_addsy; - if (s) + + fprintf (stream, " %08lx: type %d ", (unsigned long) fixp, + (int) fixp->fx_r_type); + if (s == NULL) + fprintf (stream, "no sym\n"); + else { - fprintf (stream, " %08x: %s(%s", fixp, S_GET_NAME (s), - s->bsym->section->name); - if (s->bsym->flags & BSF_SECTION_SYM) - { - fprintf (stream, " section sym"); - if (S_GET_VALUE (s)) - fprintf (stream, "+%x", S_GET_VALUE (s)); - } - else - fprintf (stream, "+%x", S_GET_VALUE (s)); - fprintf (stream, ")+%x\n", fixp->fx_offset); + print_symbol_value_1 (stream, s); + fprintf (stream, "\n"); } - else - fprintf (stream, " %08x: type %d no sym\n", fixp, fixp->fx_r_type); fixp = fixp->fx_next; } } @@ -687,6 +777,9 @@ dump_section_relocs (abfd, sec, stream_) #define EMIT_SECTION_SYMBOLS 1 #endif +/* This pass over fixups decides whether symbols can be replaced with + section symbols. */ + static void adjust_reloc_syms (abfd, sec, xxx) bfd *abfd ATTRIBUTE_UNUSED; @@ -703,7 +796,8 @@ adjust_reloc_syms (abfd, sec, xxx) for (fixp = seginfo->fix_root; fixp; fixp = fixp->fx_next) if (fixp->fx_done) - /* ignore it */; + /* Ignore it. */ + ; else if (fixp->fx_addsy) { symbolS *sym; @@ -720,65 +814,53 @@ adjust_reloc_syms (abfd, sec, xxx) point. It is possible to see unresolved expression symbols, though, since they are not in the regular symbol table. */ - if (sym != NULL) - resolve_symbol_value (sym, 1); - + resolve_symbol_value (sym); + if (fixp->fx_subsy != NULL) - resolve_symbol_value (fixp->fx_subsy, 1); + resolve_symbol_value (fixp->fx_subsy); /* If this symbol is equated to an undefined symbol, convert the fixup to being against that symbol. */ - if (sym != NULL && symbol_equated_p (sym) - && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) + if (symbol_equated_reloc_p (sym)) { fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; sym = symbol_get_value_expression (sym)->X_add_symbol; fixp->fx_addsy = sym; } - if (sym != NULL && symbol_mri_common_p (sym)) + if (symbol_mri_common_p (sym)) { /* These symbols are handled specially in fixup_segment. */ - goto done; + continue; } - symsec = S_GET_SEGMENT (sym); + /* If the symbol is undefined, common, weak, or global (ELF + shared libs), we can't replace it with the section symbol. */ + if (S_FORCE_RELOC (fixp->fx_addsy, 1)) + continue; + + /* Is there some other (target cpu dependent) reason we can't adjust + this one? (E.g. relocations involving function addresses on + the PA. */ +#ifdef tc_fix_adjustable + if (! tc_fix_adjustable (fixp)) + continue; +#endif + + /* Since we're reducing to section symbols, don't attempt to reduce + anything that's already using one. */ + if (symbol_section_p (sym)) + continue; + symsec = S_GET_SEGMENT (sym); if (symsec == NULL) abort (); - - if (bfd_is_abs_section (symsec)) - { - /* The fixup_segment routine will not use this symbol in a - relocation unless TC_FORCE_RELOCATION returns 1. */ - if (TC_FORCE_RELOCATION (fixp)) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); -#ifdef UNDEFINED_DIFFERENCE_OK - if (fixp->fx_subsy != NULL) - symbol_mark_used_in_reloc (fixp->fx_subsy); -#endif - } - goto done; - } - /* If it's one of these sections, assume the symbol is - definitely going to be output. The code in - md_estimate_size_before_relax in tc-mips.c uses this test - as well, so if you change this code you should look at that - code. */ - if (bfd_is_und_section (symsec) - || bfd_is_com_section (symsec)) + if (bfd_is_abs_section (symsec)) { - symbol_mark_used_in_reloc (fixp->fx_addsy); -#ifdef UNDEFINED_DIFFERENCE_OK - /* We have the difference of an undefined symbol and some - other symbol. Make sure to mark the other symbol as used - in a relocation so that it will always be output. */ - if (fixp->fx_subsy) - symbol_mark_used_in_reloc (fixp->fx_subsy); -#endif - goto done; + /* The fixup_segment routine normally will not use this + symbol in a relocation. */ + continue; } /* Don't try to reduce relocs which refer to non-local symbols @@ -787,105 +869,51 @@ adjust_reloc_syms (abfd, sec, xxx) this will always be correct. */ if (symsec != sec && ! S_IS_LOCAL (sym)) { - boolean linkonce; - - linkonce = false; -#ifdef BFD_ASSEMBLER - if ((bfd_get_section_flags (stdoutput, symsec) & SEC_LINK_ONCE) - != 0) - linkonce = true; -#endif -#ifdef OBJ_ELF - /* The GNU toolchain uses an extension for ELF: a section - beginning with the magic string .gnu.linkonce is a - linkonce section. */ - if (strncmp (segment_name (symsec), ".gnu.linkonce", - sizeof ".gnu.linkonce" - 1) == 0) - linkonce = true; -#endif - - if (linkonce) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); -#ifdef UNDEFINED_DIFFERENCE_OK - if (fixp->fx_subsy != NULL) - symbol_mark_used_in_reloc (fixp->fx_subsy); -#endif - goto done; - } - } - - /* Since we're reducing to section symbols, don't attempt to reduce - anything that's already using one. */ - if (symbol_section_p (sym)) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; - } - -#ifdef BFD_ASSEMBLER - /* We can never adjust a reloc against a weak symbol. If we - did, and the weak symbol was overridden by a real symbol - somewhere else, then our relocation would be pointing at - the wrong area of memory. */ - if (S_IS_WEAK (sym)) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; - } -#endif - - /* Is there some other reason we can't adjust this one? (E.g., - call/bal links in i960-bout symbols.) */ -#ifdef obj_fix_adjustable - if (! obj_fix_adjustable (fixp)) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; + if ((symsec->flags & SEC_LINK_ONCE) != 0 + || (IS_ELF + /* The GNU toolchain uses an extension for ELF: a + section beginning with the magic string + .gnu.linkonce is a linkonce section. */ + && strncmp (segment_name (symsec), ".gnu.linkonce", + sizeof ".gnu.linkonce" - 1) == 0)) + continue; } -#endif - /* Is there some other (target cpu dependent) reason we can't adjust - this one? (E.g. relocations involving function addresses on - the PA. */ -#ifdef tc_fix_adjustable - if (! tc_fix_adjustable (fixp)) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; - } -#endif + /* Never adjust a reloc against local symbol in a merge section + with non-zero addend. */ + if ((symsec->flags & SEC_MERGE) != 0 + && (fixp->fx_offset != 0 || fixp->fx_subsy != NULL)) + continue; - /* If the section symbol isn't going to be output, the relocs - at least should still work. If not, figure out what to do - when we run into that case. + /* Never adjust a reloc against TLS local symbol. */ + if ((symsec->flags & SEC_THREAD_LOCAL) != 0) + continue; - We refetch the segment when calling section_symbol, rather + /* We refetch the segment when calling section_symbol, rather than using symsec, because S_GET_VALUE may wind up changing - the section when it calls resolve_symbol_value. */ + the section when it calls resolve_symbol_value. */ fixp->fx_offset += S_GET_VALUE (sym); fixp->fx_addsy = section_symbol (S_GET_SEGMENT (sym)); - symbol_mark_used_in_reloc (fixp->fx_addsy); - - done: - ; - } -#if 1/*def RELOC_REQUIRES_SYMBOL*/ - else - { - /* There was no symbol required by this relocation. However, - BFD doesn't really handle relocations without symbols well. - (At least, the COFF support doesn't.) So for now we fake up - a local symbol in the absolute section. */ - - fixp->fx_addsy = section_symbol (absolute_section); -/* fixp->fx_addsy->sy_used_in_reloc = 1; */ - } +#ifdef DEBUG5 + fprintf (stderr, "\nadjusted fixup:\n"); + print_fixup (fixp); #endif + } dump_section_relocs (abfd, sec, stderr); } +static void +fix_segment (abfd, sec, xxx) + bfd *abfd ATTRIBUTE_UNUSED; + asection *sec; + PTR xxx ATTRIBUTE_UNUSED; +{ + segment_info_type *seginfo = seg_info (sec); + + fixup_segment (seginfo->fix_root, sec); +} + static void write_relocs (abfd, sec, xxx) bfd *abfd; @@ -893,7 +921,7 @@ write_relocs (abfd, sec, xxx) PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *seginfo = seg_info (sec); - int i; + unsigned int i; unsigned int n; arelent **relocs; fixS *fixp; @@ -904,8 +932,6 @@ write_relocs (abfd, sec, xxx) if (seginfo == NULL) return; - fixup_segment (seginfo->fix_root, sec); - n = 0; for (fixp = seginfo->fix_root; fixp; fixp = fixp->fx_next) n++; @@ -913,7 +939,7 @@ write_relocs (abfd, sec, xxx) #ifndef RELOC_EXPANSION_POSSIBLE /* Set up reloc information as well. */ relocs = (arelent **) xmalloc (n * sizeof (arelent *)); - memset ((char*)relocs, 0, n * sizeof (arelent*)); + memset ((char *) relocs, 0, n * sizeof (arelent *)); i = 0; for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) @@ -929,11 +955,10 @@ write_relocs (abfd, sec, xxx) } /* If this is an undefined symbol which was equated to another - symbol, then use generate the reloc against the latter symbol + symbol, then generate the reloc against the latter symbol rather than the former. */ sym = fixp->fx_addsy; - while (symbol_equated_p (sym) - && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) + while (symbol_equated_reloc_p (sym)) { symbolS *n; @@ -970,10 +995,12 @@ write_relocs (abfd, sec, xxx) case bfd_reloc_ok: break; case bfd_reloc_overflow: - as_bad_where (fixp->fx_file, fixp->fx_line, _("relocation 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")); + 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"), @@ -990,7 +1017,6 @@ write_relocs (abfd, sec, xxx) for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) { arelent **reloc; - char *data; bfd_reloc_status_type s; symbolS *sym; int j; @@ -1002,33 +1028,41 @@ write_relocs (abfd, sec, xxx) } /* If this is an undefined symbol which was equated to another - symbol, then use generate the reloc against the latter symbol + symbol, then generate the reloc against the latter symbol rather than the former. */ sym = fixp->fx_addsy; - while (symbol_equated_p (sym) - && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) - sym = symbol_get_value_expression (sym)->X_add_symbol; + 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); for (j = 0; reloc[j]; j++) { - relocs[i++] = reloc[j]; - assert(i <= n); + relocs[i++] = reloc[j]; + assert (i <= n); } - data = fixp->fx_frag->fr_literal + fixp->fx_where; 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) + switch (s) { case bfd_reloc_ok: break; @@ -1036,11 +1070,15 @@ write_relocs (abfd, sec, xxx) 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"), - fixp->fx_file, fixp->fx_line); + as_fatal (_("%s:%u: bad return from bfd_install_relocation: %x"), + fixp->fx_file, fixp->fx_line, s); } - } + } } n = i; #endif @@ -1070,6 +1108,10 @@ write_relocs (abfd, sec, xxx) (bfd_get_section_flags (abfd, sec) & (flagword) ~SEC_RELOC)); +#ifdef SET_SECTION_RELOCS + SET_SECTION_RELOCS (sec, relocs, n); +#endif + #ifdef DEBUG3 { int i; @@ -1099,7 +1141,7 @@ write_contents (abfd, sec, xxx) /* Write out the frags. */ if (seginfo == NULL - || ! (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)) + || !(bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)) return; for (f = seginfo->frchainP->frch_root; @@ -1117,7 +1159,7 @@ write_contents (abfd, sec, xxx) x = bfd_set_section_contents (stdoutput, sec, f->fr_literal, (file_ptr) offset, (bfd_size_type) f->fr_fix); - if (x == false) + if (!x) { bfd_perror (stdoutput->filename); as_perror (_("FATAL: Can't write %s"), stdoutput->filename); @@ -1132,19 +1174,20 @@ write_contents (abfd, sec, xxx) if (fill_size && count) { char buf[256]; - if (fill_size > sizeof(buf)) + if (fill_size > sizeof (buf)) { - /* Do it the old way. Can this ever happen? */ + /* Do it the old way. Can this ever happen? */ while (count--) { x = bfd_set_section_contents (stdoutput, sec, fill_literal, (file_ptr) offset, (bfd_size_type) fill_size); - if (x == false) + if (!x) { bfd_perror (stdoutput->filename); - as_perror (_("FATAL: Can't write %s"), stdoutput->filename); + as_perror (_("FATAL: Can't write %s"), + stdoutput->filename); exit (EXIT_FAILURE); } offset += fill_size; @@ -1164,18 +1207,18 @@ write_contents (abfd, sec, xxx) else { char *bufp; - n_per_buf = sizeof(buf)/fill_size; + n_per_buf = sizeof (buf) / fill_size; for (i = n_per_buf, bufp = buf; i; i--, bufp += fill_size) - memcpy(bufp, fill_literal, fill_size); + memcpy (bufp, fill_literal, fill_size); } for (; count > 0; count -= n_per_buf) { n_per_buf = n_per_buf > count ? count : n_per_buf; - x = bfd_set_section_contents (stdoutput, sec, - buf, (file_ptr) offset, - (bfd_size_type) n_per_buf * fill_size); - if (x != true) - as_fatal (_("Cannot write to output file.")); + x = bfd_set_section_contents + (stdoutput, sec, buf, (file_ptr) offset, + (bfd_size_type) n_per_buf * fill_size); + if (!x) + as_fatal (_("cannot write to output file")); offset += n_per_buf * fill_size; } } @@ -1212,7 +1255,7 @@ merge_data_into_text () data_fix_root = NULL; #endif } -#endif /* BFD_ASSEMBLER || (! BFD && ! OBJ_AOUT) */ +#endif /* BFD_ASSEMBLER || (! BFD && ! OBJ_AOUT) */ #if !defined (BFD_ASSEMBLER) && !defined (BFD) static void @@ -1223,30 +1266,27 @@ relax_and_size_all_segments () relax_segment (text_frag_root, SEG_TEXT); relax_segment (data_frag_root, SEG_DATA); relax_segment (bss_frag_root, SEG_BSS); - /* - * Now the addresses of frags are correct within the segment. - */ + /* Now the addresses of frags are correct within the segment. */ know (text_last_frag->fr_type == rs_fill && text_last_frag->fr_offset == 0); H_SET_TEXT_SIZE (&headers, text_last_frag->fr_address); text_last_frag->fr_address = H_GET_TEXT_SIZE (&headers); - /* - * Join the 2 segments into 1 huge segment. - * To do this, re-compute every rn_address in the SEG_DATA frags. - * Then join the data frags after the text frags. - * - * Determine a_data [length of data segment]. - */ + /* Join the 2 segments into 1 huge segment. + To do this, re-compute every rn_address in the SEG_DATA frags. + Then join the data frags after the text frags. + + Determine a_data [length of data segment]. */ if (data_frag_root) { register relax_addressT slide; - know ((text_last_frag->fr_type == rs_fill) && (text_last_frag->fr_offset == 0)); + know ((text_last_frag->fr_type == rs_fill) + && (text_last_frag->fr_offset == 0)); H_SET_DATA_SIZE (&headers, data_last_frag->fr_address); data_last_frag->fr_address = H_GET_DATA_SIZE (&headers); - slide = H_GET_TEXT_SIZE (&headers); /* & in file of the data segment. */ + slide = H_GET_TEXT_SIZE (&headers); /* & in file of the data segment. */ #ifdef OBJ_BOUT #define RoundUp(N,S) (((N)+(S)-1)&-(S)) /* For b.out: If the data section has a strict alignment @@ -1258,9 +1298,7 @@ relax_and_size_all_segments () #endif for (fragP = data_frag_root; fragP; fragP = fragP->fr_next) - { - fragP->fr_address += slide; - } /* for each data frag */ + fragP->fr_address += slide; know (text_last_frag != 0); text_last_frag->fr_next = data_frag_root; @@ -1281,21 +1319,19 @@ relax_and_size_all_segments () bss_vma = RoundUp (bss_vma, 1 << section_alignment[SEG_BSS]); bss_address_frag.fr_address = bss_vma; } -#else /* ! OBJ_BOUT */ +#else /* ! OBJ_BOUT */ bss_address_frag.fr_address = (H_GET_TEXT_SIZE (&headers) + H_GET_DATA_SIZE (&headers)); -#endif /* ! OBJ_BOUT */ +#endif /* ! OBJ_BOUT */ - /* Slide all the frags */ + /* Slide all the frags. */ if (bss_frag_root) { relax_addressT slide = bss_address_frag.fr_address; for (fragP = bss_frag_root; fragP; fragP = fragP->fr_next) - { - fragP->fr_address += slide; - } /* for each bss frag */ + fragP->fr_address += slide; } if (bss_last_frag) @@ -1304,7 +1340,7 @@ relax_and_size_all_segments () else H_SET_BSS_SIZE (&headers, 0); } -#endif /* ! BFD_ASSEMBLER && ! BFD */ +#endif /* ! BFD_ASSEMBLER && ! BFD */ #if defined (BFD_ASSEMBLER) || !defined (BFD) @@ -1315,8 +1351,8 @@ set_symtab () int nsyms; asymbol **asympp; symbolS *symp; - boolean result; - extern PTR bfd_alloc PARAMS ((bfd *, size_t)); + bfd_boolean result; + extern PTR bfd_alloc PARAMS ((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 @@ -1328,9 +1364,9 @@ set_symtab () if (nsyms) { int i; + bfd_size_type amt = (bfd_size_type) nsyms * sizeof (asymbol *); - asympp = (asymbol **) bfd_alloc (stdoutput, - nsyms * sizeof (asymbol *)); + asympp = (asymbol **) bfd_alloc (stdoutput, amt); symp = symbol_rootP; for (i = 0; i < nsyms; i++, symp = symbol_next (symp)) { @@ -1341,7 +1377,7 @@ set_symtab () else asympp = 0; result = bfd_set_symtab (stdoutput, asympp, nsyms); - assert (result == true); + assert (result); symbol_table_frozen = 1; } #endif @@ -1353,10 +1389,19 @@ set_symtab () makes calculating their intended length trivial. */ #ifndef SUB_SEGMENT_ALIGN +#ifdef HANDLE_ALIGN +/* The last subsegment gets an aligment corresponding to the alignment + 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) +#else #ifdef BFD_ASSEMBLER -#define SUB_SEGMENT_ALIGN(SEG) (0) +#define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) 0 #else -#define SUB_SEGMENT_ALIGN(SEG) (2) +#define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) 2 +#endif #endif #endif @@ -1367,21 +1412,44 @@ subsegs_finish () for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) { + int alignment = 0; + subseg_set (frchainP->frch_seg, frchainP->frch_subseg); /* 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. */ - frag_align (had_errors () ? 0 : SUB_SEGMENT_ALIGN (now_seg), - subseg_text_p (now_seg) ? NOP_OPCODE : 0, - 0); + if (!had_errors ()) + { + alignment = SUB_SEGMENT_ALIGN (now_seg, frchainP); +#ifdef BFD_ASSEMBLER + if ((bfd_get_section_flags (now_seg->owner, now_seg) & SEC_MERGE) + && now_seg->entsize) + { + unsigned int entsize = now_seg->entsize; + int entalign = 0; + + while ((entsize & 1) == 0) + { + ++entalign; + entsize >>= 1; + } + if (entalign > alignment) + alignment = entalign; + } +#endif + } + + 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". 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); @@ -1394,7 +1462,7 @@ void write_object_file () { #if ! defined (BFD_ASSEMBLER) || ! defined (WORKING_DOT_WORD) - fragS *fragP; /* Track along all frags. */ + fragS *fragP; /* Track along all frags. */ #endif /* Do we really want to write it? */ @@ -1407,14 +1475,14 @@ write_object_file () if (flag_always_generate_output) { if (n_warns || n_errs) - as_warn (_("%d error%s, %d warning%s, generating bad object file.\n"), + as_warn (_("%d error%s, %d warning%s, generating bad object file"), n_errs, n_errs == 1 ? "" : "s", n_warns, n_warns == 1 ? "" : "s"); } else { if (n_errs) - as_fatal (_("%d error%s, %d warning%s, no object file generated.\n"), + as_fatal (_("%d error%s, %d warning%s, no object file generated"), n_errs, n_errs == 1 ? "" : "s", n_warns, n_warns == 1 ? "" : "s"); } @@ -1423,9 +1491,9 @@ write_object_file () #ifdef OBJ_VMS /* Under VMS we try to be compatible with VAX-11 "C". Thus, we call a routine to check for the definition of the procedure "_main", - and if so -- fix it up so that it can be program entry point. */ + and if so -- fix it up so that it can be program entry point. */ vms_check_for_main (); -#endif /* OBJ_VMS */ +#endif /* OBJ_VMS */ /* From now on, we don't care about sub-segments. Build one frag chain for each segment. Linked thru fr_next. */ @@ -1433,22 +1501,18 @@ write_object_file () #ifdef BFD_ASSEMBLER /* Remove the sections created by gas for its own purposes. */ { - asection **seclist, *sec; + asection **seclist; int i; seclist = &stdoutput->sections; - while (seclist && *seclist) + while (*seclist) { - sec = *seclist; - while (sec == reg_section || sec == expr_section) + if (*seclist == reg_section || *seclist == expr_section) { - sec = sec->next; - *seclist = sec; + bfd_section_list_remove (stdoutput, seclist); stdoutput->section_count--; - if (!sec) - break; } - if (*seclist) + else seclist = &(*seclist)->next; } i = 0; @@ -1473,33 +1537,75 @@ write_object_file () #endif #ifdef BFD_ASSEMBLER - bfd_map_over_sections (stdoutput, relax_and_size_seg, (char *) 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 + relax_seg). Since the broken word list is global, we do it + once per round, rather than locally in relax_segment for each + segment. */ + struct broken_word *brokp; + + for (brokp = broken_words; + brokp != (struct broken_word *) NULL; + brokp = brokp->next_broken_word) + { + brokp->added = 0; + + if (brokp->dispfrag != (fragS *) NULL + && brokp->dispfrag->fr_type == rs_broken_word) + brokp->dispfrag->fr_subtype = 0; + } +#endif + + changed = 0; + bfd_map_over_sections (stdoutput, relax_seg, &changed); + if (!changed) + break; + } + + /* Note - Most ports will use the default value of + TC_FINALIZE_SYMS_BEFORE_SIZE_SEG, which 1. This will force + local symbols to be resolved, removing their frag information. + Some ports however, will not have finished relaxing all of + their frags and will still need the local symbol frag + information. These ports can set + TC_FINALIZE_SYMS_BEFORE_SIZE_SEG to 0. */ + finalize_syms = TC_FINALIZE_SYMS_BEFORE_SIZE_SEG; + + bfd_map_over_sections (stdoutput, size_seg, (char *) 0); #else relax_and_size_all_segments (); -#endif /* BFD_ASSEMBLER */ +#endif /* BFD_ASSEMBLER */ + + /* Relaxation has completed. Freeze all syms. */ + finalize_syms = 1; + +#ifdef md_post_relax_hook + md_post_relax_hook; +#endif #ifndef BFD_ASSEMBLER - /* - * - * Crawl the symbol chain. - * - * For each symbol whose value depends on a frag, take the address of - * that frag and subsume it into the value of the symbol. - * After this, there is just one way to lookup a symbol value. - * Values are left in their final state for object file emission. - * We adjust the values of 'L' local symbols, even if we do - * not intend to emit them to the object file, because their values - * are needed for fix-ups. - * - * Unless we saw a -L flag, remove all symbols that begin with 'L' - * from the symbol chain. (They are still pointed to by the fixes.) - * - * Count the remaining symbols. - * Assign a symbol number to each symbol. - * Count the number of string-table chars we will emit. - * Put this info into the headers as appropriate. - * - */ + /* Crawl the symbol chain. + + For each symbol whose value depends on a frag, take the address of + that frag and subsume it into the value of the symbol. + After this, there is just one way to lookup a symbol value. + Values are left in their final state for object file emission. + We adjust the values of 'L' local symbols, even if we do + not intend to emit them to the object file, because their values + are needed for fix-ups. + + Unless we saw a -L flag, remove all symbols that begin with 'L' + from the symbol chain. (They are still pointed to by the fixes.) + + Count the remaining symbols. + Assign a symbol number to each symbol. + Count the number of string-table chars we will emit. + Put this info into the headers as appropriate. */ know (zero_address_frag.fr_address == 0); string_byte_count = sizeof (string_byte_count); @@ -1510,12 +1616,10 @@ write_object_file () H_SET_STRING_SIZE (&headers, string_byte_count); - /* - * Addresses of frags now reflect addresses we use in the object file. - * Symbol values are correct. - * Scan the frags, converting any ".org"s and ".align"s to ".fill"s. - * Also converting any machine-dependent frags using md_convert_frag(); - */ + /* Addresses of frags now reflect addresses we use in the object file. + Symbol values are correct. + Scan the frags, converting any ".org"s and ".align"s to ".fill"s. + Also converting any machine-dependent frags using md_convert_frag(); */ subseg_change (SEG_TEXT, 0); for (fragP = text_frag_root; fragP; fragP = fragP->fr_next) @@ -1535,12 +1639,12 @@ write_object_file () #ifdef OBJ_BOUT || fragP->fr_next == data_frag_root #endif - || ((fragP->fr_next->fr_address - fragP->fr_address) + || ((offsetT) (fragP->fr_next->fr_address - fragP->fr_address) == (fragP->fr_fix + fragP->fr_offset * fragP->fr_var)))) abort (); #endif } -#endif /* ! BFD_ASSEMBLER */ +#endif /* ! BFD_ASSEMBLER */ #ifndef WORKING_DOT_WORD { @@ -1561,8 +1665,8 @@ write_object_file () #ifdef BFD_ASSEMBLER #ifdef TC_CONS_FIX_NEW TC_CONS_FIX_NEW (lie->frag, - lie->word_goes_here - lie->frag->fr_literal, - 2, &exp); + lie->word_goes_here - lie->frag->fr_literal, + 2, &exp); #else fix_new_exp (lie->frag, lie->word_goes_here - lie->frag->fr_literal, @@ -1582,9 +1686,9 @@ write_object_file () fix_new_exp (lie->frag, lie->word_goes_here - lie->frag->fr_literal, 2, &exp, 0, 0); -#endif /* TC_NS32K */ -#endif /* TC_SPARC|TC_A29K|NEED_FX_R_TYPE */ -#endif /* BFD_ASSEMBLER */ +#endif /* TC_NS32K */ +#endif /* TC_SPARC|TC_A29K|NEED_FX_R_TYPE */ +#endif /* BFD_ASSEMBLER */ *prevP = lie->next_broken_word; } else @@ -1603,61 +1707,65 @@ write_object_file () /* Find out how many broken_words go here. */ n = 0; - for (untruth = lie; untruth && untruth->dispfrag == fragP; untruth = untruth->next_broken_word) + for (untruth = lie; + untruth && untruth->dispfrag == fragP; + untruth = untruth->next_broken_word) if (untruth->added == 1) n++; table_ptr = lie->dispfrag->fr_opcode; - table_addr = lie->dispfrag->fr_address + (table_ptr - lie->dispfrag->fr_literal); + table_addr = (lie->dispfrag->fr_address + + (table_ptr - lie->dispfrag->fr_literal)); /* Create the jump around the long jumps. This is a short jump from table_ptr+0 to table_ptr+n*long_jump_size. */ from_addr = table_addr; to_addr = table_addr + md_short_jump_size + n * md_long_jump_size; - md_create_short_jump (table_ptr, from_addr, to_addr, lie->dispfrag, lie->add); + md_create_short_jump (table_ptr, from_addr, to_addr, lie->dispfrag, + lie->add); table_ptr += md_short_jump_size; table_addr += md_short_jump_size; - for (m = 0; lie && lie->dispfrag == fragP; m++, lie = lie->next_broken_word) + for (m = 0; + lie && lie->dispfrag == fragP; + m++, lie = lie->next_broken_word) { if (lie->added == 2) continue; - /* Patch the jump table */ - /* This is the offset from ??? to table_ptr+0 */ + /* Patch the jump table. */ + /* This is the offset from ??? to table_ptr+0. */ to_addr = table_addr - S_GET_VALUE (lie->sub); -#ifdef BFD_ASSEMBLER - to_addr -= symbol_get_frag (lie->sub)->fr_address; +#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; untruth && untruth->dispfrag == fragP; untruth = untruth->next_broken_word) + for (untruth = lie->next_broken_word; + 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); } - /* Install the long jump */ - /* this is a long jump from table_ptr+0 to the final target */ + /* Install the long jump. */ + /* This is a long jump from table_ptr+0 to the final target. */ from_addr = table_addr; to_addr = S_GET_VALUE (lie->add) + lie->addnum; -#ifdef BFD_ASSEMBLER - to_addr += symbol_get_frag (lie->add)->fr_address; -#endif - md_create_long_jump (table_ptr, from_addr, to_addr, lie->dispfrag, lie->add); + md_create_long_jump (table_ptr, from_addr, to_addr, lie->dispfrag, + lie->add); table_ptr += md_long_jump_size; table_addr += md_long_jump_size; } } } -#endif /* not WORKING_DOT_WORD */ +#endif /* not WORKING_DOT_WORD */ #ifndef BFD_ASSEMBLER #ifndef OBJ_VMS - { /* not vms */ + { /* not vms */ char *the_object_file; long object_file_size; - /* - * Scan every FixS performing fixups. We had to wait until now to do - * this because md_convert_frag() may have made some fixSs. - */ + /* Scan every FixS performing fixups. We had to wait until now to + do this because md_convert_frag() may have made some fixSs. */ int trsize, drsize; subseg_change (SEG_TEXT, 0); @@ -1666,11 +1774,11 @@ write_object_file () drsize = md_reloc_size * fixup_segment (data_fix_root, SEG_DATA); H_SET_RELOCATION_SIZE (&headers, trsize, drsize); - /* FIXME move this stuff into the pre-write-hook */ + /* FIXME: Move this stuff into the pre-write-hook. */ H_SET_MAGIC_NUMBER (&headers, magic_number_for_object_file); H_SET_ENTRY_POINT (&headers, 0); - obj_pre_write_hook (&headers); /* extra coff stuff */ + obj_pre_write_hook (&headers); /* Extra coff stuff. */ object_file_size = H_GET_FILE_SIZE (&headers); next_object_file_charP = the_object_file = xmalloc (object_file_size); @@ -1679,11 +1787,10 @@ write_object_file () obj_header_append (&next_object_file_charP, &headers); - know ((next_object_file_charP - the_object_file) == H_GET_HEADER_SIZE (&headers)); + know ((next_object_file_charP - the_object_file) + == H_GET_HEADER_SIZE (&headers)); - /* - * Emit code. - */ + /* Emit code. */ for (fragP = text_frag_root; fragP; fragP = fragP->fr_next) { register long count; @@ -1692,78 +1799,91 @@ write_object_file () PROGRESS (1); know (fragP->fr_type == rs_fill); - append (&next_object_file_charP, fragP->fr_literal, (unsigned long) fragP->fr_fix); + append (&next_object_file_charP, fragP->fr_literal, + (unsigned long) fragP->fr_fix); fill_literal = fragP->fr_literal + fragP->fr_fix; fill_size = fragP->fr_var; know (fragP->fr_offset >= 0); for (count = fragP->fr_offset; count; count--) - { - append (&next_object_file_charP, fill_literal, (unsigned long) fill_size); - } /* for each */ - - } /* for each code frag. */ - - know ((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE (&headers) + H_GET_TEXT_SIZE (&headers) + H_GET_DATA_SIZE (&headers))); + append (&next_object_file_charP, fill_literal, + (unsigned long) fill_size); + } - /* - * Emit relocations. - */ - obj_emit_relocations (&next_object_file_charP, text_fix_root, (relax_addressT) 0); - know ((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE (&headers) + H_GET_TEXT_SIZE (&headers) + H_GET_DATA_SIZE (&headers) + H_GET_TEXT_RELOCATION_SIZE (&headers))); + know ((next_object_file_charP - the_object_file) + == (H_GET_HEADER_SIZE (&headers) + + H_GET_TEXT_SIZE (&headers) + + H_GET_DATA_SIZE (&headers))); + + /* Emit relocations. */ + obj_emit_relocations (&next_object_file_charP, text_fix_root, + (relax_addressT) 0); + know ((next_object_file_charP - the_object_file) + == (H_GET_HEADER_SIZE (&headers) + + H_GET_TEXT_SIZE (&headers) + + H_GET_DATA_SIZE (&headers) + + H_GET_TEXT_RELOCATION_SIZE (&headers))); #ifdef TC_I960 /* Make addresses in data relocation directives relative to beginning of - * first data fragment, not end of last text fragment: alignment of the - * start of the data segment may place a gap between the segments. - */ - obj_emit_relocations (&next_object_file_charP, data_fix_root, data0_frchainP->frch_root->fr_address); -#else /* TC_I960 */ - obj_emit_relocations (&next_object_file_charP, data_fix_root, text_last_frag->fr_address); -#endif /* TC_I960 */ - - know ((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE (&headers) + H_GET_TEXT_SIZE (&headers) + H_GET_DATA_SIZE (&headers) + H_GET_TEXT_RELOCATION_SIZE (&headers) + H_GET_DATA_RELOCATION_SIZE (&headers))); - - /* - * Emit line number entries. - */ + first data fragment, not end of last text fragment: alignment of the + start of the data segment may place a gap between the segments. */ + obj_emit_relocations (&next_object_file_charP, data_fix_root, + data0_frchainP->frch_root->fr_address); +#else /* TC_I960 */ + obj_emit_relocations (&next_object_file_charP, data_fix_root, + text_last_frag->fr_address); +#endif /* TC_I960 */ + + know ((next_object_file_charP - the_object_file) + == (H_GET_HEADER_SIZE (&headers) + + H_GET_TEXT_SIZE (&headers) + + H_GET_DATA_SIZE (&headers) + + H_GET_TEXT_RELOCATION_SIZE (&headers) + + H_GET_DATA_RELOCATION_SIZE (&headers))); + + /* Emit line number entries. */ OBJ_EMIT_LINENO (&next_object_file_charP, lineno_rootP, the_object_file); - know ((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE (&headers) + H_GET_TEXT_SIZE (&headers) + H_GET_DATA_SIZE (&headers) + H_GET_TEXT_RELOCATION_SIZE (&headers) + H_GET_DATA_RELOCATION_SIZE (&headers) + H_GET_LINENO_SIZE (&headers))); - - /* - * Emit symbols. - */ + know ((next_object_file_charP - the_object_file) + == (H_GET_HEADER_SIZE (&headers) + + H_GET_TEXT_SIZE (&headers) + + H_GET_DATA_SIZE (&headers) + + H_GET_TEXT_RELOCATION_SIZE (&headers) + + H_GET_DATA_RELOCATION_SIZE (&headers) + + H_GET_LINENO_SIZE (&headers))); + + /* Emit symbols. */ obj_emit_symbols (&next_object_file_charP, symbol_rootP); - know ((next_object_file_charP - the_object_file) == (H_GET_HEADER_SIZE (&headers) + H_GET_TEXT_SIZE (&headers) + H_GET_DATA_SIZE (&headers) + H_GET_TEXT_RELOCATION_SIZE (&headers) + H_GET_DATA_RELOCATION_SIZE (&headers) + H_GET_LINENO_SIZE (&headers) + H_GET_SYMBOL_TABLE_SIZE (&headers))); - - /* - * Emit strings. - */ - + know ((next_object_file_charP - the_object_file) + == (H_GET_HEADER_SIZE (&headers) + + H_GET_TEXT_SIZE (&headers) + + H_GET_DATA_SIZE (&headers) + + H_GET_TEXT_RELOCATION_SIZE (&headers) + + H_GET_DATA_RELOCATION_SIZE (&headers) + + H_GET_LINENO_SIZE (&headers) + + H_GET_SYMBOL_TABLE_SIZE (&headers))); + + /* Emit strings. */ if (string_byte_count > 0) - { - obj_emit_strings (&next_object_file_charP); - } /* only if we have a string table */ + obj_emit_strings (&next_object_file_charP); #ifdef BFD_HEADERS - bfd_seek (stdoutput, 0, 0); - bfd_write (the_object_file, 1, object_file_size, stdoutput); + bfd_seek (stdoutput, (file_ptr) 0, 0); + bfd_bwrite (the_object_file, (bfd_size_type) object_file_size, stdoutput); #else - /* Write the data to the file */ + /* Write the data to the file. */ output_file_append (the_object_file, object_file_size, out_file_name); free (the_object_file); #endif - } /* non vms output */ -#else /* OBJ_VMS */ - /* - * Now do the VMS-dependent part of writing the object file - */ + } +#else /* OBJ_VMS */ + /* Now do the VMS-dependent part of writing the object file. */ vms_write_object_file (H_GET_TEXT_SIZE (&headers), H_GET_DATA_SIZE (&headers), H_GET_BSS_SIZE (&headers), text_frag_root, data_frag_root); -#endif /* OBJ_VMS */ -#else /* BFD_ASSEMBLER */ +#endif /* OBJ_VMS */ +#else /* BFD_ASSEMBLER */ /* Resolve symbol values. This needs to be done before processing the relocations. */ @@ -1772,7 +1892,7 @@ write_object_file () symbolS *symp; for (symp = symbol_rootP; symp; symp = symbol_next (symp)) - resolve_symbol_value (symp, 1); + resolve_symbol_value (symp); } resolve_local_symbol_values (); @@ -1785,7 +1905,16 @@ write_object_file () obj_frob_file_before_adjust (); #endif - bfd_map_over_sections (stdoutput, adjust_reloc_syms, (char *)0); + bfd_map_over_sections (stdoutput, adjust_reloc_syms, (char *) 0); + +#ifdef tc_frob_file_before_fix + tc_frob_file_before_fix (); +#endif +#ifdef obj_frob_file_before_fix + obj_frob_file_before_fix (); +#endif + + bfd_map_over_sections (stdoutput, fix_segment, (char *) 0); /* Set up symbol table, and write it out. */ if (symbol_rootP) @@ -1809,22 +1938,22 @@ write_object_file () name = S_GET_NAME (symp); if (name) { - const char *name2 = decode_local_label_name ((char *)S_GET_NAME (symp)); + const char *name2 = + decode_local_label_name ((char *) S_GET_NAME (symp)); /* They only differ if `name' is a fb or dollar local label name. */ if (name2 != name && ! S_IS_DEFINED (symp)) - as_bad (_("local label %s is not defined"), name2); + as_bad (_("local label `%s' is not defined"), name2); } /* Do it again, because adjust_reloc_syms might introduce more symbols. They'll probably only be section symbols, but they'll still need to have the values computed. */ - resolve_symbol_value (symp, 1); + resolve_symbol_value (symp); /* Skip symbols which were equated to undefined or common symbols. */ - if (symbol_equated_p (symp) - && (! S_IS_DEFINED (symp) || S_IS_COMMON (symp))) + if (symbol_equated_reloc_p (symp)) { symbol_remove (symp, &symbol_rootP, &symbol_lastP); continue; @@ -1856,27 +1985,28 @@ write_object_file () want section symbols. Otherwise, we skip local symbols and symbols that the frob_symbol macros told us to punt, but we keep such symbols if they are used in relocs. */ - if ((! EMIT_SECTION_SYMBOLS - && symbol_section_p (symp)) + if (symp == abs_section_sym + || (! EMIT_SECTION_SYMBOLS + && symbol_section_p (symp)) /* Note that S_IS_EXTERN and S_IS_LOCAL are not always opposites. Sometimes the former checks flags and the latter examines the name... */ || (!S_IS_EXTERN (symp) - && (S_IS_LOCAL (symp) || punt) + && (punt || S_IS_LOCAL (symp)) && ! symbol_used_in_reloc_p (symp))) { symbol_remove (symp, &symbol_rootP, &symbol_lastP); + /* After symbol_remove, symbol_next(symp) still returns the one that came after it in the chain. So we don't need to do any extra cleanup work here. */ - continue; } /* Make sure we really got a value for the symbol. */ if (! symbol_resolved_p (symp)) { - as_bad (_("can't resolve value for symbol \"%s\""), + as_bad (_("can't resolve value for symbol `%s'"), S_GET_NAME (symp)); symbol_mark_resolved (symp); } @@ -1923,43 +2053,17 @@ write_object_file () #endif bfd_map_over_sections (stdoutput, write_contents, (char *) 0); -#endif /* BFD_ASSEMBLER */ +#endif /* BFD_ASSEMBLER */ } -#endif /* ! BFD */ - -/* - * relax_segment() - * - * Now we have a segment, not a crowd of sub-segments, we can make fr_address - * values. - * - * Relax the frags. - * - * After this, all frags in this segment have addresses that are correct - * within the segment. Since segments live in different file addresses, - * these frag addresses may not be the same as final object-file addresses. - */ +#endif /* ! BFD */ #ifdef TC_GENERIC_RELAX_TABLE -static int is_dnrange PARAMS ((fragS *, fragS *)); - -/* Subroutines of relax_segment. */ -static int -is_dnrange (f1, f2) - fragS *f1; - fragS *f2; -{ - for (; f1; f1 = f1->fr_next) - if (f1->fr_next == f2) - return 1; - return 0; -} - /* Relax a fragment by scanning TC_GENERIC_RELAX_TABLE. */ long -relax_frag (fragP, stretch) +relax_frag (segment, fragP, stretch) + segT segment; fragS *fragP; long stretch; { @@ -1967,20 +2071,26 @@ relax_frag (fragP, stretch) const relax_typeS *start_type; relax_substateT next_state; relax_substateT this_state; - long aim, target, growth; - symbolS *symbolP = fragP->fr_symbol; - long offset = fragP->fr_offset; - /* Recompute was_address by undoing "+= stretch" done by relax_segment. */ - unsigned long was_address = fragP->fr_address - stretch; - unsigned long address = fragP->fr_address; - const relax_typeS *table = TC_GENERIC_RELAX_TABLE; - + long growth; + offsetT aim; + addressT target; + addressT address; + symbolS *symbolP; + const relax_typeS *table; + + target = fragP->fr_offset; + address = fragP->fr_address; + table = TC_GENERIC_RELAX_TABLE; this_state = fragP->fr_subtype; start_type = this_type = table + this_state; - target = offset; + symbolP = fragP->fr_symbol; if (symbolP) { + fragS *sym_frag; + + sym_frag = symbol_get_frag (symbolP); + #ifndef DIFF_EXPR_OK #if !defined (MANY_SEGMENTS) && !defined (BFD_ASSEMBLER) know ((S_GET_SEGMENT (symbolP) == SEG_ABSOLUTE) @@ -1988,23 +2098,20 @@ relax_frag (fragP, stretch) || (S_GET_SEGMENT (symbolP) == SEG_BSS) || (S_GET_SEGMENT (symbolP) == SEG_TEXT)); #endif - know (symbolP->sy_frag); + know (sym_frag != NULL); #endif - know (!(S_GET_SEGMENT (symbolP) == absolute_section) - || symbolP->sy_frag == &zero_address_frag); - target += S_GET_VALUE (symbolP) + symbol_get_frag (symbolP)->fr_address; + know (S_GET_SEGMENT (symbolP) != absolute_section + || sym_frag == &zero_address_frag); + target += S_GET_VALUE (symbolP); /* If frag has yet to be reached on this pass, assume it will move by STRETCH just as we did. If this is not so, it will be because some frag - between grows, and that will force another pass. - - Beware zero-length frags. + between grows, and that will force another pass. */ - There should be a faster way to do this. */ - - if (symbol_get_frag (symbolP)->fr_address >= was_address - && is_dnrange (fragP, symbol_get_frag (symbolP))) + if (stretch != 0 + && sym_frag->relax_marker != fragP->relax_marker + && S_GET_SEGMENT (symbolP) == segment) { target += stretch; } @@ -2012,26 +2119,28 @@ relax_frag (fragP, stretch) aim = target - address - fragP->fr_fix; #ifdef TC_PCREL_ADJUST - /* Currently only the ns32k family needs this */ - aim += TC_PCREL_ADJUST(fragP); -/*#else*/ + /* Currently only the ns32k family needs this. */ + aim += TC_PCREL_ADJUST (fragP); +/* #else */ /* This machine doesn't want to use pcrel_adjust. In that case, pcrel_adjust should be zero. */ -/* assert (fragP->fr_targ.ns32k.pcrel_adjust == 0);*/ +#if 0 + assert (fragP->fr_targ.ns32k.pcrel_adjust == 0); +#endif #endif -#ifdef md_prepare_relax_scan /* formerly called M68K_AIM_KLUDGE */ +#ifdef md_prepare_relax_scan /* formerly called M68K_AIM_KLUDGE */ md_prepare_relax_scan (fragP, address, aim, this_state, this_type); #endif if (aim < 0) { - /* Look backwards. */ + /* Look backwards. */ for (next_state = this_type->rlx_more; next_state;) if (aim >= this_type->rlx_backward) next_state = 0; else { - /* Grow to next state. */ + /* Grow to next state. */ this_state = next_state; this_type = table + this_state; next_state = this_type->rlx_more; @@ -2039,13 +2148,13 @@ relax_frag (fragP, stretch) } else { - /* Look forwards. */ + /* Look forwards. */ for (next_state = this_type->rlx_more; next_state;) if (aim <= this_type->rlx_forward) next_state = 0; else { - /* Grow to next state. */ + /* Grow to next state. */ this_state = next_state; this_type = table + this_state; next_state = this_type->rlx_more; @@ -2058,14 +2167,14 @@ relax_frag (fragP, stretch) return growth; } -#endif /* defined (TC_GENERIC_RELAX_TABLE) */ +#endif /* defined (TC_GENERIC_RELAX_TABLE) */ /* Relax_align. Advance location counter to next address that has 'alignment' lowest order bits all 0s, return size of adjustment made. */ static relax_addressT relax_align (address, alignment) - register relax_addressT address; /* Address now. */ - register int alignment; /* Alignment (binary). */ + register relax_addressT address; /* Address now. */ + register int alignment; /* Alignment (binary). */ { relax_addressT mask; relax_addressT new_address; @@ -2081,17 +2190,29 @@ relax_align (address, alignment) return (new_address - address); } -void +/* Now we have a segment, not a crowd of sub-segments, we can make + fr_address values. + + Relax the frags. + + After this, all frags in this segment have addresses that are correct + within the segment. Since segments live in different file addresses, + these frag addresses may not be the same as final object-file + addresses. */ + +int relax_segment (segment_frag_root, segment) struct frag *segment_frag_root; segT segment; { register struct frag *fragP; register relax_addressT address; + int ret; + #if !defined (MANY_SEGMENTS) && !defined (BFD_ASSEMBLER) know (segment == SEG_DATA || segment == SEG_TEXT || segment == SEG_BSS); #endif - /* In case md_estimate_size_before_relax() wants to make fixSs. */ + /* In case md_estimate_size_before_relax() wants to make fixSs. */ subseg_change (segment, 0); /* For each frag in segment: count and store (a 1st guess of) @@ -2099,6 +2220,7 @@ relax_segment (segment_frag_root, segment) address = 0; for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) { + fragP->relax_marker = 0; fragP->fr_address = address; address += fragP->fr_fix; @@ -2110,6 +2232,7 @@ relax_segment (segment_frag_root, segment) case rs_align: case rs_align_code: + case rs_align_test: { addressT offset = relax_align (address, (int) fragP->fr_offset); @@ -2118,8 +2241,9 @@ relax_segment (segment_frag_root, segment) if (offset % fragP->fr_var != 0) { - as_bad (_("alignment padding (%lu bytes) not a multiple of %ld"), - (unsigned long) offset, (long) fragP->fr_var); + as_bad_where (fragP->fr_file, fragP->fr_line, + _("alignment padding (%lu bytes) not a multiple of %ld"), + (unsigned long) offset, (long) fragP->fr_var); offset -= (offset % fragP->fr_var); } @@ -2133,17 +2257,23 @@ relax_segment (segment_frag_root, segment) break; case rs_machine_dependent: + /* If fr_symbol is an expression, this call to + resolve_symbol_value sets up the correct segment, which will + likely be needed in md_estimate_size_before_relax. */ + if (fragP->fr_symbol) + resolve_symbol_value (fragP->fr_symbol); + address += md_estimate_size_before_relax (fragP, segment); break; #ifndef WORKING_DOT_WORD - /* Broken words don't concern us yet */ + /* Broken words don't concern us yet. */ case rs_broken_word: break; #endif case rs_leb128: - /* Initial guess is always 1; doing otherwise can result in + /* Initial guess is always 1; doing otherwise can result in stable solutions that are larger than the minimum. */ address += fragP->fr_offset = 1; break; @@ -2152,26 +2282,31 @@ relax_segment (segment_frag_root, segment) address += eh_frame_estimate_size_before_relax (fragP); break; + case rs_dwarf2dbg: + address += dwarf2dbg_estimate_size_before_relax (fragP); + break; + default: BAD_CASE (fragP->fr_type); break; - } /* switch(fr_type) */ - } /* for each frag in the segment */ + } + } /* Do relax(). */ { - long 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. */ - long stretched; /* Have we stretched on this pass? */ + long 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. */ do { - stretch = stretched = 0; + stretch = 0; + stretched = 0; + for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) { long growth = 0; @@ -2179,6 +2314,7 @@ relax_segment (segment_frag_root, segment) offsetT offset; symbolS *symbolP; + fragP->relax_marker ^= 1; was_address = fragP->fr_address; address = fragP->fr_address += stretch; symbolP = fragP->fr_symbol; @@ -2186,7 +2322,7 @@ relax_segment (segment_frag_root, segment) switch (fragP->fr_type) { - case rs_fill: /* .fill never relaxes. */ + case rs_fill: /* .fill never relaxes. */ growth = 0; break; @@ -2213,21 +2349,20 @@ relax_segment (segment_frag_root, segment) if (lie->added) continue; - offset = (symbol_get_frag (lie->add)->fr_address - + S_GET_VALUE (lie->add) + offset = (S_GET_VALUE (lie->add) + lie->addnum - - (symbol_get_frag (lie->sub)->fr_address - + S_GET_VALUE (lie->sub))); + - S_GET_VALUE (lie->sub)); if (offset <= -32768 || offset >= 32767) { if (flag_warn_displacement) { char buf[50]; sprint_value (buf, (addressT) lie->addnum); - as_warn (_(".word %s-%s+%s didn't fit"), - S_GET_NAME (lie->add), - S_GET_NAME (lie->sub), - buf); + as_warn_where (fragP->fr_file, fragP->fr_line, + _(".word %s-%s+%s didn't fit"), + S_GET_NAME (lie->add), + S_GET_NAME (lie->sub), + buf); } lie->added = 1; if (fragP->fr_subtype == 0) @@ -2251,10 +2386,11 @@ relax_segment (segment_frag_root, segment) } break; - } /* case rs_broken_word */ + } /* case rs_broken_word */ #endif case rs_align: case rs_align_code: + case rs_align_test: { addressT oldoff, newoff; @@ -2277,8 +2413,8 @@ relax_segment (segment_frag_root, segment) case rs_org: { - long target = offset; - long after; + addressT target = offset; + addressT after; if (symbolP) { @@ -2291,9 +2427,13 @@ relax_segment (segment_frag_root, segment) know (!(S_GET_SEGMENT (symbolP) == SEG_ABSOLUTE) || (symbolP->sy_frag == &zero_address_frag)); #endif - target += (S_GET_VALUE (symbolP) - + symbol_get_frag (symbolP)->fr_address); - } /* if we have a symbol */ + /* 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_SECTION (symbolP)->vma == 0); + target += S_GET_VALUE (symbolP) * OCTETS_PER_BYTE; + } know (fragP->fr_next); after = fragP->fr_next->fr_address; @@ -2302,9 +2442,9 @@ relax_segment (segment_frag_root, segment) { /* Growth may be negative, but variable part of frag cannot have fewer than 0 chars. That is, we can't - .org backwards. */ + .org backwards. */ as_bad_where (fragP->fr_file, fragP->fr_line, - _("attempt to .org backwards ignored")); + _("attempt to .org backwards")); /* We've issued an error message. Change the frag to avoid cascading errors. */ @@ -2315,39 +2455,48 @@ relax_segment (segment_frag_root, segment) growth = stretch; } - growth -= stretch; /* This is an absolute growth factor */ + /* This is an absolute growth factor */ + growth -= stretch; break; } case rs_space: + growth = 0; if (symbolP) { - growth = S_GET_VALUE (symbolP); - if (symbol_get_frag (symbolP) != &zero_address_frag + offsetT amount; + + amount = S_GET_VALUE (symbolP); + if (S_GET_SEGMENT (symbolP) != absolute_section || S_IS_COMMON (symbolP) || ! S_IS_DEFINED (symbolP)) - as_bad_where (fragP->fr_file, fragP->fr_line, - _(".space specifies non-absolute value")); - fragP->fr_symbol = 0; - if (growth < 0) { - as_warn (_(".space or .fill with negative value, ignored")); - growth = 0; + as_bad_where (fragP->fr_file, fragP->fr_line, + _(".space specifies non-absolute value")); + /* Prevent repeat of this error message. */ + fragP->fr_symbol = 0; + } + else if (amount < 0) + { + as_warn_where (fragP->fr_file, fragP->fr_line, + _(".space or .fill with negative value, ignored")); + fragP->fr_symbol = 0; } + else + growth = (was_address + fragP->fr_fix + amount + - fragP->fr_next->fr_address); } - else - growth = 0; break; case rs_machine_dependent: #ifdef md_relax_frag - growth = md_relax_frag (fragP, stretch); + growth = md_relax_frag (segment, fragP, stretch); #else #ifdef TC_GENERIC_RELAX_TABLE /* The default way to relax a frag is to look through TC_GENERIC_RELAX_TABLE. */ - growth = relax_frag (fragP, stretch); -#endif /* TC_GENERIC_RELAX_TABLE */ + growth = relax_frag (segment, fragP, stretch); +#endif /* TC_GENERIC_RELAX_TABLE */ #endif break; @@ -2356,7 +2505,7 @@ relax_segment (segment_frag_root, segment) valueT value; int size; - value = resolve_symbol_value (fragP->fr_symbol, 0); + value = resolve_symbol_value (fragP->fr_symbol); size = sizeof_leb128 (value, fragP->fr_subtype); growth = size - fragP->fr_offset; fragP->fr_offset = size; @@ -2367,6 +2516,10 @@ relax_segment (segment_frag_root, segment) growth = eh_frame_relax_frag (fragP); break; + case rs_dwarf2dbg: + growth = dwarf2dbg_relax_frag (fragP); + break; + default: BAD_CASE (fragP->fr_type); break; @@ -2374,408 +2527,267 @@ relax_segment (segment_frag_root, segment) if (growth) { stretch += growth; - stretched++; + stretched = 1; } - } /* For each frag in the segment. */ + } /* For each frag in the segment. */ } - while (stretched); /* Until nothing further to relax. */ - } /* do_relax */ + while (stretched); /* Until nothing further to relax. */ + } /* do_relax */ - /* - * We now have valid fr_address'es for each frag. - */ - - /* - * All fr_address's are correct, relative to their own segment. - * We have made all the fixS we will ever make. - */ -} /* relax_segment() */ + ret = 0; + for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) + if (fragP->last_fr_address != fragP->fr_address) + { + fragP->last_fr_address = fragP->fr_address; + ret = 1; + } + return ret; +} #if defined (BFD_ASSEMBLER) || (!defined (BFD) && !defined (OBJ_VMS)) -#ifndef TC_RELOC_RTSYM_LOC_FIXUP -#define TC_RELOC_RTSYM_LOC_FIXUP(X) (1) -#endif - /* 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. + For each one, call md_apply_fix3 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 (fixP, this_segment_type) - register fixS *fixP; - segT this_segment_type; /* N_TYPE bits for segment. */ +fixup_segment (fixP, this_segment) + fixS *fixP; + segT this_segment; { long seg_reloc_count = 0; - symbolS *add_symbolP; - symbolS *sub_symbolP; valueT add_number; - int size; - char *place; - long where; - int pcrel, plt; fragS *fragP; segT add_symbol_segment = absolute_section; + if (fixP != NULL && abs_section_sym == NULL) + { +#ifndef BFD_ASSEMBLER + abs_section_sym = &abs_symbol; +#else + abs_section_sym = section_symbol (absolute_section); +#endif + } + /* 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 (the only machine for which we've got a relaxing linker right now), - we might be able to turn callx/callj into bal anyways in cases where we - know the maximum displacement. */ - if (linkrelax) + 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) - seg_reloc_count++; + 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); - where = fixP->fx_where; - place = fragP->fr_literal + where; - size = fixP->fx_size; - add_symbolP = fixP->fx_addsy; #ifdef TC_VALIDATE_FIX - TC_VALIDATE_FIX (fixP, this_segment_type, skip); + TC_VALIDATE_FIX (fixP, this_segment, skip); #endif - sub_symbolP = fixP->fx_subsy; add_number = fixP->fx_offset; - pcrel = fixP->fx_pcrel; - plt = fixP->fx_plt; - if (add_symbolP != NULL - && symbol_mri_common_p (add_symbolP)) + if (fixP->fx_addsy != NULL + && symbol_mri_common_p (fixP->fx_addsy)) { - know (add_symbolP->sy_value.X_op == O_symbol); - add_number += S_GET_VALUE (add_symbolP); + know (fixP->fx_addsy->sy_value.X_op == O_symbol); + add_number += S_GET_VALUE (fixP->fx_addsy); fixP->fx_offset = add_number; - add_symbolP = fixP->fx_addsy = - symbol_get_value_expression (add_symbolP)->X_add_symbol; + fixP->fx_addsy + = symbol_get_value_expression (fixP->fx_addsy)->X_add_symbol; } - if (add_symbolP) - add_symbol_segment = S_GET_SEGMENT (add_symbolP); + if (fixP->fx_addsy != NULL) + add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy); - if (sub_symbolP) + if (fixP->fx_subsy != NULL) { - resolve_symbol_value (sub_symbolP, 1); - if (add_symbolP == NULL || add_symbol_segment == absolute_section) + 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)) { - if (add_symbolP != NULL) - { - add_number += S_GET_VALUE (add_symbolP); - add_symbolP = NULL; - fixP->fx_addsy = NULL; - } - - /* It's just -sym */ - if (S_GET_SEGMENT (sub_symbolP) == absolute_section) - { - add_number -= S_GET_VALUE (sub_symbolP); - fixP->fx_subsy = NULL; - } - else if (pcrel - && S_GET_SEGMENT (sub_symbolP) == this_segment_type) - { - /* Should try converting to a constant. */ - goto bad_sub_reloc; - } - else - bad_sub_reloc: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("Negative of non-absolute symbol %s"), - S_GET_NAME (sub_symbolP)); + add_number += S_GET_VALUE (fixP->fx_addsy); + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = add_number; + /* If the back-end code has selected a pc-relative + reloc, adjust the value to be pc-relative. */ + if (1 +#ifdef TC_M68K + /* See the comment below about 68k weirdness. */ + && 0 +#endif + && fixP->fx_pcrel) + add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); + fixP->fx_addsy = NULL; + fixP->fx_subsy = NULL; + fixP->fx_pcrel = 0; } - else if (S_GET_SEGMENT (sub_symbolP) == add_symbol_segment - && SEG_NORMAL (add_symbol_segment)) + else if (sub_symbol_segment == absolute_section + && !TC_FORCE_RELOCATION_SUB_ABS (fixP)) { - /* Difference of 2 symbols from same segment. - Can't make difference of 2 undefineds: 'value' means - something different for N_UNDF. */ -#ifdef TC_I960 - /* Makes no sense to use the difference of 2 arbitrary symbols - as the target of a call instruction. */ - if (fixP->fx_tcbit) - as_bad_where (fixP->fx_file, fixP->fx_line, - _("callj to difference of 2 symbols")); -#endif /* TC_I960 */ - add_number += S_GET_VALUE (add_symbolP) - - S_GET_VALUE (sub_symbolP); - - add_symbolP = NULL; - pcrel = 0; /* No further pcrel processing. */ - - /* Let the target machine make the final determination - as to whether or not a relocation will be needed to - handle this fixup. */ - if (!TC_FORCE_RELOCATION_SECTION (fixP, this_segment_type)) - { - fixP->fx_pcrel = 0; - fixP->fx_addsy = NULL; - fixP->fx_subsy = NULL; - } + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = add_number; + fixP->fx_subsy = NULL; } - else + else if (sub_symbol_segment == this_segment + && !TC_FORCE_RELOCATION_SUB_LOCAL (fixP)) { - /* Different segments in subtraction. */ - know (!(S_IS_EXTERNAL (sub_symbolP) - && (S_GET_SEGMENT (sub_symbolP) == absolute_section))); - - if ((S_GET_SEGMENT (sub_symbolP) == absolute_section)) - add_number -= S_GET_VALUE (sub_symbolP); - -#ifdef DIFF_EXPR_OK - else if (S_GET_SEGMENT (sub_symbolP) == this_segment_type -#if 0 /* Do this even if it's already described as pc-relative. For example, - on the m68k, an operand of "pc@(foo-.-2)" should address "foo" in a - pc-relative mode. */ - && pcrel -#endif - ) - { - /* Make it pc-relative. */ - add_number += (MD_PCREL_FROM_SECTION (fixP, this_segment_type) - - S_GET_VALUE (sub_symbolP)); - pcrel = 1; - fixP->fx_pcrel = 1; - sub_symbolP = 0; - fixP->fx_subsy = 0; - } -#endif -#ifdef UNDEFINED_DIFFERENCE_OK - /* The PA needs this for PIC code generation. We basically - don't want to do anything if we have the difference of two - symbols at this point. */ - else if (1) - { - /* Leave it alone. */ - } -#endif -#ifdef BFD_ASSEMBLER - else if (fixP->fx_r_type == BFD_RELOC_GPREL32 - || fixP->fx_r_type == BFD_RELOC_GPREL16) - { - /* Leave it alone. */ - } -#endif - else - { - char buf[50]; - sprint_value (buf, fragP->fr_address + where); - as_bad_where (fixP->fx_file, fixP->fx_line, - _("Subtraction of two symbols in different sections \"%s\" {%s section} - \"%s\" {%s section} at file address %s."), - S_GET_NAME (add_symbolP), - segment_name (S_GET_SEGMENT (add_symbolP)), - S_GET_NAME (sub_symbolP), - segment_name (S_GET_SEGMENT (sub_symbolP)), - buf); - } + 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 (add_symbolP) + if (fixP->fx_addsy) { - if (add_symbol_segment == this_segment_type && pcrel && !plt - && TC_RELOC_RTSYM_LOC_FIXUP (fixP)) + 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. - */ -#ifdef TC_I960 - /* reloc_callj() may replace a 'call' with a 'calls' or a - 'bal', in which cases it modifies *fixP as appropriate. - In the case of a 'calls', no further work is required, - and *fixP has been set up to make the rest of the code - below a no-op. */ - reloc_callj (fixP); -#endif /* TC_I960 */ - - add_number += S_GET_VALUE (add_symbolP); - add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment_type); - pcrel = 0; /* Lie. Don't want further pcrel processing. */ - - /* Let the target machine make the final determination - as to whether or not a relocation will be needed to - handle this fixup. */ - if (!TC_FORCE_RELOCATION (fixP)) - { - fixP->fx_pcrel = 0; - fixP->fx_addsy = NULL; - } + /* 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 + else if (add_symbol_segment == absolute_section + && !TC_FORCE_RELOCATION_ABS (fixP)) { - if (add_symbol_segment == absolute_section - && ! pcrel) - { -#ifdef TC_I960 - /* See comment about reloc_callj() above. */ - reloc_callj (fixP); -#endif /* TC_I960 */ - add_number += S_GET_VALUE (add_symbolP); - - /* Let the target machine make the final determination - as to whether or not a relocation will be needed to - handle this fixup. */ - - if (!TC_FORCE_RELOCATION (fixP)) - { - fixP->fx_addsy = NULL; - add_symbolP = NULL; - } - } - else if (add_symbol_segment == undefined_section + add_number += S_GET_VALUE (fixP->fx_addsy); + fixP->fx_offset = add_number; + fixP->fx_addsy = NULL; + } + else if (add_symbol_segment != undefined_section #ifdef BFD_ASSEMBLER - || bfd_is_com_section (add_symbol_segment) + && ! bfd_is_com_section (add_symbol_segment) #endif - ) - { -#ifdef TC_I960 - if ((int) fixP->fx_bit_fixP == 13) - { - /* This is a COBR instruction. They have only a - * 13-bit displacement and are only to be used - * for local branches: flag as error, don't generate - * relocation. - */ - as_bad_where (fixP->fx_file, fixP->fx_line, - _("can't use COBR format with external label")); - fixP->fx_addsy = NULL; - fixP->fx_done = 1; - continue; - } /* COBR */ -#endif /* TC_I960 */ - -#ifdef OBJ_COFF -#ifdef TE_I386AIX - if (S_IS_COMMON (add_symbolP)) - add_number += S_GET_VALUE (add_symbolP); -#endif /* TE_I386AIX */ -#endif /* OBJ_COFF */ - ++seg_reloc_count; - } - else - { - seg_reloc_count++; -#if !(defined (TC_V850) && defined (OBJ_ELF)) -#if !(defined (TC_M68K) && defined (OBJ_ELF)) -#if !(defined (TC_ARM) && defined (OBJ_ELF)) -#if !(defined (TC_I960) && defined (OBJ_ELF)) -#if !defined (TC_I386) || !(defined (OBJ_ELF) || defined (OBJ_COFF)) || defined (TE_PE) - add_number += S_GET_VALUE (add_symbolP); -#endif -#endif -#endif -#endif -#endif - } - } + && MD_APPLY_SYM_VALUE (fixP)) + add_number += S_GET_VALUE (fixP->fx_addsy); } - if (pcrel) + if (fixP->fx_pcrel) { - add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment_type); - if (add_symbolP == 0) + add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); + if (!fixP->fx_done && fixP->fx_addsy == NULL) { -#ifndef BFD_ASSEMBLER - fixP->fx_addsy = &abs_symbol; -#else - fixP->fx_addsy = section_symbol (absolute_section); -#endif - symbol_mark_used_in_reloc (fixP->fx_addsy); - ++seg_reloc_count; + /* 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) - { -#ifdef MD_APPLY_FIX3 - md_apply_fix3 (fixP, &add_number, this_segment_type); -#else -#ifdef BFD_ASSEMBLER - md_apply_fix (fixP, &add_number); -#else - md_apply_fix (fixP, add_number); -#endif -#endif + md_apply_fix3 (fixP, &add_number, this_segment); -#ifndef TC_HANDLES_FX_DONE - /* If the tc-* files haven't been converted, assume it's handling - it the old way, where a null fx_addsy means that the fix has - been applied completely, and no further work is needed. */ - if (fixP->fx_addsy == 0 && fixP->fx_pcrel == 0) - fixP->fx_done = 1; -#endif + 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 && size > 0) + if (!fixP->fx_bit_fixP && !fixP->fx_no_overflow && fixP->fx_size != 0) { - if ((size_t) size < sizeof (valueT)) + if (fixP->fx_size < sizeof (valueT)) { - valueT mask, hibit; + valueT mask; - /* set all bits to one */ mask = 0; - mask--; - /* Technically, combining these produces an undefined result - if size is sizeof (valueT), though I think these two - half-way operations should both be defined. And the - compiler should be able to combine them if it's valid on - the host architecture. */ - mask <<= size * 4; - mask <<= size * 4; - hibit = (valueT) 1 << (size * 8 - 1); - if (((add_number & mask) != 0 - || (fixP->fx_signed - && (add_number & hibit) != 0)) - && ((add_number & mask) != mask - || (add_number & hibit) == 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 + where); + 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, size, buf); - } /* generic error checking */ + _("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 - && size == 2 + && 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"), + _("signed .word overflow; switch may be too large; %ld at 0x%lx"), (long) add_number, - (unsigned long) (fragP->fr_address + where)); + (long) (fragP->fr_address + fixP->fx_where)); #endif - } /* not a bit fix */ + } /* Not a bit fix. */ #ifdef TC_VALIDATE_FIX skip: ATTRIBUTE_UNUSED_LABEL @@ -2785,7 +2797,7 @@ fixup_segment (fixP, this_segment_type) fprintf (stderr, "result:\n"); print_fixup (fixP); #endif - } /* For each fixS in this segment. */ + } /* For each fixS in this segment. */ TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); return seg_reloc_count; @@ -2799,7 +2811,7 @@ number_to_chars_bigendian (buf, val, n) valueT val; int n; { - if ((size_t) n > sizeof (val) || n <= 0) + if (n <= 0) abort (); while (n--) { @@ -2814,7 +2826,7 @@ number_to_chars_littleendian (buf, val, n) valueT val; int n; { - if ((size_t) n > sizeof (val) || n <= 0) + if (n <= 0) abort (); while (n--) { @@ -2830,7 +2842,7 @@ write_print_statistics (file) fprintf (file, "fixups: %d\n", n_fixups); } -/* for debugging */ +/* For debugging. */ extern int indent_level; void @@ -2883,5 +2895,3 @@ print_fixup (fixp) TC_FIX_DATA_PRINT (stderr, fixp); #endif } - -/* end of write.c */