X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fbout.c;h=b839929c38f0c41658aa4ae7ad14b604412ee6a6;hb=6913c89ac7bc62da99c5bb292de820098a2bacd2;hp=7a353a5b63b905fe14fe4dd32d88b70fdc369c17;hpb=9e2dad8ed4b31d55281cca6915da87d2ea487125;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/bout.c b/bfd/bout.c index 7a353a5b63..b839929c38 100644 --- a/bfd/bout.c +++ b/bfd/bout.c @@ -1,5 +1,7 @@ /* BFD back-end for Intel 960 b.out binaries. - Copyright (C) 1990-1991 Free Software Foundation, Inc. + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002 + Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -16,179 +18,285 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id$ */ - -#include #include "bfd.h" +#include "sysdep.h" #include "libbfd.h" - +#include "bfdlink.h" +#include "genlink.h" #include "bout.h" -#include "stab.gnu.h" -#include "libaout.h" /* BFD a.out internal data structures */ - -/* Align an address by rounding it up to a power of two. It leaves the - address unchanged if align == 0 (2^0 = alignment of 1 byte) */ -#define i960_align(addr, align) \ - ( ((addr) + ((1<<(align))-1)) & (-1 << (align))) - - -#define EXEC_BYTES_SIZE (sizeof (struct exec)) -PROTO (static boolean, b_out_squirt_out_relocs,(bfd *abfd, asection *section)); -PROTO (static bfd_target *, b_out_callback, (bfd *)); - -PROTO (boolean, aout_32_slurp_symbol_table, (bfd *abfd)); -PROTO (void , aout_32_write_syms, ()); - -PROTO (static void, swap_exec_header, (bfd *abfd, struct internal_exec *execp)); +#include "aout/stab_gnu.h" +#include "libaout.h" /* BFD a.out internal data structures. */ + +static int aligncode + PARAMS ((bfd *abfd, asection *input_section, arelent *r, + unsigned int shrink)); +static void perform_slip + PARAMS ((bfd *abfd, unsigned int slip, asection *input_section, + bfd_vma value)); +static bfd_boolean b_out_squirt_out_relocs + PARAMS ((bfd *abfd, asection *section)); +static const bfd_target *b_out_callback + PARAMS ((bfd *)); +static bfd_reloc_status_type calljx_callback + PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR src, PTR dst, + asection *)); +static bfd_reloc_status_type callj_callback + PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR data, + unsigned int srcidx, unsigned int dstidx, asection *, bfd_boolean)); +static bfd_vma get_value + PARAMS ((arelent *, struct bfd_link_info *, asection *)); +static int abs32code + PARAMS ((bfd *, asection *, arelent *, unsigned int, + struct bfd_link_info *)); +static bfd_boolean b_out_bfd_relax_section + PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *)); +static bfd_byte *b_out_bfd_get_relocated_section_contents + PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, bfd_byte *, + bfd_boolean, asymbol **)); +static int b_out_sizeof_headers + PARAMS ((bfd *, bfd_boolean)); +static bfd_boolean b_out_set_arch_mach + PARAMS ((bfd *, enum bfd_architecture, unsigned long)); +static bfd_boolean b_out_set_section_contents + PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); +static long b_out_get_reloc_upper_bound + PARAMS ((bfd *, sec_ptr)); +static long b_out_canonicalize_reloc + PARAMS ((bfd *, sec_ptr, arelent **, asymbol **)); +static bfd_boolean b_out_slurp_reloc_table + PARAMS ((bfd *, sec_ptr, asymbol **)); +static reloc_howto_type *b_out_bfd_reloc_type_lookup + PARAMS ((bfd *, bfd_reloc_code_real_type)); +static bfd_boolean b_out_write_object_contents + PARAMS ((bfd *)); +static int b_out_symbol_cmp + PARAMS ((const void *, const void *)); +static bfd_boolean b_out_mkobject + PARAMS ((bfd *)); +static const bfd_target *b_out_object_p + PARAMS ((bfd *)); + +void bout_swap_exec_header_in + PARAMS ((bfd *, struct external_exec *, struct internal_exec *)); +void bout_swap_exec_header_out + PARAMS ((bfd *, struct internal_exec *, struct external_exec *)); + +/* Swaps the information in an executable header taken from a raw byte + stream memory image, into the internal exec_header structure. */ + +void +bout_swap_exec_header_in (abfd, raw_bytes, execp) + bfd *abfd; + struct external_exec *raw_bytes; + struct internal_exec *execp; +{ + struct external_exec *bytes = (struct external_exec *)raw_bytes; + + /* Now fill in fields in the execp, from the bytes in the raw data. */ + execp->a_info = H_GET_32 (abfd, bytes->e_info); + execp->a_text = GET_WORD (abfd, bytes->e_text); + execp->a_data = GET_WORD (abfd, bytes->e_data); + execp->a_bss = GET_WORD (abfd, bytes->e_bss); + execp->a_syms = GET_WORD (abfd, bytes->e_syms); + execp->a_entry = GET_WORD (abfd, bytes->e_entry); + execp->a_trsize = GET_WORD (abfd, bytes->e_trsize); + execp->a_drsize = GET_WORD (abfd, bytes->e_drsize); + execp->a_tload = GET_WORD (abfd, bytes->e_tload); + execp->a_dload = GET_WORD (abfd, bytes->e_dload); + execp->a_talign = bytes->e_talign[0]; + execp->a_dalign = bytes->e_dalign[0]; + execp->a_balign = bytes->e_balign[0]; + execp->a_relaxable = bytes->e_relaxable[0]; +} +/* Swaps the information in an internal exec header structure into the + supplied buffer ready for writing to disk. */ -static bfd_target * -b_out_little_object_p (abfd) +void +bout_swap_exec_header_out (abfd, execp, raw_bytes) bfd *abfd; + struct internal_exec *execp; + struct external_exec *raw_bytes; { - unsigned char magicbytes[LONG_SIZE]; - struct internal_exec anexec; - - if (bfd_read ((PTR)magicbytes, 1, LONG_SIZE, abfd) != LONG_SIZE) { - bfd_error = system_call_error; - return 0; - } - anexec.a_magic = _do_getl32 (magicbytes); - - if (N_BADMAG (anexec)) { - bfd_error = wrong_format; - return 0; - } - return aout_32_some_aout_object_p (abfd, b_out_callback); + struct external_exec *bytes = (struct external_exec *)raw_bytes; + + /* Now fill in fields in the raw data, from the fields in the exec struct. */ + H_PUT_32 (abfd, execp->a_info , bytes->e_info); + PUT_WORD (abfd, execp->a_text , bytes->e_text); + PUT_WORD (abfd, execp->a_data , bytes->e_data); + PUT_WORD (abfd, execp->a_bss , bytes->e_bss); + PUT_WORD (abfd, execp->a_syms , bytes->e_syms); + PUT_WORD (abfd, execp->a_entry , bytes->e_entry); + PUT_WORD (abfd, execp->a_trsize, bytes->e_trsize); + PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize); + PUT_WORD (abfd, execp->a_tload , bytes->e_tload); + PUT_WORD (abfd, execp->a_dload , bytes->e_dload); + bytes->e_talign[0] = execp->a_talign; + bytes->e_dalign[0] = execp->a_dalign; + bytes->e_balign[0] = execp->a_balign; + bytes->e_relaxable[0] = execp->a_relaxable; } -static bfd_target * -b_out_big_object_p (abfd) +static const bfd_target * +b_out_object_p (abfd) bfd *abfd; { - unsigned char magicbytes[LONG_SIZE]; struct internal_exec anexec; + struct external_exec exec_bytes; + bfd_size_type amt = EXEC_BYTES_SIZE; - if (bfd_read ((PTR)magicbytes, 1, LONG_SIZE, abfd) != LONG_SIZE) { - bfd_error = system_call_error; - return 0; - } + if (bfd_bread ((PTR) &exec_bytes, amt, abfd) != amt) + { + if (bfd_get_error () != bfd_error_system_call) + bfd_set_error (bfd_error_wrong_format); + return 0; + } - anexec.a_magic = _do_getb32 (magicbytes); + anexec.a_info = H_GET_32 (abfd, exec_bytes.e_info); - if (N_BADMAG (anexec)) { - bfd_error = wrong_format; - return 0; - } - return aout_32_some_aout_object_p (abfd, b_out_callback); + if (N_BADMAG (anexec)) + { + bfd_set_error (bfd_error_wrong_format); + return 0; + } + + bout_swap_exec_header_in (abfd, &exec_bytes, &anexec); + return aout_32_some_aout_object_p (abfd, &anexec, b_out_callback); } /* Finish up the opening of a b.out file for reading. Fill in all the fields that are not handled by common code. */ -static bfd_target * +static const bfd_target * b_out_callback (abfd) bfd *abfd; { - struct internal_exec anexec; - struct internal_exec *execp = &anexec; + struct internal_exec *execp = exec_hdr (abfd); unsigned long bss_start; - /* Reread the exec header, because the common code didn't get all of - our extended header. */ - - if (bfd_seek (abfd, 0L, SEEK_SET) < 0) { - bfd_error = system_call_error; - return 0; - } - - /* FIXME, needs to be hacked for character array read-in ala sunos.c. */ - if (bfd_read ((PTR) execp, 1, sizeof (struct internal_exec), abfd) - != sizeof (struct internal_exec)) { - bfd_error = wrong_format; - return 0; - } - - swap_exec_header (abfd, execp); - - /* Architecture and machine type */ - bfd_set_arch_mach(abfd, + /* Architecture and machine type. */ + bfd_set_arch_mach(abfd, bfd_arch_i960, /* B.out only used on i960 */ bfd_mach_i960_core /* Default */ ); /* The positions of the string table and symbol table. */ - obj_str_filepos (abfd) = N_STROFF (anexec); - obj_sym_filepos (abfd) = N_SYMOFF (anexec); + obj_str_filepos (abfd) = N_STROFF (*execp); + obj_sym_filepos (abfd) = N_SYMOFF (*execp); - /* The alignments of the sections */ + /* The alignments of the sections. */ obj_textsec (abfd)->alignment_power = execp->a_talign; obj_datasec (abfd)->alignment_power = execp->a_dalign; obj_bsssec (abfd)->alignment_power = execp->a_balign; /* The starting addresses of the sections. */ - obj_textsec (abfd)->vma = anexec.a_tload; - obj_datasec (abfd)->vma = anexec.a_dload; - bss_start = anexec.a_dload + anexec.a_data; /* BSS = end of data section */ - obj_bsssec (abfd)->vma = i960_align (bss_start, anexec.a_balign); + obj_textsec (abfd)->vma = execp->a_tload; + obj_datasec (abfd)->vma = execp->a_dload; + + obj_textsec (abfd)->lma = obj_textsec (abfd)->vma; + obj_datasec (abfd)->lma = obj_datasec (abfd)->vma; + + /* And reload the sizes, since the aout module zaps them. */ + obj_textsec (abfd)->_raw_size = execp->a_text; + + bss_start = execp->a_dload + execp->a_data; /* BSS = end of data section */ + obj_bsssec (abfd)->vma = align_power (bss_start, execp->a_balign); + + obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma; - /* The file positions of the sections */ - obj_textsec (abfd)->filepos = N_TXTOFF(anexec); - obj_datasec (abfd)->filepos = N_DATOFF(anexec); + /* The file positions of the sections. */ + obj_textsec (abfd)->filepos = N_TXTOFF(*execp); + obj_datasec (abfd)->filepos = N_DATOFF(*execp); - /* The file positions of the relocation info */ - obj_textsec (abfd)->rel_filepos = N_TROFF(anexec); - obj_datasec (abfd)->rel_filepos = N_DROFF(anexec); + /* The file positions of the relocation info. */ + obj_textsec (abfd)->rel_filepos = N_TROFF(*execp); + obj_datasec (abfd)->rel_filepos = N_DROFF(*execp); + adata(abfd).page_size = 1; /* Not applicable. */ + adata(abfd).segment_size = 1; /* Not applicable. */ + adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE; + + if (execp->a_relaxable) + abfd->flags |= BFD_IS_RELAXABLE; return abfd->xvec; } +struct bout_data_struct + { + struct aoutdata a; + struct internal_exec e; + }; -static boolean +static bfd_boolean b_out_mkobject (abfd) bfd *abfd; { - PTR rawptr; + struct bout_data_struct *rawptr; + bfd_size_type amt = sizeof (struct bout_data_struct); - bfd_error = system_call_error; + rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, amt); + if (rawptr == NULL) + return FALSE; - /* Use an intermediate variable for clarity */ - rawptr = (PTR) zalloc (sizeof (struct aoutdata) + sizeof (struct internal_exec)); - - if (rawptr == (PTR)NULL) { - bfd_error = no_memory; - return false; - } + abfd->tdata.bout_data = rawptr; + exec_hdr (abfd) = &rawptr->e; - set_tdata(abfd, (struct aoutdata *) rawptr); - exec_hdr (abfd) = (struct internal_exec *) ( (char*)rawptr + sizeof (struct aoutdata)); + obj_textsec (abfd) = (asection *) NULL; + obj_datasec (abfd) = (asection *) NULL; + obj_bsssec (abfd) = (asection *) NULL; - /* For simplicity's sake we just make all the sections right here. */ - obj_textsec (abfd) = (asection *)NULL; - obj_datasec (abfd) = (asection *)NULL; - obj_bsssec (abfd) = (asection *)NULL; + return TRUE; +} - bfd_make_section (abfd, ".text"); - bfd_make_section (abfd, ".data"); - bfd_make_section (abfd, ".bss"); +static int +b_out_symbol_cmp (a_ptr, b_ptr) + const void * a_ptr; + const void * b_ptr; +{ + struct aout_symbol ** a = (struct aout_symbol **) a_ptr; + struct aout_symbol ** b = (struct aout_symbol **) b_ptr; + asection *sec; + bfd_vma av, bv; + + /* Primary key is address. */ + sec = bfd_get_section (&(*a)->symbol); + av = sec->output_section->vma + sec->output_offset + (*a)->symbol.value; + sec = bfd_get_section (&(*b)->symbol); + bv = sec->output_section->vma + sec->output_offset + (*b)->symbol.value; + + if (av < bv) + return -1; + if (av > bv) + return 1; + + /* Secondary key puts CALLNAME syms last and BALNAME syms first, so + that they have the best chance of being contiguous. */ + if (IS_BALNAME ((*a)->other) || IS_CALLNAME ((*b)->other)) + return -1; + if (IS_CALLNAME ((*a)->other) || IS_BALNAME ((*b)->other)) + return 1; - return true; + return 0; } -static boolean +static bfd_boolean b_out_write_object_contents (abfd) bfd *abfd; { - struct internal_exec swapped_hdr; + struct external_exec swapped_hdr; + bfd_size_type amt; - exec_hdr (abfd)->a_magic = BMAGIC; + if (! aout_32_make_sections (abfd)) + return FALSE; - exec_hdr (abfd)->a_text = obj_textsec (abfd)->size; - exec_hdr (abfd)->a_data = obj_datasec (abfd)->size; - exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->size; + exec_hdr (abfd)->a_info = BMAGIC; + + exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size; + exec_hdr (abfd)->a_data = obj_datasec (abfd)->_raw_size; + exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->_raw_size; exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * sizeof (struct nlist); exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd); exec_hdr (abfd)->a_trsize = ((obj_textsec (abfd)->reloc_count) * @@ -203,393 +311,655 @@ b_out_write_object_contents (abfd) exec_hdr (abfd)->a_tload = obj_textsec (abfd)->vma; exec_hdr (abfd)->a_dload = obj_datasec (abfd)->vma; - /* FIXME, turn the header into bytes here, to avoid problems with - sizes and alignments of its fields. */ - swapped_hdr = *exec_hdr(abfd); - swap_exec_header (abfd, &swapped_hdr); + bout_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr); - bfd_seek (abfd, 0L, SEEK_SET); - bfd_write ((PTR) &swapped_hdr, 1, sizeof (struct internal_exec), abfd); + amt = EXEC_BYTES_SIZE; + if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0 + || bfd_bwrite ((PTR) &swapped_hdr, amt, abfd) != amt) + return FALSE; /* Now write out reloc info, followed by syms and strings */ - if (bfd_get_symcount (abfd) != 0) + if (bfd_get_symcount (abfd) != 0) { - bfd_seek (abfd, - (long)(N_SYMOFF(*exec_hdr(abfd))), SEEK_SET); + /* Make sure {CALL,BAL}NAME symbols remain adjacent on output + by sorting. This is complicated by the fact that stabs are + also ordered. Solve this by shifting all stabs to the end + in order, then sorting the rest. */ + + asymbol **outsyms, **p, **q; + + outsyms = bfd_get_outsymbols (abfd); + p = outsyms + bfd_get_symcount (abfd); + + for (q = p--; p >= outsyms; p--) + { + if ((*p)->flags & BSF_DEBUGGING) + { + asymbol *t = *--q; + *q = *p; + *p = t; + } + } - aout_32_write_syms (abfd); + if (q > outsyms) + qsort (outsyms, (size_t) (q - outsyms), sizeof (asymbol*), + b_out_symbol_cmp); - bfd_seek (abfd, (long)(N_TROFF(*exec_hdr(abfd))), SEEK_SET); + /* Back to your regularly scheduled program. */ + if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*exec_hdr(abfd))), SEEK_SET) + != 0) + return FALSE; - if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd))) return false; - bfd_seek (abfd, (long)(N_DROFF(*exec_hdr(abfd))), SEEK_SET); + if (! aout_32_write_syms (abfd)) + return FALSE; - if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd))) return false; + if (bfd_seek (abfd, (file_ptr) (N_TROFF(*exec_hdr(abfd))), SEEK_SET) + != 0) + return FALSE; + + if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd))) + return FALSE; + if (bfd_seek (abfd, (file_ptr) (N_DROFF(*exec_hdr(abfd))), SEEK_SET) + != 0) + return FALSE; + + if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd))) + return FALSE; } - return true; + return TRUE; } + +/* Some reloc hackery. */ -static void -swap_exec_header (abfd, execp) +#define CALLS 0x66003800 /* Template for 'calls' instruction */ +#define BAL 0x0b000000 /* Template for 'bal' instruction */ +#define BAL_MASK 0x00ffffff +#define BALX 0x85f00000 /* Template for 'balx' instruction */ +#define BALX_MASK 0x0007ffff +#define CALL 0x09000000 +#define PCREL13_MASK 0x1fff + +#define output_addr(sec) ((sec)->output_offset+(sec)->output_section->vma) + +/* Magic to turn callx into calljx. */ + +static bfd_reloc_status_type +calljx_callback (abfd, link_info, reloc_entry, src, dst, input_section) bfd *abfd; - struct internal_exec *execp; + struct bfd_link_info *link_info; + arelent *reloc_entry; + PTR src; + PTR dst; + asection *input_section; { -#define swapme(field) field = bfd_h_get_32 (abfd, (unsigned char *)&field); - swapme (execp->a_magic); - swapme (execp->a_text); - swapme (execp->a_data); - swapme (execp->a_bss); - swapme (execp->a_syms); - swapme (execp->a_entry); - swapme (execp->a_trsize); - swapme (execp->a_drsize); - swapme (execp->a_tload); - swapme (execp->a_dload); - /* talign, dalign, and balign are one-byte fields and don't swap. */ -#undef swapme + int word = bfd_get_32 (abfd, src); + asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr); + aout_symbol_type *symbol = aout_symbol (symbol_in); + bfd_vma value; + + value = get_value (reloc_entry, link_info, input_section); + + if (IS_CALLNAME (symbol->other)) + { + aout_symbol_type *balsym = symbol+1; + int inst = bfd_get_32 (abfd, (bfd_byte *) src-4); + /* The next symbol should be an N_BALNAME. */ + BFD_ASSERT (IS_BALNAME (balsym->other)); + inst &= BALX_MASK; + inst |= BALX; + bfd_put_32 (abfd, (bfd_vma) inst, (bfd_byte *) dst-4); + symbol = balsym; + value = (symbol->symbol.value + + output_addr (symbol->symbol.section)); + } + + word += value + reloc_entry->addend; + + bfd_put_32 (abfd, (bfd_vma) word, dst); + return bfd_reloc_ok; } - -/** Some reloc hackery */ - -#define CALLS 0x66003800 /* Template for 'calls' instruction */ -#define BAL 0x0b000000 /* Template for 'bal' instruction */ -#define BAL_MASK 0x00ffffff - -static bfd_reloc_status_type -callj_callback(abfd, reloc_entry, symbol_in, data, input_section) -bfd *abfd; -arelent *reloc_entry; -asymbol *symbol_in; -unsigned char *data; -asection *input_section; -{ - int word = bfd_get_32(abfd, data+reloc_entry->address); - aout_symbol_type *symbol = aout_symbol(symbol_in); - if (IS_OTHER(symbol->other)) { - /* Call to a system procedure - replace code with system - procedure number - */ +/* Magic to turn call into callj. */ - word = CALLS | (symbol->other - 1); - bfd_put_32(abfd, word, data+reloc_entry->address); /* replace */ - return bfd_reloc_ok; - } - - if (IS_CALLNAME(symbol->other)) { - aout_symbol_type *balsym = symbol+1; - /* The next symbol should be an N_BALNAME */ - BFD_ASSERT(IS_BALNAME(balsym->other)); - - /* We are calling a leaf - so replace the call instruction - with a bal */ - - word = BAL | - (((word & BAL_MASK) + - balsym->symbol.section->output_offset + - balsym->symbol.section->output_section->vma+ - balsym->symbol.value + reloc_entry->addend - - ( input_section->output_section->vma + input_section->output_offset)) - & BAL_MASK); - - bfd_put_32(abfd, word, data+reloc_entry->address); /* replace */ - return bfd_reloc_ok; - } - return bfd_reloc_continue; +static bfd_reloc_status_type +callj_callback (abfd, link_info, reloc_entry, data, srcidx, dstidx, + input_section, shrinking) + bfd *abfd; + struct bfd_link_info *link_info; + arelent *reloc_entry; + PTR data; + unsigned int srcidx; + unsigned int dstidx; + asection *input_section; + bfd_boolean shrinking; +{ + int word = bfd_get_32 (abfd, (bfd_byte *) data + srcidx); + asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr); + aout_symbol_type *symbol = aout_symbol (symbol_in); + bfd_vma value; + value = get_value (reloc_entry, link_info, input_section); + + if (IS_OTHER(symbol->other)) + { + /* Call to a system procedure - replace code with system + procedure number. */ + word = CALLS | (symbol->other - 1); + } + else if (IS_CALLNAME(symbol->other)) + { + aout_symbol_type *balsym = symbol+1; + + /* The next symbol should be an N_BALNAME. */ + BFD_ASSERT(IS_BALNAME(balsym->other)); + + /* We are calling a leaf, so replace the call instruction with a + bal. */ + word = BAL | ((word + + output_addr (balsym->symbol.section) + + balsym->symbol.value + reloc_entry->addend + - dstidx + - output_addr (input_section)) + & BAL_MASK); + } + else if ((symbol->symbol.flags & BSF_SECTION_SYM) != 0) + { + /* A callj against a symbol in the same section is a fully + resolved relative call. We don't need to do anything here. + If the symbol is not in the same section, I'm not sure what + to do; fortunately, this case will probably never arise. */ + BFD_ASSERT (! shrinking); + BFD_ASSERT (symbol->symbol.section == input_section); + } + else + { + word = CALL | (((word & BAL_MASK) + + value + + reloc_entry->addend + - (shrinking ? dstidx : 0) + - output_addr (input_section)) + & BAL_MASK); + } + bfd_put_32 (abfd, (bfd_vma) word, (bfd_byte *) data + dstidx); + return bfd_reloc_ok; } -/* type rshift size bitsize pcrel bitpos absolute overflow check*/ +/* type rshift size bitsize pcrel bitpos absolute overflow check*/ +#define ABS32CODE 0 +#define ABS32CODE_SHRUNK 1 +#define PCREL24 2 +#define CALLJ 3 +#define ABS32 4 +#define PCREL13 5 +#define ABS32_MAYBE_RELAXABLE 1 +#define ABS32_WAS_RELAXABLE 2 + +#define ALIGNER 10 +#define ALIGNDONE 11 static reloc_howto_type howto_reloc_callj = -HOWTO( 3, 0, 2, 24, true, 0, true, true, callj_callback,"callj", true, 0x00ffffff, 0x00ffffff,false); +HOWTO(CALLJ, 0, 2, 24, TRUE, 0, complain_overflow_signed, 0,"callj", TRUE, 0x00ffffff, 0x00ffffff,FALSE); static reloc_howto_type howto_reloc_abs32 = -HOWTO(1, 0, 2, 32, false, 0, true, true,0,"abs32", true, 0xffffffff,0xffffffff,false); +HOWTO(ABS32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,"abs32", TRUE, 0xffffffff,0xffffffff,FALSE); static reloc_howto_type howto_reloc_pcrel24 = -HOWTO(2, 0, 2, 24, true, 0, true, true,0,"pcrel24", true, 0x00ffffff,0x00ffffff,false); +HOWTO(PCREL24, 0, 2, 24, TRUE, 0, complain_overflow_signed,0,"pcrel24", TRUE, 0x00ffffff,0x00ffffff,FALSE); -/* Allocate enough room for all the reloc entries, plus pointers to them all */ +static reloc_howto_type howto_reloc_pcrel13 = +HOWTO(PCREL13, 0, 2, 13, TRUE, 0, complain_overflow_signed,0,"pcrel13", TRUE, 0x00001fff,0x00001fff,FALSE); + +static reloc_howto_type howto_reloc_abs32codeshrunk = +HOWTO(ABS32CODE_SHRUNK, 0, 2, 24, TRUE, 0, complain_overflow_signed, 0,"callx->callj", TRUE, 0x00ffffff, 0x00ffffff,FALSE); + +static reloc_howto_type howto_reloc_abs32code = +HOWTO(ABS32CODE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,"callx", TRUE, 0xffffffff,0xffffffff,FALSE); + +static reloc_howto_type howto_align_table[] = { + HOWTO (ALIGNER, 0, 0x1, 0, FALSE, 0, complain_overflow_dont, 0, "align16", FALSE, 0, 0, FALSE), + HOWTO (ALIGNER, 0, 0x3, 0, FALSE, 0, complain_overflow_dont, 0, "align32", FALSE, 0, 0, FALSE), + HOWTO (ALIGNER, 0, 0x7, 0, FALSE, 0, complain_overflow_dont, 0, "align64", FALSE, 0, 0, FALSE), + HOWTO (ALIGNER, 0, 0xf, 0, FALSE, 0, complain_overflow_dont, 0, "align128", FALSE, 0, 0, FALSE), +}; -static boolean +static reloc_howto_type howto_done_align_table[] = { + HOWTO (ALIGNDONE, 0x1, 0x1, 0, FALSE, 0, complain_overflow_dont, 0, "donealign16", FALSE, 0, 0, FALSE), + HOWTO (ALIGNDONE, 0x3, 0x3, 0, FALSE, 0, complain_overflow_dont, 0, "donealign32", FALSE, 0, 0, FALSE), + HOWTO (ALIGNDONE, 0x7, 0x7, 0, FALSE, 0, complain_overflow_dont, 0, "donealign64", FALSE, 0, 0, FALSE), + HOWTO (ALIGNDONE, 0xf, 0xf, 0, FALSE, 0, complain_overflow_dont, 0, "donealign128", FALSE, 0, 0, FALSE), +}; + +static reloc_howto_type * +b_out_bfd_reloc_type_lookup (abfd, code) + bfd *abfd ATTRIBUTE_UNUSED; + bfd_reloc_code_real_type code; +{ + switch (code) + { + default: + return 0; + case BFD_RELOC_I960_CALLJ: + return &howto_reloc_callj; + case BFD_RELOC_32: + case BFD_RELOC_CTOR: + return &howto_reloc_abs32; + case BFD_RELOC_24_PCREL: + return &howto_reloc_pcrel24; + } +} + +/* Allocate enough room for all the reloc entries, plus pointers to them all. */ + +static bfd_boolean b_out_slurp_reloc_table (abfd, asect, symbols) bfd *abfd; sec_ptr asect; asymbol **symbols; { + register struct relocation_info *rptr; + unsigned int counter; + arelent *cache_ptr; + int extern_mask, pcrel_mask, callj_mask, length_shift; + int incode_mask; + int size_mask; + bfd_vma prev_addr = 0; unsigned int count; - size_t reloc_size; + bfd_size_type reloc_size, amt; struct relocation_info *relocs; arelent *reloc_cache; - if (asect->relocation) return true; - if (!aout_32_slurp_symbol_table (abfd)) return false; + if (asect->relocation) + return TRUE; - if (asect == obj_datasec (abfd)) { - reloc_size = exec_hdr(abfd)->a_drsize; - goto doit; - } + if (!aout_32_slurp_symbol_table (abfd)) + return FALSE; - if (asect == obj_textsec (abfd)) { - reloc_size = exec_hdr(abfd)->a_trsize; - goto doit; - } + if (asect == obj_datasec (abfd)) + { + reloc_size = exec_hdr(abfd)->a_drsize; + goto doit; + } - bfd_error = invalid_operation; - return false; + if (asect == obj_textsec (abfd)) + { + reloc_size = exec_hdr(abfd)->a_trsize; + goto doit; + } + + if (asect == obj_bsssec (abfd)) + { + reloc_size = 0; + goto doit; + } + + bfd_set_error (bfd_error_invalid_operation); + return FALSE; doit: - bfd_seek (abfd, (long)(asect->rel_filepos), SEEK_SET); + if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0) + return FALSE; count = reloc_size / sizeof (struct relocation_info); - relocs = (struct relocation_info *) malloc (reloc_size); - if (!relocs) { - bfd_error = no_memory; - return false; - } - reloc_cache = (arelent *) malloc ((count+1) * sizeof (arelent)); - if (!reloc_cache) { - free ((char*)relocs); - bfd_error = no_memory; - return false; - } + relocs = (struct relocation_info *) bfd_malloc (reloc_size); + if (!relocs && reloc_size != 0) + return FALSE; - if (bfd_read ((PTR) relocs, 1, reloc_size, abfd) != reloc_size) { - bfd_error = system_call_error; - free (reloc_cache); - free (relocs); - return false; - } + amt = ((bfd_size_type) count + 1) * sizeof (arelent); + reloc_cache = (arelent *) bfd_malloc (amt); + if (!reloc_cache) + { + if (relocs != NULL) + free (relocs); + return FALSE; + } - { - register struct relocation_info *rptr = relocs; - unsigned int counter = 0; - arelent *cache_ptr = reloc_cache; - int extern_mask, pcrel_mask, callj_mask; - - if (abfd->xvec->header_byteorder_big_p) { - /* Big-endian bit field allocation order */ + if (bfd_bread ((PTR) relocs, reloc_size, abfd) != reloc_size) + { + free (reloc_cache); + if (relocs != NULL) + free (relocs); + return FALSE; + } + + if (bfd_header_big_endian (abfd)) + { + /* Big-endian bit field allocation order. */ pcrel_mask = 0x80; extern_mask = 0x10; + incode_mask = 0x08; callj_mask = 0x02; - } else { - /* Little-endian bit field allocation order */ + size_mask = 0x20; + length_shift = 5; + } + else + { + /* Little-endian bit field allocation order. */ pcrel_mask = 0x01; extern_mask = 0x08; + incode_mask = 0x10; callj_mask = 0x40; + size_mask = 0x02; + length_shift = 1; } - for (; counter < count; counter++, rptr++, cache_ptr++) - { - unsigned char *raw = (unsigned char *)rptr; - unsigned int symnum; - cache_ptr->address = bfd_h_get_32 (abfd, raw + 0); - if (abfd->xvec->header_byteorder_big_p) { - symnum = (raw[4] << 16) | (raw[5] << 8) | raw[6]; - } else { - symnum = (raw[6] << 16) | (raw[5] << 8) | raw[4]; - } + for (rptr = relocs, cache_ptr = reloc_cache, counter = 0; + counter < count; + counter++, rptr++, cache_ptr++) + { + unsigned char *raw = (unsigned char *)rptr; + unsigned int symnum; + + cache_ptr->address = H_GET_32 (abfd, raw + 0); + cache_ptr->howto = 0; + + if (bfd_header_big_endian (abfd)) + symnum = (raw[4] << 16) | (raw[5] << 8) | raw[6]; + else + symnum = (raw[6] << 16) | (raw[5] << 8) | raw[4]; - if (raw[7] & extern_mask) { - /* If this is set then the r_index is a index into the symbol table; - * if the bit is not set then r_index contains a section map. - * We either fill in the sym entry with a pointer to the symbol, - * or point to the correct section - */ - cache_ptr->sym_ptr_ptr = symbols + symnum; - cache_ptr->addend = 0; - cache_ptr->section = (asection*)NULL; - } else { - /* In a.out symbols are relative to the beginning of the - * file rather than sections ? - * (look in translate_from_native_sym_flags) - * The reloc entry addend has added to it the offset into the - * file of the data, so subtract the base to make the reloc - * section relative */ - cache_ptr->sym_ptr_ptr = (asymbol **)NULL; - switch (symnum) { + if (raw[7] & extern_mask) + { + /* If this is set then the r_index is an index into the symbol table; + if the bit is not set then r_index contains a section map. + We either fill in the sym entry with a pointer to the symbol, + or point to the correct section. */ + cache_ptr->sym_ptr_ptr = symbols + symnum; + cache_ptr->addend = 0; + } + else + { + /* In a.out symbols are relative to the beginning of the + file rather than sections ? + (look in translate_from_native_sym_flags) + The reloc entry addend has added to it the offset into the + file of the data, so subtract the base to make the reloc + section relative. */ + int s; + + /* Sign-extend symnum from 24 bits to whatever host uses. */ + s = symnum; + if (s & (1 << 23)) + s |= (~0) << 24; + + cache_ptr->sym_ptr_ptr = (asymbol **)NULL; + switch (s) + { case N_TEXT: case N_TEXT | N_EXT: - cache_ptr->section = obj_textsec(abfd); - cache_ptr->addend = -obj_textsec(abfd)->vma; + cache_ptr->sym_ptr_ptr = obj_textsec (abfd)->symbol_ptr_ptr; + cache_ptr->addend = - obj_textsec (abfd)->vma; break; case N_DATA: case N_DATA | N_EXT: - cache_ptr->section = obj_datasec(abfd); - cache_ptr->addend = - obj_datasec(abfd)->vma; + cache_ptr->sym_ptr_ptr = obj_datasec (abfd)->symbol_ptr_ptr; + cache_ptr->addend = - obj_datasec (abfd)->vma; break; case N_BSS: case N_BSS | N_EXT: - cache_ptr->section = obj_bsssec(abfd); - cache_ptr->addend = - obj_bsssec(abfd)->vma; + cache_ptr->sym_ptr_ptr = obj_bsssec (abfd)->symbol_ptr_ptr; + cache_ptr->addend = - obj_bsssec (abfd)->vma; break; case N_ABS: case N_ABS | N_EXT: - BFD_ASSERT(0); + cache_ptr->sym_ptr_ptr = obj_bsssec (abfd)->symbol_ptr_ptr; + cache_ptr->addend = 0; + break; + case -2: /* .align */ + if (raw[7] & pcrel_mask) + { + cache_ptr->howto = &howto_align_table[(raw[7] >> length_shift) & 3]; + cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; + } + else + { + /* .org? */ + abort (); + } + cache_ptr->addend = 0; break; default: BFD_ASSERT(0); break; } - - } + } - /* The i960 only has a few relocation types: - abs 32-bit and pcrel 24bit. Except for callj's! */ - if (raw[7] & callj_mask) - cache_ptr->howto = &howto_reloc_callj; - else if ( raw[7] & pcrel_mask) + /* The i960 only has a few relocation types: + abs 32-bit and pcrel 24bit. except for callj's! */ + if (cache_ptr->howto != 0) + ; + else if (raw[7] & callj_mask) + { + cache_ptr->howto = &howto_reloc_callj; + } + else if ( raw[7] & pcrel_mask) + { + if (raw[7] & size_mask) + cache_ptr->howto = &howto_reloc_pcrel13; + else cache_ptr->howto = &howto_reloc_pcrel24; + } + else + { + if (raw[7] & incode_mask) + cache_ptr->howto = &howto_reloc_abs32code; else cache_ptr->howto = &howto_reloc_abs32; } + + if (cache_ptr->address < prev_addr) + { + /* Ouch! this reloc is out of order, insert into the right place. */ + arelent tmp; + arelent *cursor = cache_ptr-1; + bfd_vma stop = cache_ptr->address; + + tmp = *cache_ptr; + while (cursor->address > stop && cursor >= reloc_cache) + { + cursor[1] = cursor[0]; + cursor--; + } + + cursor[1] = tmp; + } + else + { + prev_addr = cache_ptr->address; + } } - free (relocs); + if (relocs != NULL) + free (relocs); asect->relocation = reloc_cache; asect->reloc_count = count; - return true; -} + return TRUE; +} -static boolean +static bfd_boolean b_out_squirt_out_relocs (abfd, section) bfd *abfd; asection *section; { arelent **generic; - + int r_extern = 0; + int r_idx; + int incode_mask; + int len_1; unsigned int count = section->reloc_count; struct relocation_info *native, *natptr; - size_t natsize = count * sizeof (struct relocation_info); - int extern_mask, pcrel_mask, len_2, callj_mask; - if (count == 0) return true; - generic = section->orelocation; - native = ((struct relocation_info *) malloc (natsize)); - if (!native) { - bfd_error = no_memory; - return false; - } + bfd_size_type natsize; + int extern_mask, pcrel_mask, len_2, callj_mask; + + if (count == 0) + return TRUE; - if (abfd->xvec->header_byteorder_big_p) { - /* Big-endian bit field allocation order */ - pcrel_mask = 0x80; - extern_mask = 0x10; - len_2 = 0x40; + generic = section->orelocation; + natsize = (bfd_size_type) count * sizeof (struct relocation_info); + native = ((struct relocation_info *) bfd_malloc (natsize)); + if (!native && natsize != 0) + return FALSE; + + if (bfd_header_big_endian (abfd)) + { + /* Big-endian bit field allocation order. */ + pcrel_mask = 0x80; + extern_mask = 0x10; + len_2 = 0x40; + len_1 = 0x20; callj_mask = 0x02; - } else { - /* Little-endian bit field allocation order */ - pcrel_mask = 0x01; - extern_mask = 0x08; - len_2 = 0x04; + incode_mask = 0x08; + } + else + { + /* Little-endian bit field allocation order. */ + pcrel_mask = 0x01; + extern_mask = 0x08; + len_2 = 0x04; + len_1 = 0x02; callj_mask = 0x40; - } + incode_mask = 0x10; + } - for (natptr = native; count > 0; --count, ++natptr, ++generic) + for (natptr = native; count > 0; --count, ++natptr, ++generic) { arelent *g = *generic; unsigned char *raw = (unsigned char *)natptr; - unsigned int symnum; + asymbol *sym = *(g->sym_ptr_ptr); + asection *output_section = sym->section->output_section; - bfd_h_put_32(abfd, g->address, raw); - /* Find a type in the output format which matches the input howto - - * at the moment we assume input format == output format FIXME!! - */ + H_PUT_32 (abfd, g->address, raw); + /* Find a type in the output format which matches the input howto - + at the moment we assume input format == output format FIXME!! */ + r_idx = 0; /* FIXME: Need callj stuff here, and to check the howto entries to be sure they are real for this architecture. */ - if (g->howto== &howto_reloc_callj) { + if (g->howto== &howto_reloc_callj) raw[7] = callj_mask + pcrel_mask + len_2; - } - else if (g->howto == &howto_reloc_pcrel24) { - raw[7] = pcrel_mask +len_2; - } - else { - raw[7] = len_2; - } - if (g->sym_ptr_ptr != (asymbol **)NULL) + else if (g->howto == &howto_reloc_pcrel24) + raw[7] = pcrel_mask + len_2; + else if (g->howto == &howto_reloc_pcrel13) + raw[7] = pcrel_mask + len_1; + else if (g->howto == &howto_reloc_abs32code) + raw[7] = len_2 + incode_mask; + else if (g->howto >= howto_align_table + && g->howto <= (howto_align_table + + sizeof (howto_align_table) / sizeof (howto_align_table[0]) + - 1)) { - /* name clobbered by aout_write_syms to be symbol index*/ - if ((*(g->sym_ptr_ptr))->section) { - /* replace the section offset into the addent */ - g->addend += (*(g->sym_ptr_ptr))->section->vma ; - } - symnum = stoi((*(g->sym_ptr_ptr))->name); - raw[7] |= extern_mask; - BFD_ASSERT(g->addend == 0); - } - else { - if (g->section == (asection *)NULL) { - symnum = N_ABS; - BFD_ASSERT(0); + /* symnum == -2; extern_mask not set, pcrel_mask set. */ + r_idx = -2; + r_extern = 0; + raw[7] = (pcrel_mask + | ((g->howto - howto_align_table) << 1)); } - else if(g->section->output_section == obj_textsec(abfd)) { - symnum = N_TEXT; - BFD_ASSERT(g->addend + obj_textsec(abfd)->vma == 0); + else + raw[7] = len_2; + + if (r_idx != 0) + /* Already mucked with r_extern, r_idx. */; + else if (bfd_is_com_section (output_section) + || bfd_is_abs_section (output_section) + || bfd_is_und_section (output_section)) + { + if (bfd_abs_section_ptr->symbol == sym) + { + /* Whoops, looked like an abs symbol, but is really an offset + from the abs section. */ + r_idx = 0; + r_extern = 0; + } + else + { + /* Fill in symbol. */ + r_extern = 1; + r_idx = (*g->sym_ptr_ptr)->udata.i; + } } - else if (g->section->output_section == obj_datasec(abfd)) { - symnum = N_DATA; - BFD_ASSERT(g->addend + obj_datasec(abfd)->vma == 0); + else + { + /* Just an ordinary section. */ + r_extern = 0; + r_idx = output_section->target_index; } - else if (g->section->output_section == obj_bsssec(abfd)) { - symnum = N_BSS; - BFD_ASSERT(g->addend + obj_bsssec(abfd)->vma == 0); + + if (bfd_header_big_endian (abfd)) + { + raw[4] = (unsigned char) (r_idx >> 16); + raw[5] = (unsigned char) (r_idx >> 8); + raw[6] = (unsigned char) (r_idx ); } - else { - BFD_ASSERT(0); - symnum = N_ABS; + else + { + raw[6] = (unsigned char) (r_idx >> 16); + raw[5] = (unsigned char) (r_idx>> 8); + raw[4] = (unsigned char) (r_idx ); } - } - if (abfd->xvec->header_byteorder_big_p) { - raw[4] = (unsigned char) (symnum >> 16); - raw[5] = (unsigned char) (symnum >> 8); - raw[6] = (unsigned char) (symnum ); - } else { - raw[6] = (unsigned char) (symnum >> 16); - raw[5] = (unsigned char) (symnum >> 8); - raw[4] = (unsigned char) (symnum ); - } + + if (r_extern) + raw[7] |= extern_mask; + } + + if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize) + { + free ((PTR)native); + return FALSE; } - if (bfd_write ((PTR) native, 1, natsize, abfd) != natsize) { - free((PTR)native); - return false; - } free ((PTR)native); - return true; + return TRUE; } -/* This is stupid. This function should be a boolean predicate */ -static unsigned int +/* This is stupid. This function should be a boolean predicate. */ + +static long b_out_canonicalize_reloc (abfd, section, relptr, symbols) bfd *abfd; sec_ptr section; arelent **relptr; asymbol **symbols; { - arelent *tblptr = section->relocation; - unsigned int count = 0; + arelent *tblptr; + unsigned int count; - if (!(tblptr || b_out_slurp_reloc_table (abfd, section, symbols))) return 0; - tblptr = section->relocation; - if (!tblptr) return 0; + if ((section->flags & SEC_CONSTRUCTOR) != 0) + { + arelent_chain *chain = section->constructor_chain; - for (; count++ < section->reloc_count;) - *relptr++ = tblptr++; + for (count = 0; count < section->reloc_count; count++) + { + *relptr++ = &chain->relent; + chain = chain->next; + } + } + else + { + if (section->relocation == NULL + && ! b_out_slurp_reloc_table (abfd, section, symbols)) + return -1; - *relptr = 0; + tblptr = section->relocation; + for (count = 0; count++ < section->reloc_count;) + *relptr++ = tblptr++; + } + + *relptr = NULL; return section->reloc_count; } -static unsigned int +static long b_out_get_reloc_upper_bound (abfd, asect) bfd *abfd; sec_ptr asect; { - if (bfd_get_format (abfd) != bfd_object) { - bfd_error = invalid_operation; - return 0; - } + if (bfd_get_format (abfd) != bfd_object) + { + bfd_set_error (bfd_error_invalid_operation); + return -1; + } + + if (asect->flags & SEC_CONSTRUCTOR) + return sizeof (arelent *) * (asect->reloc_count + 1); if (asect == obj_datasec (abfd)) return (sizeof (arelent *) * @@ -601,40 +971,44 @@ b_out_get_reloc_upper_bound (abfd, asect) ((exec_hdr(abfd)->a_trsize / sizeof (struct relocation_info)) +1)); - bfd_error = invalid_operation; - return 0; + if (asect == obj_bsssec (abfd)) + return 0; + + bfd_set_error (bfd_error_invalid_operation); + return -1; } + -static boolean +static bfd_boolean b_out_set_section_contents (abfd, section, location, offset, count) bfd *abfd; - sec_ptr section; - unsigned char *location; + asection *section; + PTR location; file_ptr offset; - int count; + bfd_size_type count; { - if (abfd->output_has_begun == false) { /* set by bfd.c handler */ - if ((obj_textsec (abfd) == NULL) || (obj_datasec (abfd) == NULL) /*|| - (obj_textsec (abfd)->size == 0) || (obj_datasec (abfd)->size == 0)*/) { - bfd_error = invalid_operation; - return false; + if (! abfd->output_has_begun) + { + /* Set by bfd.c handler. */ + if (! aout_32_make_sections (abfd)) + return FALSE; + + obj_textsec (abfd)->filepos = sizeof (struct internal_exec); + obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos + + obj_textsec (abfd)->_raw_size; } - obj_textsec (abfd)->filepos = sizeof(struct internal_exec); - obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos - + obj_textsec (abfd)->size; + /* Regardless, once we know what we're doing, we might as well get going. */ + if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0) + return FALSE; - } - /* regardless, once we know what we're doing, we might as well get going */ - bfd_seek (abfd, section->filepos + offset, SEEK_SET); + if (count == 0) + return TRUE; - if (count != 0) { - return (bfd_write ((PTR)location, 1, count, abfd) == count) ?true:false; - } - return false; + return bfd_bwrite ((PTR) location, count, abfd) == count; } -static boolean +static bfd_boolean b_out_set_arch_mach (abfd, arch, machine) bfd *abfd; enum bfd_architecture arch; @@ -642,113 +1016,564 @@ b_out_set_arch_mach (abfd, arch, machine) { bfd_default_set_arch_mach(abfd, arch, machine); - if (arch == bfd_arch_unknown) /* Unknown machine arch is OK */ - return true; - if (arch == bfd_arch_i960) /* i960 default is OK */ - switch (machine) { - case bfd_mach_i960_core: - case bfd_mach_i960_kb_sb: - case bfd_mach_i960_mc: - case bfd_mach_i960_xa: - case bfd_mach_i960_ca: - case bfd_mach_i960_ka_sa: - case 0: - return true; - default: - return false; + if (arch == bfd_arch_unknown) /* Unknown machine arch is OK. */ + return TRUE; + + if (arch == bfd_arch_i960) /* i960 default is OK. */ + switch (machine) + { + case bfd_mach_i960_core: + case bfd_mach_i960_kb_sb: + case bfd_mach_i960_mc: + case bfd_mach_i960_xa: + case bfd_mach_i960_ca: + case bfd_mach_i960_ka_sa: + case bfd_mach_i960_jx: + case bfd_mach_i960_hx: + case 0: + return TRUE; + default: + return FALSE; + } + + return FALSE; +} + +static int +b_out_sizeof_headers (ignore_abfd, ignore) + bfd *ignore_abfd ATTRIBUTE_UNUSED; + bfd_boolean ignore ATTRIBUTE_UNUSED; +{ + return sizeof (struct internal_exec); +} + + +static bfd_vma +get_value (reloc, link_info, input_section) + arelent *reloc; + struct bfd_link_info *link_info; + asection *input_section; +{ + bfd_vma value; + asymbol *symbol = *(reloc->sym_ptr_ptr); + + /* A symbol holds a pointer to a section, and an offset from the + base of the section. To relocate, we find where the section will + live in the output and add that in. */ + if (bfd_is_und_section (symbol->section)) + { + struct bfd_link_hash_entry *h; + + /* The symbol is undefined in this BFD. Look it up in the + global linker hash table. FIXME: This should be changed when + we convert b.out to use a specific final_link function and + change the interface to bfd_relax_section to not require the + generic symbols. */ + h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info, + bfd_asymbol_name (symbol), + FALSE, FALSE, TRUE); + if (h != (struct bfd_link_hash_entry *) NULL + && (h->type == bfd_link_hash_defined + || h->type == bfd_link_hash_defweak)) + value = h->u.def.value + output_addr (h->u.def.section); + else if (h != (struct bfd_link_hash_entry *) NULL + && h->type == bfd_link_hash_common) + value = h->u.c.size; + else + { + if (! ((*link_info->callbacks->undefined_symbol) + (link_info, bfd_asymbol_name (symbol), + input_section->owner, input_section, reloc->address, + TRUE))) + abort (); + value = 0; + } + } + else + { + value = symbol->value + output_addr (symbol->section); } - return false; + /* Add the value contained in the relocation. */ + value += reloc->addend; + + return value; } -static int -DEFUN(b_out_sizeof_headers,(ignore_abfd, ignore), - bfd *ignore_abfd AND - boolean ignore) +static void +perform_slip (abfd, slip, input_section, value) + bfd *abfd; + unsigned int slip; + asection *input_section; + bfd_vma value; { - return sizeof(struct internal_exec); + asymbol **s; + + s = _bfd_generic_link_get_symbols (abfd); + BFD_ASSERT (s != (asymbol **) NULL); + + /* Find all symbols past this point, and make them know + what's happened. */ + while (*s) + { + asymbol *p = *s; + + if (p->section == input_section) + { + /* This was pointing into this section, so mangle it. */ + if (p->value > value) + { + p->value -=slip; + + if (p->udata.p != NULL) + { + struct generic_link_hash_entry *h; + + h = (struct generic_link_hash_entry *) p->udata.p; + BFD_ASSERT (h->root.type == bfd_link_hash_defined); + h->root.u.def.value -= slip; + BFD_ASSERT (h->root.u.def.value == p->value); + } + } + } + s++; + } } +/* This routine works out if the thing we want to get to can be + reached with a 24bit offset instead of a 32 bit one. + If it can, then it changes the amode. */ + +static int +abs32code (abfd, input_section, r, shrink, link_info) + bfd *abfd; + asection *input_section; + arelent *r; + unsigned int shrink; + struct bfd_link_info *link_info; +{ + bfd_vma value = get_value (r, link_info, input_section); + bfd_vma dot = output_addr (input_section) + r->address; + bfd_vma gap; + /* See if the address we're looking at within 2^23 bytes of where + we are, if so then we can use a small branch rather than the + jump we were going to. */ + gap = value - (dot - shrink); + + if (-1 << 23 < (long)gap && (long)gap < 1 << 23) + { + /* Change the reloc type from 32bitcode possible 24, to 24bit + possible 32. */ + r->howto = &howto_reloc_abs32codeshrunk; + /* The place to relc moves back by four bytes. */ + r->address -=4; + + /* This will be four bytes smaller in the long run. */ + shrink += 4 ; + perform_slip (abfd, 4, input_section, r->address-shrink + 4); + } + + return shrink; +} + +static int +aligncode (abfd, input_section, r, shrink) + bfd *abfd; + asection *input_section; + arelent *r; + unsigned int shrink; +{ + bfd_vma dot = output_addr (input_section) + r->address; + bfd_vma gap; + bfd_vma old_end; + bfd_vma new_end; + unsigned int shrink_delta; + int size = r->howto->size; + /* Reduce the size of the alignment so that it's still aligned but + smaller - the current size is already the same size as or bigger + than the alignment required. */ + + /* Calculate the first byte following the padding before we optimize. */ + old_end = ((dot + size ) & ~size) + size+1; + /* Work out where the new end will be - remember that we're smaller + than we used to be. */ + new_end = ((dot - shrink + size) & ~size); + + /* This is the new end. */ + gap = old_end - ((dot + size) & ~size); + + shrink_delta = (old_end - new_end) - shrink; + + if (shrink_delta) + { + /* Change the reloc so that it knows how far to align to. */ + r->howto = howto_done_align_table + (r->howto - howto_align_table); + + /* Encode the stuff into the addend - for future use we need to + know how big the reloc used to be. */ + r->addend = old_end - dot + r->address; + + /* This will be N bytes smaller in the long run, adjust all the symbols. */ + perform_slip (abfd, shrink_delta, input_section, r->address - shrink); + shrink += shrink_delta; + } + + return shrink; +} + +static bfd_boolean +b_out_bfd_relax_section (abfd, i, link_info, again) + bfd *abfd; + asection *i; + struct bfd_link_info *link_info; + bfd_boolean *again; +{ + /* Get enough memory to hold the stuff. */ + bfd *input_bfd = i->owner; + asection *input_section = i; + unsigned int shrink = 0 ; + arelent **reloc_vector = NULL; + long reloc_size = bfd_get_reloc_upper_bound (input_bfd, + input_section); + + if (reloc_size < 0) + return FALSE; + + /* We only run this relaxation once. It might work to run it + multiple times, but it hasn't been tested. */ + *again = FALSE; + + if (reloc_size) + { + long reloc_count; + + reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size); + if (reloc_vector == NULL && reloc_size != 0) + goto error_return; + + /* Get the relocs and think about them. */ + reloc_count = + bfd_canonicalize_reloc (input_bfd, input_section, reloc_vector, + _bfd_generic_link_get_symbols (input_bfd)); + if (reloc_count < 0) + goto error_return; + if (reloc_count > 0) + { + arelent **parent; + + for (parent = reloc_vector; *parent; parent++) + { + arelent *r = *parent; + + switch (r->howto->type) + { + case ALIGNER: + /* An alignment reloc. */ + shrink = aligncode (abfd, input_section, r, shrink); + break; + case ABS32CODE: + /* A 32bit reloc in an addressing mode. */ + shrink = abs32code (input_bfd, input_section, r, shrink, + link_info); + break; + case ABS32CODE_SHRUNK: + shrink += 4; + break; + } + } + } + } + input_section->_cooked_size = input_section->_raw_size - shrink; + + if (reloc_vector != NULL) + free (reloc_vector); + return TRUE; + error_return: + if (reloc_vector != NULL) + free (reloc_vector); + return FALSE; +} + +static bfd_byte * +b_out_bfd_get_relocated_section_contents (output_bfd, link_info, link_order, + data, relocateable, symbols) + bfd *output_bfd; + struct bfd_link_info *link_info; + struct bfd_link_order *link_order; + bfd_byte *data; + bfd_boolean relocateable; + asymbol **symbols; +{ + /* Get enough memory to hold the stuff. */ + bfd *input_bfd = link_order->u.indirect.section->owner; + asection *input_section = link_order->u.indirect.section; + long reloc_size = bfd_get_reloc_upper_bound (input_bfd, + input_section); + arelent **reloc_vector = NULL; + long reloc_count; + + if (reloc_size < 0) + goto error_return; + + /* If producing relocateable output, don't bother to relax. */ + if (relocateable) + return bfd_generic_get_relocated_section_contents (output_bfd, link_info, + link_order, + data, relocateable, + symbols); + + reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size); + if (reloc_vector == NULL && reloc_size != 0) + goto error_return; + + input_section->reloc_done = 1; + + /* Read in the section. */ + BFD_ASSERT (bfd_get_section_contents (input_bfd, + input_section, + data, + (bfd_vma) 0, + input_section->_raw_size)); + + reloc_count = bfd_canonicalize_reloc (input_bfd, + input_section, + reloc_vector, + symbols); + if (reloc_count < 0) + goto error_return; + if (reloc_count > 0) + { + arelent **parent = reloc_vector; + arelent *reloc ; + unsigned int dst_address = 0; + unsigned int src_address = 0; + unsigned int run; + unsigned int idx; + + /* Find how long a run we can do. */ + while (dst_address < link_order->size) + { + reloc = *parent; + if (reloc) + { + /* Note that the relaxing didn't tie up the addresses in the + relocation, so we use the original address to work out the + run of non-relocated data. */ + BFD_ASSERT (reloc->address >= src_address); + run = reloc->address - src_address; + parent++; + } + else + { + run = link_order->size - dst_address; + } + + /* Copy the bytes. */ + for (idx = 0; idx < run; idx++) + data[dst_address++] = data[src_address++]; + + /* Now do the relocation. */ + if (reloc) + { + switch (reloc->howto->type) + { + case ABS32CODE: + calljx_callback (input_bfd, link_info, reloc, + src_address + data, dst_address + data, + input_section); + src_address += 4; + dst_address += 4; + break; + case ABS32: + bfd_put_32 (input_bfd, + (bfd_get_32 (input_bfd, data + src_address) + + get_value (reloc, link_info, input_section)), + data + dst_address); + src_address += 4; + dst_address += 4; + break; + case CALLJ: + callj_callback (input_bfd, link_info, reloc, data, + src_address, dst_address, input_section, + FALSE); + src_address += 4; + dst_address += 4; + break; + case ALIGNDONE: + BFD_ASSERT (reloc->addend >= src_address); + BFD_ASSERT ((bfd_vma) reloc->addend + <= input_section->_raw_size); + src_address = reloc->addend; + dst_address = ((dst_address + reloc->howto->size) + & ~reloc->howto->size); + break; + case ABS32CODE_SHRUNK: + /* This used to be a callx, but we've found out that a + callj will reach, so do the right thing. */ + callj_callback (input_bfd, link_info, reloc, data, + src_address + 4, dst_address, input_section, + TRUE); + dst_address += 4; + src_address += 8; + break; + case PCREL24: + { + long int word = bfd_get_32 (input_bfd, + data + src_address); + bfd_vma value; + + value = get_value (reloc, link_info, input_section); + word = ((word & ~BAL_MASK) + | (((word & BAL_MASK) + + value + - output_addr (input_section) + + reloc->addend) + & BAL_MASK)); + + bfd_put_32 (input_bfd, (bfd_vma) word, data + dst_address); + dst_address += 4; + src_address += 4; + + } + break; + case PCREL13: + { + long int word = bfd_get_32 (input_bfd, + data + src_address); + bfd_vma value; + + value = get_value (reloc, link_info, input_section); + word = ((word & ~PCREL13_MASK) + | (((word & PCREL13_MASK) + + value + + reloc->addend + - output_addr (input_section)) + & PCREL13_MASK)); + + bfd_put_32 (input_bfd, (bfd_vma) word, data + dst_address); + dst_address += 4; + src_address += 4; + } + break; + + default: + abort (); + } + } + } + } + if (reloc_vector != NULL) + free (reloc_vector); + return data; + error_return: + if (reloc_vector != NULL) + free (reloc_vector); + return NULL; +} + /* Build the transfer vectors for Big and Little-Endian B.OUT files. */ -/* We don't have core files. */ -#define aout_32_core_file_failing_command _bfd_dummy_core_file_failing_command -#define aout_32_core_file_failing_signal _bfd_dummy_core_file_failing_signal -#define aout_32_core_file_matches_executable_p \ - _bfd_dummy_core_file_matches_executable_p - -/* We use BSD-Unix generic archive files. */ -#define aout_32_openr_next_archived_file bfd_generic_openr_next_archived_file -#define aout_32_generic_stat_arch_elt bfd_generic_stat_arch_elt -#define aout_32_slurp_armap bfd_slurp_bsd_armap -#define aout_32_slurp_extended_name_table bfd_true -#define aout_32_write_armap bsd_write_armap -#define aout_32_truncate_arname bfd_bsd_truncate_arname - -/* We override these routines from the usual a.out file routines. */ -#define aout_32_canonicalize_reloc b_out_canonicalize_reloc -#define aout_32_get_reloc_upper_bound b_out_get_reloc_upper_bound -#define aout_32_set_section_contents b_out_set_section_contents -#define aout_32_set_arch_mach b_out_set_arch_mach -#define aout_32_sizeof_headers b_out_sizeof_headers - -#define aout_32_bfd_debug_info_start bfd_void -#define aout_32_bfd_debug_info_end bfd_void -#define aout_32_bfd_debug_info_accumulate (PROTO(void,(*),(bfd*, struct sec *))) bfd_void - - -bfd_target b_out_vec_big_host = +#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info + +#define b_out_bfd_link_hash_table_create _bfd_generic_link_hash_table_create +#define b_out_bfd_link_hash_table_free _bfd_generic_link_hash_table_free +#define b_out_bfd_link_add_symbols _bfd_generic_link_add_symbols +#define b_out_bfd_link_just_syms _bfd_generic_link_just_syms +#define b_out_bfd_final_link _bfd_generic_final_link +#define b_out_bfd_link_split_section _bfd_generic_link_split_section +#define b_out_bfd_gc_sections bfd_generic_gc_sections +#define b_out_bfd_merge_sections bfd_generic_merge_sections +#define b_out_bfd_discard_group bfd_generic_discard_group + +#define aout_32_get_section_contents_in_window \ + _bfd_generic_get_section_contents_in_window + +extern const bfd_target b_out_vec_little_host; + +const bfd_target b_out_vec_big_host = { "b.out.big", /* name */ bfd_target_aout_flavour, - false, /* data byte order is little */ - true, /* hdr byte order is big */ + BFD_ENDIAN_LITTLE, /* data byte order is little */ + BFD_ENDIAN_BIG, /* hdr byte order is big */ (HAS_RELOC | EXEC_P | /* object flags */ HAS_LINENO | HAS_DEBUG | - HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT ), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ + HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ), + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA), + '_', /* symbol leading char */ ' ', /* ar_pad_char */ 16, /* ar_max_namelen */ - 2, /* minumum alignment power */ - -_do_getl64, _do_putl64, _do_getl32, _do_putl32, _do_getl16, _do_putl16, /* data */ -_do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* hdrs */ - {_bfd_dummy_target, b_out_big_object_p, /* bfd_check_format */ - bfd_generic_archive_p, _bfd_dummy_target}, - {bfd_false, b_out_mkobject, /* bfd_set_format */ - _bfd_generic_mkarchive, bfd_false}, - {bfd_false, b_out_write_object_contents, /* bfd_write_contents */ - _bfd_write_archive_contents, bfd_false}, - - JUMP_TABLE(aout_32) -}; + bfd_getl64, bfd_getl_signed_64, bfd_putl64, + bfd_getl32, bfd_getl_signed_32, bfd_putl32, + bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */ + bfd_getb64, bfd_getb_signed_64, bfd_putb64, + bfd_getb32, bfd_getb_signed_32, bfd_putb32, + bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */ + {_bfd_dummy_target, b_out_object_p, /* bfd_check_format */ + bfd_generic_archive_p, _bfd_dummy_target}, + {bfd_false, b_out_mkobject, /* bfd_set_format */ + _bfd_generic_mkarchive, bfd_false}, + {bfd_false, b_out_write_object_contents, /* bfd_write_contents */ + _bfd_write_archive_contents, bfd_false}, + + BFD_JUMP_TABLE_GENERIC (aout_32), + BFD_JUMP_TABLE_COPY (_bfd_generic), + BFD_JUMP_TABLE_CORE (_bfd_nocore), + BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd), + BFD_JUMP_TABLE_SYMBOLS (aout_32), + BFD_JUMP_TABLE_RELOCS (b_out), + BFD_JUMP_TABLE_WRITE (b_out), + BFD_JUMP_TABLE_LINK (b_out), + BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + + & b_out_vec_little_host, + + (PTR) 0, +}; -bfd_target b_out_vec_little_host = +const bfd_target b_out_vec_little_host = { "b.out.little", /* name */ bfd_target_aout_flavour, - false, /* data byte order is little */ - false, /* header byte order is little */ + BFD_ENDIAN_LITTLE, /* data byte order is little */ + BFD_ENDIAN_LITTLE, /* header byte order is little */ (HAS_RELOC | EXEC_P | /* object flags */ HAS_LINENO | HAS_DEBUG | - HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT ), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ + HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ), + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA), + '_', /* symbol leading char */ ' ', /* ar_pad_char */ 16, /* ar_max_namelen */ - 2, /* minum align */ -_do_getl64, _do_putl64, _do_getl32, _do_putl32, _do_getl16, _do_putl16, /* data */ -_do_getl64, _do_putl64, _do_getl32, _do_putl32, _do_getl16, _do_putl16, /* hdrs */ - - {_bfd_dummy_target, b_out_little_object_p, /* bfd_check_format */ - bfd_generic_archive_p, _bfd_dummy_target}, - {bfd_false, b_out_mkobject, /* bfd_set_format */ - _bfd_generic_mkarchive, bfd_false}, - {bfd_false, b_out_write_object_contents, /* bfd_write_contents */ - _bfd_write_archive_contents, bfd_false}, - JUMP_TABLE(aout_32) + bfd_getl64, bfd_getl_signed_64, bfd_putl64, + bfd_getl32, bfd_getl_signed_32, bfd_putl32, + bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */ + bfd_getl64, bfd_getl_signed_64, bfd_putl64, + bfd_getl32, bfd_getl_signed_32, bfd_putl32, + bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */ + + {_bfd_dummy_target, b_out_object_p, /* bfd_check_format */ + bfd_generic_archive_p, _bfd_dummy_target}, + {bfd_false, b_out_mkobject, /* bfd_set_format */ + _bfd_generic_mkarchive, bfd_false}, + {bfd_false, b_out_write_object_contents, /* bfd_write_contents */ + _bfd_write_archive_contents, bfd_false}, + + BFD_JUMP_TABLE_GENERIC (aout_32), + BFD_JUMP_TABLE_COPY (_bfd_generic), + BFD_JUMP_TABLE_CORE (_bfd_nocore), + BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd), + BFD_JUMP_TABLE_SYMBOLS (aout_32), + BFD_JUMP_TABLE_RELOCS (b_out), + BFD_JUMP_TABLE_WRITE (b_out), + BFD_JUMP_TABLE_LINK (b_out), + BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + + & b_out_vec_big_host, + + (PTR) 0 }; -