X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fwrite.c;h=70220155d3d67869dff7d89ff72ed366a75c2c5b;hb=6e9179034707f18294ae1cbebcc7e9714a46951d;hp=77960f08042a718fb307ac480bbdcda55afa9697;hpb=374bdac737b34eb8d4ab46dbd34046e659897051;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/write.c b/gas/write.c index 77960f0804..70220155d3 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, 1997 + Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,23 +20,18 @@ 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 -/* 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 -#endif - #ifndef TC_ADJUST_RELOC_COUNT #define TC_ADJUST_RELOC_COUNT(FIXP,COUNT) #endif @@ -48,6 +44,18 @@ #define TC_FORCE_RELOCATION_SECTION(FIXP,SEG) TC_FORCE_RELOCATION(FIXP) #endif +#ifndef TC_LINKRELAX_FIXUP +#define TC_LINKRELAX_FIXUP(SEG) 1 +#endif + +#ifndef TC_FIX_ADJUSTABLE +#define TC_FIX_ADJUSTABLE(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) #endif @@ -57,6 +65,9 @@ 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; void print_fixup PARAMS ((fixS *)); @@ -77,9 +88,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,13 +98,13 @@ 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; @@ -118,7 +129,6 @@ 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 write_relocs PARAMS ((bfd *, asection *, PTR)); static void write_contents PARAMS ((bfd *, asection *, PTR)); @@ -132,26 +142,26 @@ static void cvt_frag_to_fill PARAMS ((object_headers *, segT, fragS *)); static void remove_subsegs PARAMS ((frchainS *, int, fragS **, fragS **)); static void relax_and_size_all_segments PARAMS ((void)); #endif +#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) +static void set_segment_vma PARAMS ((bfd *, asection *, PTR)); +#endif + +/* Create a fixS in obstack 'notes'. */ -/* - * fix_new() - * - * 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. */ + 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 */ + bfd_reloc_code_real_type r_type; /* Relocation type. */ #else - int r_type; /* Relocation type */ + int r_type; /* Relocation type. */ #endif { fixS *fixP; @@ -166,7 +176,7 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, /* We've made fx_size a narrow field; check that it's wide enough. */ if (fixP->fx_size != size) { - as_bad ("field fx_size too small to hold %d", size); + as_bad (_("field fx_size too small to hold %d"), size); abort (); } fixP->fx_addsy = add_symbol; @@ -186,8 +196,13 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, fixP->fx_no_overflow = 0; fixP->fx_signed = 0; +#ifdef USING_CGEN + fixP->fx_cgen.insn = NULL; + fixP->fx_cgen.opinfo = 0; +#endif + #ifdef TC_FIX_TYPE - TC_INIT_FIX_DATA(fixP); + TC_INIT_FIX_DATA (fixP); #endif as_where (&fixP->fx_file, &fixP->fx_line); @@ -195,8 +210,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 @@ -213,7 +227,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; @@ -223,8 +237,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; @@ -234,16 +247,16 @@ 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. */ + 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 */ + bfd_reloc_code_real_type r_type; /* Relocation type. */ #else - int r_type; /* Relocation type */ + int r_type; /* Relocation type. */ #endif { return fix_new_internal (frag, where, size, add_symbol, @@ -256,15 +269,15 @@ 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. */ + int pcrel; /* TRUE if PC-relative relocation. */ #ifdef BFD_ASSEMBLER - bfd_reloc_code_real_type r_type; /* Relocation type */ + bfd_reloc_code_real_type r_type; /* Relocation type. */ #else - int r_type; /* Relocation type */ + int r_type; /* Relocation type. */ #endif { symbolS *add = NULL; @@ -276,15 +289,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); } @@ -298,7 +317,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; @@ -313,7 +332,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; @@ -323,8 +342,7 @@ 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); } /* Append a string onto another string, bumping the pointer along. */ @@ -334,7 +352,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; @@ -346,15 +364,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.) */ @@ -363,7 +380,7 @@ record_alignment (seg, align) if (seg == absolute_section) return; #ifdef BFD_ASSEMBLER - if (align > bfd_get_section_alignment (stdoutput, seg)) + if ((unsigned int) align > bfd_get_section_alignment (stdoutput, seg)) bfd_set_section_alignment (stdoutput, seg, align); #else if (align > section_alignment[(int) seg]) @@ -371,13 +388,26 @@ 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. */ static void renumber_sections (abfd, sec, countparg) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; PTR countparg; { @@ -387,7 +417,7 @@ renumber_sections (abfd, sec, countparg) ++*countp; } -#endif /* defined (BFD_ASSEMBLER) */ +#endif /* defined (BFD_ASSEMBLER) */ #if defined (BFD_ASSEMBLER) || ! defined (BFD) @@ -428,9 +458,9 @@ chain_frchains_together_1 (section, frchp) static void chain_frchains_together (abfd, section, xxx) - bfd *abfd; /* unused */ + bfd *abfd ATTRIBUTE_UNUSED; segT section; - PTR xxx; /* unused */ + PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *info; @@ -438,8 +468,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. */ @@ -461,14 +491,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 @@ -482,6 +512,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 @@ -493,8 +524,9 @@ cvt_frag_to_fill (headersP, sec, fragP) - fragP->fr_fix) / fragP->fr_var; if (fragP->fr_offset < 0) { - as_bad ("attempt to .org/.space backwards? (%ld)", - (long) fragP->fr_offset); + as_bad_where (fragP->fr_file, fragP->fr_line, + _("attempt to .org/.space backwards? (%ld)"), + (long) fragP->fr_offset); } fragP->fr_type = rs_fill; break; @@ -502,6 +534,30 @@ cvt_frag_to_fill (headersP, sec, fragP) case rs_fill: break; + case rs_leb128: + { + valueT value = S_GET_VALUE (fragP->fr_symbol); + int size; + + size = output_leb128 (fragP->fr_literal + fragP->fr_fix, value, + fragP->fr_subtype); + + fragP->fr_fix += size; + fragP->fr_type = rs_fill; + fragP->fr_var = 0; + fragP->fr_offset = 0; + fragP->fr_symbol = NULL; + } + break; + + case rs_cfa: + 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); @@ -509,13 +565,13 @@ cvt_frag_to_fill (headersP, sec, fragP) md_convert_frag (headersP, sec, fragP); #endif - assert (fragP->fr_next == NULL || (fragP->fr_next->fr_address - fragP->fr_address == fragP->fr_fix)); + assert (fragP->fr_next == NULL + || ((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; @@ -544,14 +600,32 @@ 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) - bfd *abfd; +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; { flagword flags; fragS *fragp; @@ -561,23 +635,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; @@ -617,7 +691,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_; { @@ -632,22 +706,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; } } @@ -661,9 +729,9 @@ dump_section_relocs (abfd, sec, stream_) static void adjust_reloc_syms (abfd, sec, xxx) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; - PTR xxx; + PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *seginfo = seg_info (sec); fixS *fixp; @@ -675,14 +743,13 @@ 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; asection *symsec; - reduce_fixup: - #ifdef DEBUG5 fprintf (stderr, "\n\nadjusting fixup:\n"); print_fixup (fixp); @@ -694,39 +761,42 @@ 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 && ! sym->sy_resolved) + if (sym != NULL) resolve_symbol_value (sym); - if (fixp->fx_subsy != NULL && ! fixp->fx_subsy->sy_resolved) + + if (fixp->fx_subsy != NULL) 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->sy_value.X_op == O_symbol - && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) + if (sym != NULL && symbol_equated_reloc_p (sym)) { - fixp->fx_offset += sym->sy_value.X_add_number; - sym = sym->sy_value.X_add_symbol; + fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; + sym = symbol_get_value_expression (sym)->X_add_symbol; fixp->fx_addsy = sym; } - symsec = S_GET_SEGMENT (sym); - - if (sym != NULL && sym->sy_mri_common) + if (sym != NULL && symbol_mri_common_p (sym)) { /* These symbols are handled specially in fixup_segment. */ goto done; } + 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)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); #ifdef UNDEFINED_DIFFERENCE_OK if (fixp->fx_subsy != NULL) - fixp->fx_subsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_subsy); #endif } goto done; @@ -740,22 +810,22 @@ adjust_reloc_syms (abfd, sec, xxx) if (bfd_is_und_section (symsec) || bfd_is_com_section (symsec)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + 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) - fixp->fx_subsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_subsy); #endif goto done; } - /* Don't try to reduce relocs which refer to .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) + /* 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. */ + if (symsec != sec && ! S_IS_LOCAL (sym)) { boolean linkonce; @@ -776,10 +846,10 @@ adjust_reloc_syms (abfd, sec, xxx) if (linkonce) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); #ifdef UNDEFINED_DIFFERENCE_OK if (fixp->fx_subsy != NULL) - fixp->fx_subsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_subsy); #endif goto done; } @@ -787,18 +857,37 @@ adjust_reloc_syms (abfd, sec, xxx) /* Since we're reducing to section symbols, don't attempt to reduce anything that's already using one. */ - if (sym->bsym->flags & BSF_SECTION_SYM) + if (symbol_section_p (sym)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + 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; + } + + /* Never adjust a reloc against local symbol in a merge section. */ + if (symsec->flags & SEC_MERGE) + { + 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)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); goto done; } #endif @@ -809,7 +898,7 @@ adjust_reloc_syms (abfd, sec, xxx) #ifdef tc_fix_adjustable if (! tc_fix_adjustable (fixp)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); goto done; } #endif @@ -820,15 +909,19 @@ adjust_reloc_syms (abfd, sec, xxx) 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)); - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); +#ifdef DEBUG5 + fprintf (stderr, "\nadjusted fixup:\n"); + print_fixup (fixp); +#endif done: ; } -#if 1/*def RELOC_REQUIRES_SYMBOL*/ +#if 1 /* def RELOC_REQUIRES_SYMBOL */ else { /* There was no symbol required by this relocation. However, @@ -837,7 +930,9 @@ adjust_reloc_syms (abfd, sec, xxx) a local symbol in the absolute section. */ fixp->fx_addsy = section_symbol (absolute_section); -/* fixp->fx_addsy->sy_used_in_reloc = 1; */ +#if 0 + fixp->fx_addsy->sy_used_in_reloc = 1; +#endif } #endif @@ -848,10 +943,10 @@ static void write_relocs (abfd, sec, xxx) bfd *abfd; asection *sec; - PTR xxx; + PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *seginfo = seg_info (sec); - int i; + unsigned int i; unsigned int n; arelent **relocs; fixS *fixp; @@ -871,7 +966,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) @@ -887,20 +982,19 @@ 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 (sym->sy_value.X_op == O_symbol - && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) + while (symbol_equated_reloc_p (sym)) { symbolS *n; /* We must avoid looping, as that can occur with a badly written program. */ - n = sym->sy_value.X_add_symbol; + n = symbol_get_value_expression (sym)->X_add_symbol; if (n == sym) break; - fixp->fx_offset += sym->sy_value.X_add_number; + fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; sym = n; } fixp->fx_addsy = sym; @@ -928,11 +1022,14 @@ 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")); 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); } relocs[i++] = reloc; } @@ -957,45 +1054,44 @@ 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 (sym->sy_value.X_op == O_symbol - && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) - sym = sym->sy_value.X_add_symbol; + while (symbol_equated_reloc_p (sym)) + sym = symbol_get_value_expression (sym)->X_add_symbol; 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"); + _("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; case bfd_reloc_overflow: as_bad_where (fixp->fx_file, fixp->fx_line, - "relocation overflow"); + _("relocation overflow")); break; default: - as_fatal ("%s:%u: bad return from bfd_install_relocation", + as_fatal (_("%s:%u: bad return from bfd_install_relocation"), fixp->fx_file, fixp->fx_line); } - } + } } n = i; #endif @@ -1025,6 +1121,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; @@ -1044,9 +1144,9 @@ write_relocs (abfd, sec, xxx) static void write_contents (abfd, sec, xxx) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; - PTR xxx; + PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *seginfo = seg_info (sec); unsigned long offset = 0; @@ -1054,7 +1154,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; @@ -1075,7 +1175,7 @@ write_contents (abfd, sec, xxx) if (x == false) { 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 += f->fr_fix; @@ -1087,9 +1187,9 @@ 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, @@ -1099,7 +1199,8 @@ write_contents (abfd, sec, xxx) if (x == false) { 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; @@ -1119,18 +1220,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); + 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."); + as_fatal (_("cannot write to output file")); offset += n_per_buf * fill_size; } } @@ -1167,7 +1268,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 @@ -1178,30 +1279,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 @@ -1213,9 +1311,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; @@ -1236,21 +1332,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) @@ -1259,7 +1353,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) @@ -1271,7 +1365,7 @@ set_symtab () asymbol **asympp; symbolS *symp; boolean result; - extern PTR bfd_alloc PARAMS ((bfd *, size_t)); + 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 @@ -1283,14 +1377,14 @@ 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)) { - asympp[i] = symp->bsym; - symp->written = 1; + asympp[i] = symbol_get_bfdsym (symp); + symbol_mark_written (symp); } } else @@ -1301,12 +1395,79 @@ set_symtab () } #endif +#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) +static void +set_segment_vma (abfd, sec, xxx) + bfd *abfd; + asection *sec; + PTR xxx ATTRIBUTE_UNUSED; +{ + static bfd_vma addr = 0; + + bfd_set_section_vma (abfd, sec, addr); + addr += bfd_section_size (abfd, sec); +} +#endif /* BFD_ASSEMBLER && OBJ_COFF && !TE_PE */ + +/* Finish the subsegments. After every sub-segment, we fake an + ".align ...". This conforms to BSD4.2 brane-damage. We then fake + ".fill 0" because that is the kind of frag that requires least + thought. ".align" frags like to have a following frag since that + makes calculating their intended length trivial. */ + +#ifndef SUB_SEGMENT_ALIGN +#ifdef BFD_ASSEMBLER +#define SUB_SEGMENT_ALIGN(SEG) (0) +#else +#define SUB_SEGMENT_ALIGN(SEG) (2) +#endif +#endif + +void +subsegs_finish () +{ + struct frchain *frchainP; + + for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) + { + int alignment; + + 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. */ + alignment = had_errors () ? 0 : SUB_SEGMENT_ALIGN (now_seg); + + /* 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. */ + if (!frchainP->frch_next || frchainP->frch_next->frch_seg != now_seg) + alignment = get_recorded_alignment (now_seg); + + 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); + } +} + +/* Write the object file. */ + void write_object_file () { - struct frchain *frchainP; /* Track along all frchains. */ #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? */ @@ -1319,14 +1480,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"); } @@ -1335,37 +1496,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 */ - - /* After every sub-segment, we fake an ".align ...". This conforms to - BSD4.2 brane-damage. We then fake ".fill 0" because that is the kind of - frag that requires least thought. ".align" frags like to have a - following frag since that makes calculating their intended length - trivial. - - @@ Is this really necessary?? */ -#ifndef SUB_SEGMENT_ALIGN -#ifdef BFD_ASSEMBLER -#define SUB_SEGMENT_ALIGN(SEG) (0) -#else -#define SUB_SEGMENT_ALIGN(SEG) (2) -#endif -#endif - for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) - { - subseg_set (frchainP->frch_seg, frchainP->frch_subseg); - frag_align (SUB_SEGMENT_ALIGN (now_seg), NOP_OPCODE, 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); - } +#endif /* OBJ_VMS */ /* From now on, we don't care about sub-segments. Build one frag chain for each segment. Linked thru fr_next. */ @@ -1413,33 +1546,79 @@ 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; + +#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) + /* Now that the segments have their final sizes, run through the + sections and set their vma and lma. !BFD gas sets them, and BFD gas + should too. Currently, only DJGPP uses this code, but other + COFF targets may need to execute this too. */ + bfd_map_over_sections (stdoutput, set_segment_vma, (char *) 0); +#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); @@ -1450,16 +1629,21 @@ 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) { + /* At this point we have linked all the frags into a single + chain. However, cvt_frag_to_fill may call md_convert_frag + which may call fix_new. We need to ensure that fix_new adds + the fixup to the right section. */ + if (fragP == data_frag_root) + subseg_change (SEG_DATA, 0); + cvt_frag_to_fill (&headers, SEG_TEXT, fragP); /* Some assert macros don't work with # directives mixed in. */ @@ -1473,7 +1657,7 @@ write_object_file () abort (); #endif } -#endif /* ! BFD_ASSEMBLER */ +#endif /* ! BFD_ASSEMBLER */ #ifndef WORKING_DOT_WORD { @@ -1486,6 +1670,7 @@ write_object_file () { expressionS exp; + subseg_change (lie->seg, lie->subseg); exp.X_op = O_subtract; exp.X_add_symbol = lie->add; exp.X_op_symbol = lie->sub; @@ -1493,8 +1678,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, @@ -1514,9 +1699,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 @@ -1530,65 +1715,70 @@ write_object_file () addressT from_addr, to_addr; int n, m; + subseg_change (lie->seg, lie->subseg); fragP = lie->dispfrag; /* 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 -= lie->sub->sy_frag->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 += lie->add->sy_frag->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); @@ -1597,11 +1787,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); @@ -1610,11 +1800,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; @@ -1623,78 +1812,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. */ @@ -1703,9 +1905,9 @@ write_object_file () symbolS *symp; for (symp = symbol_rootP; symp; symp = symbol_next (symp)) - if (!symp->sy_resolved) - resolve_symbol_value (symp); + resolve_symbol_value (symp); } + resolve_local_symbol_values (); PROGRESS (1); @@ -1716,7 +1918,7 @@ 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); /* Set up symbol table, and write it out. */ if (symbol_rootP) @@ -1728,10 +1930,10 @@ write_object_file () int punt = 0; const char *name; - if (symp->sy_mri_common) + if (symbol_mri_common_p (symp)) { if (S_IS_EXTERNAL (symp)) - as_bad ("%s: global symbols not supported in common sections", + as_bad (_("%s: global symbols not supported in common sections"), S_GET_NAME (symp)); symbol_remove (symp, &symbol_rootP, &symbol_lastP); continue; @@ -1740,34 +1942,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. */ - if (! symp->sy_resolved) - { - if (symp->sy_value.X_op == O_constant) - { - /* This is the normal case; skip the call. */ - S_SET_VALUE (symp, - (S_GET_VALUE (symp) - + symp->sy_frag->fr_address)); - symp->sy_resolved = 1; - } - else - resolve_symbol_value (symp); - } + resolve_symbol_value (symp); /* Skip symbols which were equated to undefined or common symbols. */ - if (symp->sy_value.X_op == O_symbol - && (! S_IS_DEFINED (symp) || S_IS_COMMON (symp))) + if (symbol_equated_reloc_p (symp)) { symbol_remove (symp, &symbol_rootP, &symbol_lastP); continue; @@ -1782,15 +1972,15 @@ write_object_file () printf ("symbol `%s'\n\t@%x: value=%d flags=%x seg=%s\n", S_GET_NAME (symp), symp, S_GET_VALUE (symp), - symp->bsym->flags, - segment_name (symp->bsym->section)); + symbol_get_bfdsym (symp)->flags, + segment_name (S_GET_SEGMENT (symp))); #endif #ifdef obj_frob_symbol obj_frob_symbol (symp, punt); #endif #ifdef tc_frob_symbol - if (! punt || symp->sy_used_in_reloc) + if (! punt || symbol_used_in_reloc_p (symp)) tc_frob_symbol (symp, punt); #endif @@ -1800,33 +1990,33 @@ write_object_file () 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 - && (symp->bsym->flags & BSF_SECTION_SYM) != 0) + && 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) - && ! symp->sy_used_in_reloc)) + && ! 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 (! symp->sy_resolved) + 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)); - symp->sy_resolved = 1; + symbol_mark_resolved (symp); } /* Set the value into the BFD symbol. Up til now the value has only been kept in the gas symbolS struct. */ - symp->bsym->value = S_GET_VALUE (symp); + symbol_get_bfdsym (symp)->value = S_GET_VALUE (symp); } } @@ -1866,44 +2056,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 *)); -static long relax_frag PARAMS ((fragS *, long)); - -/* 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. */ -static long -relax_frag (fragP, stretch) +long +relax_frag (segment, fragP, stretch) + segT segment; fragS *fragP; long stretch; { @@ -1911,20 +2074,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) @@ -1932,25 +2101,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) - + symbolP->sy_frag->fr_address; + || 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 (symbolP->sy_frag->fr_address >= was_address - && is_dnrange (fragP, symbolP->sy_frag)) + if (stretch != 0 + && sym_frag->relax_marker != fragP->relax_marker + && S_GET_SEGMENT (symbolP) == segment) { target += stretch; } @@ -1958,26 +2122,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; @@ -1985,13 +2151,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; @@ -2004,14 +2170,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; @@ -2027,17 +2193,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) @@ -2045,6 +2223,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; @@ -2056,6 +2235,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); @@ -2064,8 +2244,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); } @@ -2079,35 +2260,56 @@ 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 + stable solutions that are larger than the minimum. */ + address += fragP->fr_offset = 1; + break; + + case rs_cfa: + 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; @@ -2115,6 +2317,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; @@ -2122,7 +2325,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; @@ -2149,21 +2352,20 @@ relax_segment (segment_frag_root, segment) if (lie->added) continue; - offset = (lie->add->sy_frag->fr_address - + S_GET_VALUE (lie->add) + offset = (S_GET_VALUE (lie->add) + lie->addnum - - (lie->sub->sy_frag->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) @@ -2174,8 +2376,10 @@ relax_segment (segment_frag_root, segment) for (untruth = lie->next_broken_word; untruth && untruth->dispfrag == lie->dispfrag; untruth = untruth->next_broken_word) - if ((untruth->add->sy_frag == lie->add->sy_frag) - && S_GET_VALUE (untruth->add) == S_GET_VALUE (lie->add)) + if ((symbol_get_frag (untruth->add) + == symbol_get_frag (lie->add)) + && (S_GET_VALUE (untruth->add) + == S_GET_VALUE (lie->add))) { untruth->added = 2; untruth->use_jump = lie; @@ -2185,10 +2389,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; @@ -2211,8 +2416,8 @@ relax_segment (segment_frag_root, segment) case rs_org: { - long target = offset; - long after; + addressT target = offset; + addressT after; if (symbolP) { @@ -2225,9 +2430,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) - + symbolP->sy_frag->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; @@ -2236,47 +2445,84 @@ 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. */ - as_bad ("attempt to .org backwards ignored"); - growth = 0; + .org backwards. */ + as_bad_where (fragP->fr_file, fragP->fr_line, + _("attempt to .org backwards")); + + /* We've issued an error message. Change the + frag to avoid cascading errors. */ + fragP->fr_type = rs_align; + fragP->fr_subtype = 0; + fragP->fr_offset = 0; + fragP->fr_fix = after - address; + 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 (symbolP->sy_frag != &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; + case rs_leb128: + { + valueT value; + int size; + + value = resolve_symbol_value (fragP->fr_symbol); + size = sizeof_leb128 (value, fragP->fr_subtype); + growth = size - fragP->fr_offset; + fragP->fr_offset = size; + } + break; + + case rs_cfa: + growth = eh_frame_relax_frag (fragP); + break; + + case rs_dwarf2dbg: + growth = dwarf2dbg_relax_frag (fragP); + break; + default: BAD_CASE (fragP->fr_type); break; @@ -2284,22 +2530,22 @@ 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 */ - - /* - * We now have valid fr_address'es for each frag. - */ + while (stretched); /* Until nothing further to relax. */ + } /* do_relax */ - /* - * 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)) @@ -2321,7 +2567,7 @@ relax_segment (segment_frag_root, segment) static long fixup_segment (fixP, this_segment_type) register fixS *fixP; - segT this_segment_type; /* N_TYPE bits for segment. */ + segT this_segment_type; /* N_TYPE bits for segment. */ { long seg_reloc_count = 0; symbolS *add_symbolP; @@ -2341,7 +2587,7 @@ fixup_segment (fixP, this_segment_type) 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) + if (linkrelax && TC_LINKRELAX_FIXUP (this_segment_type)) { for (; fixP; fixP = fixP->fx_next) seg_reloc_count++; @@ -2371,12 +2617,13 @@ fixup_segment (fixP, this_segment_type) plt = fixP->fx_plt; if (add_symbolP != NULL - && add_symbolP->sy_mri_common) + && symbol_mri_common_p (add_symbolP)) { know (add_symbolP->sy_value.X_op == O_symbol); add_number += S_GET_VALUE (add_symbolP); fixP->fx_offset = add_number; - add_symbolP = fixP->fx_addsy = add_symbolP->sy_value.X_add_symbol; + add_symbolP = fixP->fx_addsy = + symbol_get_value_expression (add_symbolP)->X_add_symbol; } if (add_symbolP) @@ -2394,7 +2641,7 @@ fixup_segment (fixP, this_segment_type) fixP->fx_addsy = NULL; } - /* It's just -sym */ + /* It's just -sym. */ if (S_GET_SEGMENT (sub_symbolP) == absolute_section) { add_number -= S_GET_VALUE (sub_symbolP); @@ -2409,7 +2656,7 @@ fixup_segment (fixP, this_segment_type) else bad_sub_reloc: as_bad_where (fixP->fx_file, fixP->fx_line, - "Negative of non-absolute symbol %s", + _("negative of non-absolute symbol `%s'"), S_GET_NAME (sub_symbolP)); } else if (S_GET_SEGMENT (sub_symbolP) == add_symbol_segment @@ -2417,19 +2664,26 @@ fixup_segment (fixP, this_segment_type) { /* Difference of 2 symbols from same segment. Can't make difference of 2 undefineds: 'value' means - something different for N_UNDF. */ + 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); + _("callj to difference of two symbols")); +#endif /* TC_I960 */ + add_number += (S_GET_VALUE (add_symbolP) + - S_GET_VALUE (sub_symbolP)); + if (1 +#ifdef TC_M68K + /* See the comment below about 68k weirdness. */ + && 0 +#endif + && pcrel) + add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment_type); add_symbolP = NULL; - pcrel = 0; /* No further pcrel processing. */ + 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 @@ -2443,7 +2697,7 @@ fixup_segment (fixP, this_segment_type) } else { - /* Different segments in subtraction. */ + /* Different segments in subtraction. */ know (!(S_IS_EXTERNAL (sub_symbolP) && (S_GET_SEGMENT (sub_symbolP) == absolute_section))); @@ -2451,19 +2705,26 @@ fixup_segment (fixP, this_segment_type) 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 - ) + else if (S_GET_SEGMENT (sub_symbolP) == this_segment_type) { /* 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; + 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 + || !pcrel) + { + add_number += MD_PCREL_FROM_SECTION (fixP, + this_segment_type); + pcrel = 1; + fixP->fx_pcrel = 1; + } + + add_number -= S_GET_VALUE (sub_symbolP); sub_symbolP = 0; fixP->fx_subsy = 0; } @@ -2489,9 +2750,12 @@ fixup_segment (fixP, this_segment_type) char buf[50]; sprint_value (buf, fragP->fr_address + where); as_bad_where (fixP->fx_file, fixP->fx_line, - "Can't emit reloc {- %s-seg symbol \"%s\"} @ file address %s.", + _("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)), - S_GET_NAME (sub_symbolP), buf); + buf); } } } @@ -2501,23 +2765,22 @@ fixup_segment (fixP, this_segment_type) if (add_symbol_segment == this_segment_type && pcrel && !plt && TC_RELOC_RTSYM_LOC_FIXUP (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. - */ + /* 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. */ + below a no-op. */ reloc_callj (fixP); -#endif /* TC_I960 */ +#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. */ + /* Lie. Don't want further pcrel processing. */ + pcrel = 0; /* Let the target machine make the final determination as to whether or not a relocation will be needed to @@ -2536,7 +2799,7 @@ fixup_segment (fixP, this_segment_type) #ifdef TC_I960 /* See comment about reloc_callj() above. */ reloc_callj (fixP); -#endif /* TC_I960 */ +#endif /* TC_I960 */ add_number += S_GET_VALUE (add_symbolP); /* Let the target machine make the final determination @@ -2552,6 +2815,9 @@ fixup_segment (fixP, this_segment_type) else if (add_symbol_segment == undefined_section #ifdef BFD_ASSEMBLER || bfd_is_com_section (add_symbol_segment) + || (bfd_get_section_flags (stdoutput, + add_symbol_segment) + & SEC_MERGE) != 0 #endif ) { @@ -2559,40 +2825,30 @@ fixup_segment (fixP, this_segment_type) 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. - */ + 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"); + _("can't use COBR format with external label")); fixP->fx_addsy = NULL; fixP->fx_done = 1; continue; - } /* COBR */ -#endif /* TC_I960 */ + } /* 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 */ +#endif /* TE_I386AIX */ +#endif /* OBJ_COFF */ ++seg_reloc_count; } else { seg_reloc_count++; -/* start-sanitize-v850 */ -#if !(defined (TC_V850) && defined (OBJ_ELF)) -/* end-sanitize-v850 */ -#if !(defined (TC_M68K) && defined (OBJ_ELF)) -#if !defined (TC_I386) || !(defined (OBJ_ELF) || defined (OBJ_COFF)) - add_number += S_GET_VALUE (add_symbolP); -/* start-sanitize-v850 */ -#endif -/* end-sanitize-v850 */ -#endif -#endif + if (TC_FIX_ADJUSTABLE (fixP)) + add_number += S_GET_VALUE (add_symbolP); } } } @@ -2607,33 +2863,42 @@ fixup_segment (fixP, this_segment_type) #else fixP->fx_addsy = section_symbol (absolute_section); #endif - fixP->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixP->fx_addsy); ++seg_reloc_count; } } + 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 + +#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_bit_fixP && !fixP->fx_no_overflow && size > 0) { - if (size < sizeof (valueT)) + if ((size_t) 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 <<= 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); @@ -2642,9 +2907,9 @@ fixup_segment (fixP, this_segment_type) 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", + _("value of %s too large for field of %d bytes at %s"), buf2, size, buf); - } /* generic error checking */ + } /* Generic error checking. */ } #ifdef WARN_SIGNED_OVERFLOW_WORD /* Warn if a .word value is too large when treated as a signed @@ -2654,40 +2919,21 @@ fixup_segment (fixP, this_segment_type) && 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)); #endif - } /* not a bit fix */ - - 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 + } /* Not a bit fix. */ -#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 - } #ifdef TC_VALIDATE_FIX - skip: ; + skip: ATTRIBUTE_UNUSED_LABEL + ; #endif #ifdef DEBUG5 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; @@ -2701,7 +2947,7 @@ number_to_chars_bigendian (buf, val, n) valueT val; int n; { - if (n > sizeof (val)|| n <= 0) + if ((size_t) n > sizeof (val) || n <= 0) abort (); while (n--) { @@ -2716,7 +2962,7 @@ number_to_chars_littleendian (buf, val, n) valueT val; int n; { - if (n > sizeof (val) || n <= 0) + if ((size_t) n > sizeof (val) || n <= 0) abort (); while (n--) { @@ -2729,10 +2975,10 @@ void write_print_statistics (file) FILE *file; { - fprintf (stderr, "fixups: %d\n", n_fixups); + fprintf (file, "fixups: %d\n", n_fixups); } -/* for debugging */ +/* For debugging. */ extern int indent_level; void @@ -2781,6 +3027,7 @@ print_fixup (fixp) fprintf (stderr, ">"); } fprintf (stderr, "\n"); +#ifdef TC_FIX_DATA_PRINT + TC_FIX_DATA_PRINT (stderr, fixp); +#endif } - -/* end of write.c */