diff options
Diffstat (limited to 'bfd/pdp11.c')
| -rw-r--r-- | bfd/pdp11.c | 3009 |
1 files changed, 1300 insertions, 1709 deletions
diff --git a/bfd/pdp11.c b/bfd/pdp11.c index 1b4e95e..b7ac263 100644 --- a/bfd/pdp11.c +++ b/bfd/pdp11.c @@ -62,40 +62,40 @@ #define N_FLAGS(exec) 0 #define N_SET_FLAGS(exec, flags) do { } while (0) -#define N_BADMAG(x) (((x).a_info != OMAGIC) && \ - ((x).a_info != NMAGIC) && \ - ((x).a_info != A_MAGIC3) && \ - ((x).a_info != A_MAGIC4) && \ - ((x).a_info != A_MAGIC5) && \ - ((x).a_info != A_MAGIC6)) +#define N_BADMAG(x) (((x).a_info != OMAGIC) \ + && ((x).a_info != NMAGIC) \ + && ((x).a_info != A_MAGIC3) \ + && ((x).a_info != A_MAGIC4) \ + && ((x).a_info != A_MAGIC5) \ + && ((x).a_info != A_MAGIC6)) #include "bfd.h" #define external_exec pdp11_external_exec struct pdp11_external_exec - { - bfd_byte e_info[2]; /* magic number */ - bfd_byte e_text[2]; /* length of text section in bytes */ - bfd_byte e_data[2]; /* length of data section in bytes */ - bfd_byte e_bss[2]; /* length of bss area in bytes */ - bfd_byte e_syms[2]; /* length of symbol table in bytes */ - bfd_byte e_entry[2]; /* start address */ - bfd_byte e_unused[2]; /* not used */ - bfd_byte e_flag[2]; /* relocation info stripped */ - bfd_byte e_relocatable; /* ugly hack */ - }; +{ + bfd_byte e_info[2]; /* Magic number. */ + bfd_byte e_text[2]; /* Length of text section in bytes. */ + bfd_byte e_data[2]; /* Length of data section in bytes. */ + bfd_byte e_bss[2]; /* Length of bss area in bytes. */ + bfd_byte e_syms[2]; /* Length of symbol table in bytes. */ + bfd_byte e_entry[2]; /* Start address. */ + bfd_byte e_unused[2]; /* Not used. */ + bfd_byte e_flag[2]; /* Relocation info stripped. */ + bfd_byte e_relocatable; /* Ugly hack. */ +}; #define EXEC_BYTES_SIZE (8 * 2) #define A_MAGIC1 OMAGIC #define OMAGIC 0407 /* ...object file or impure executable. */ #define A_MAGIC2 NMAGIC -#define NMAGIC 0410 /* pure executable. */ -#define ZMAGIC 0413 /* demand-paged executable. */ -#define A_MAGIC3 0411 /* separated I&D */ -#define A_MAGIC4 0405 /* overlay */ -#define A_MAGIC5 0430 /* auto-overlay (nonseparate) */ -#define A_MAGIC6 0431 /* auto-overlay (separate) */ +#define NMAGIC 0410 /* Pure executable. */ +#define ZMAGIC 0413 /* Demand-paged executable. */ +#define A_MAGIC3 0411 /* Separated I&D. */ +#define A_MAGIC4 0405 /* Overlay. */ +#define A_MAGIC5 0430 /* Auto-overlay (nonseparate). */ +#define A_MAGIC6 0431 /* Auto-overlay (separate). */ #define QMAGIC 0 #define BMAGIC 0 @@ -103,13 +103,13 @@ struct pdp11_external_exec #define external_nlist pdp11_external_nlist struct pdp11_external_nlist - { - bfd_byte e_unused[2]; /* unused */ - bfd_byte e_strx[2]; /* index into string table of name */ - bfd_byte e_type[1]; /* type of symbol */ - bfd_byte e_ovly[1]; /* overlay number */ - bfd_byte e_value[2]; /* value of symbol */ - }; +{ + bfd_byte e_unused[2]; /* Unused. */ + bfd_byte e_strx[2]; /* Index into string table of name. */ + bfd_byte e_type[1]; /* Type of symbol. */ + bfd_byte e_ovly[1]; /* Overlay number. */ + bfd_byte e_value[2]; /* Value of symbol. */ +}; #define EXTERNAL_NLIST_SIZE 8 @@ -131,190 +131,23 @@ struct pdp11_external_nlist #define MY_entry_is_text_address 1 #define MY_write_object_contents MY(write_object_contents) -static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd)); +static bfd_boolean MY(write_object_contents) (bfd *); #define MY_text_includes_header 1 -static bfd_vma bfd_getp32 (const void *); -static bfd_signed_vma bfd_getp_signed_32 (const void *); -static void bfd_putp32 (bfd_vma, void *); - #define MY_BFD_TARGET #include "aout-target.h" -const bfd_target MY(vec) = -{ - TARGETNAME, /* name */ - bfd_target_aout_flavour, - BFD_ENDIAN_LITTLE, /* target byte order (little) */ - BFD_ENDIAN_LITTLE, /* target headers byte order (little) */ - (HAS_RELOC | EXEC_P | /* object flags */ - HAS_LINENO | HAS_DEBUG | - HAS_SYMS | HAS_LOCALS | WP_TEXT), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA), - MY_symbol_leading_char, - AR_PAD_CHAR, /* ar_pad_char */ - 15, /* ar_max_namelen */ - bfd_getl64, bfd_getl_signed_64, bfd_putl64, - bfd_getp32, bfd_getp_signed_32, bfd_putp32, - bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */ - bfd_getl64, bfd_getl_signed_64, bfd_putl64, - bfd_getp32, bfd_getp_signed_32, bfd_putp32, - bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */ - {_bfd_dummy_target, MY_object_p, /* bfd_check_format */ - bfd_generic_archive_p, MY_core_file_p}, - {bfd_false, MY_mkobject, /* bfd_set_format */ - _bfd_generic_mkarchive, bfd_false}, - {bfd_false, MY_write_object_contents, /* bfd_write_contents */ - _bfd_write_archive_contents, bfd_false}, - - BFD_JUMP_TABLE_GENERIC (MY), - BFD_JUMP_TABLE_COPY (MY), - BFD_JUMP_TABLE_CORE (MY), - BFD_JUMP_TABLE_ARCHIVE (MY), - BFD_JUMP_TABLE_SYMBOLS (MY), - BFD_JUMP_TABLE_RELOCS (MY), - BFD_JUMP_TABLE_WRITE (MY), - BFD_JUMP_TABLE_LINK (MY), - BFD_JUMP_TABLE_DYNAMIC (MY), - - /* Alternative_target */ - NULL, - - (PTR) MY_backend_data, -}; - -/* start of modified aoutx.h */ -/* BFD semi-generic back-end for a.out binaries. - Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998 - Free Software Foundation, Inc. - Written by Cygnus Support. - -This file is part of BFD, the Binary File Descriptor library. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -/* -SECTION - a.out backends - - -DESCRIPTION - - BFD supports a number of different flavours of a.out format, - though the major differences are only the sizes of the - structures on disk, and the shape of the relocation - information. - - The support is split into a basic support file @file{aoutx.h} - and other files which derive functions from the base. One - derivation file is @file{aoutf1.h} (for a.out flavour 1), and - adds to the basic a.out functions support for sun3, sun4, 386 - and 29k a.out files, to create a target jump vector for a - specific target. - - This information is further split out into more specific files - for each machine, including @file{sunos.c} for sun3 and sun4, - @file{newsos3.c} for the Sony NEWS, and @file{demo64.c} for a - demonstration of a 64 bit a.out format. - - The base file @file{aoutx.h} defines general mechanisms for - reading and writing records to and from disk and various - other methods which BFD requires. It is included by - @file{aout32.c} and @file{aout64.c} to form the names - <<aout_32_swap_exec_header_in>>, <<aout_64_swap_exec_header_in>>, etc. - - As an example, this is what goes on to make the back end for a - sun4, from @file{aout32.c}: - -| #define ARCH_SIZE 32 -| #include "aoutx.h" - - Which exports names: - -| ... -| aout_32_canonicalize_reloc -| aout_32_find_nearest_line -| aout_32_get_lineno -| aout_32_get_reloc_upper_bound -| ... - - from @file{sunos.c}: - -| #define TARGET_NAME "a.out-sunos-big" -| #define VECNAME sunos_big_vec -| #include "aoutf1.h" - - requires all the names from @file{aout32.c}, and produces the jump vector - -| sunos_big_vec - - The file @file{host-aout.c} is a special case. It is for a large set - of hosts that use ``more or less standard'' a.out files, and - for which cross-debugging is not interesting. It uses the - standard 32-bit a.out support routines, but determines the - file offsets and addresses of the text, data, and BSS - sections, the machine architecture and machine type, and the - entry point address, in a host-dependent manner. Once these - values have been determined, generic code is used to handle - the object file. - - When porting it to run on a new system, you must supply: - -| HOST_PAGE_SIZE -| HOST_SEGMENT_SIZE -| HOST_MACHINE_ARCH (optional) -| HOST_MACHINE_MACHINE (optional) -| HOST_TEXT_START_ADDR -| HOST_STACK_END_ADDR - - in the file @file{../include/sys/h-@var{XXX}.h} (for your host). These - values, plus the structures and macros defined in @file{a.out.h} on - your host system, will produce a BFD target that will access - ordinary a.out files on your host. To configure a new machine - to use @file{host-aout.c}, specify: - -| TDEFAULTS = -DDEFAULT_VECTOR=host_aout_big_vec -| TDEPFILES= host-aout.o trad-core.o - - in the @file{config/@var{XXX}.mt} file, and modify @file{configure.in} - to use the - @file{@var{XXX}.mt} file (by setting "<<bfd_target=XXX>>") when your - configuration is selected. - -*/ - -/* Some assumptions: - * Any BFD with D_PAGED set is ZMAGIC, and vice versa. - Doesn't matter what the setting of WP_TEXT is on output, but it'll - get set on input. - * Any BFD with D_PAGED clear and WP_TEXT set is NMAGIC. - * Any BFD with both flags clear is OMAGIC. - (Just want to make these explicit, so the conditions tested in this - file make sense if you're more familiar with a.out than with BFD.) */ - +/* Start of modified aoutx.h. */ #define KEEPIT udata.i -#include <string.h> /* For strchr and friends */ +#include <string.h> /* For strchr and friends. */ #include "bfd.h" #include "sysdep.h" #include "safe-ctype.h" #include "bfdlink.h" #include "libaout.h" -/*#include "libbfd.h"*/ #include "aout/aout64.h" #include "aout/stab_gnu.h" #include "aout/ar.h" @@ -328,61 +161,30 @@ DESCRIPTION #undef N_REG #undef N_FN #undef N_EXT -#define N_TYPE 0x1f /* type mask */ -#define N_UNDF 0x00 /* undefined */ -#define N_ABS 0x01 /* absolute */ -#define N_TEXT 0x02 /* text segment */ -#define N_DATA 0x03 /* data segment */ -#define N_BSS 0x04 /* bss segment */ -#define N_REG 0x14 /* register symbol */ -#define N_FN 0x1f /* file name */ - -#define N_EXT 0x20 /* external flag */ +#define N_TYPE 0x1f /* Type mask. */ +#define N_UNDF 0x00 /* Undefined. */ +#define N_ABS 0x01 /* Absolute. */ +#define N_TEXT 0x02 /* Text segment. */ +#define N_DATA 0x03 /* Data segment. */ +#define N_BSS 0x04 /* Bss segment. */ +#define N_REG 0x14 /* Register symbol. */ +#define N_FN 0x1f /* File name. */ +#define N_EXT 0x20 /* External flag. */ #define RELOC_SIZE 2 -#define RELFLG 0x0001 /* pc-relative flag */ -#define RTYPE 0x000e /* type mask */ -#define RIDXMASK 0xfff0 /* index mask */ +#define RELFLG 0x0001 /* PC-relative flag. */ +#define RTYPE 0x000e /* Type mask. */ +#define RIDXMASK 0xfff0 /* Index mask. */ -#define RABS 0x00 /* absolute */ -#define RTEXT 0x02 /* text */ -#define RDATA 0x04 /* data */ -#define RBSS 0x06 /* bss */ -#define REXT 0x08 /* external */ +#define RABS 0x00 /* Absolute. */ +#define RTEXT 0x02 /* Text. */ +#define RDATA 0x04 /* Data. */ +#define RBSS 0x06 /* Bss. */ +#define REXT 0x08 /* External. */ #define RINDEX(x) (((x) & 0xfff0) >> 4) -static bfd_boolean aout_get_external_symbols PARAMS ((bfd *)); -static bfd_boolean translate_from_native_sym_flags - PARAMS ((bfd *, aout_symbol_type *)); -static bfd_boolean translate_to_native_sym_flags - PARAMS ((bfd *, asymbol *, struct external_nlist *)); -static void adjust_o_magic PARAMS ((bfd *, struct internal_exec *)); -static void adjust_z_magic PARAMS ((bfd *, struct internal_exec *)); -static void adjust_n_magic PARAMS ((bfd *, struct internal_exec *)); - -static int pdp11_aout_write_headers PARAMS ((bfd *, struct internal_exec *)); -void pdp11_aout_swap_reloc_out PARAMS ((bfd *, arelent *, bfd_byte *)); -void pdp11_aout_swap_reloc_in -PARAMS ((bfd *, bfd_byte *, arelent *, - bfd_size_type, asymbol **, bfd_size_type)); - -/* -SUBSECTION - Relocations - -DESCRIPTION - The file @file{aoutx.h} provides for both the @emph{standard} - and @emph{extended} forms of a.out relocation records. - - The standard records contain only an - address, a symbol index, and a type field. The extended records - (used on 29ks and sparcs) also have a full integer for an - addend. - -*/ - #ifndef MY_final_link_relocate #define MY_final_link_relocate _bfd_final_link_relocate #endif @@ -391,6 +193,58 @@ DESCRIPTION #define MY_relocate_contents _bfd_relocate_contents #endif +/* A hash table used for header files with N_BINCL entries. */ + +struct aout_link_includes_table +{ + struct bfd_hash_table root; +}; + +/* A linked list of totals that we have found for a particular header + file. */ + +struct aout_link_includes_totals +{ + struct aout_link_includes_totals *next; + bfd_vma total; +}; + +/* An entry in the header file hash table. */ + +struct aout_link_includes_entry +{ + struct bfd_hash_entry root; + /* List of totals we have found for this file. */ + struct aout_link_includes_totals *totals; +}; + +/* During the final link step we need to pass around a bunch of + information, so we do it in an instance of this structure. */ + +struct aout_final_link_info +{ + /* General link information. */ + struct bfd_link_info *info; + /* Output bfd. */ + bfd *output_bfd; + /* Reloc file positions. */ + file_ptr treloff, dreloff; + /* File position of symbols. */ + file_ptr symoff; + /* String table. */ + struct bfd_strtab_hash *strtab; + /* Header file hash table. */ + struct aout_link_includes_table includes; + /* A buffer large enough to hold the contents of any section. */ + bfd_byte *contents; + /* A buffer large enough to hold the relocs of any section. */ + void * relocs; + /* A buffer large enough to hold the symbol map of any input BFD. */ + int *symbol_map; + /* A buffer large enough to hold output symbols of any input BFD. */ + struct external_nlist *output_syms; +}; + reloc_howto_type howto_table_pdp11[] = { /* type rs size bsz pcrel bitpos ovrf sf name part_inpl readmask setmask pcdone */ @@ -400,10 +254,16 @@ HOWTO( 1, 0, 1, 16, TRUE, 0, complain_overflow_signed,0,"DISP16", TRU #define TABLE_SIZE(TABLE) (sizeof(TABLE)/sizeof(TABLE[0])) + +static bfd_boolean aout_link_check_archive_element (bfd *, struct bfd_link_info *, bfd_boolean *); +static bfd_boolean aout_link_add_object_symbols (bfd *, struct bfd_link_info *); +static bfd_boolean aout_link_add_symbols (bfd *, struct bfd_link_info *); +static bfd_boolean aout_link_write_symbols (struct aout_final_link_info *, bfd *); + + reloc_howto_type * -NAME(aout,reloc_type_lookup) (abfd,code) - bfd * abfd ATTRIBUTE_UNUSED; - bfd_reloc_code_real_type code; +NAME (aout, reloc_type_lookup) (bfd * abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) { switch (code) { @@ -412,27 +272,25 @@ NAME(aout,reloc_type_lookup) (abfd,code) case BFD_RELOC_16_PCREL: return &howto_table_pdp11[1]; default: - return (reloc_howto_type *)NULL; + return NULL; } } static int -pdp11_aout_write_headers (abfd, execp) - bfd *abfd; - struct internal_exec *execp; +pdp11_aout_write_headers (bfd *abfd, struct internal_exec *execp) { struct external_exec exec_bytes; bfd_size_type text_size; file_ptr text_end; if (adata(abfd).magic == undecided_magic) - NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end); + NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end); execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE; execp->a_entry = bfd_get_start_address (abfd); - if (obj_textsec (abfd)->reloc_count > 0 || - obj_datasec (abfd)->reloc_count > 0) + if (obj_textsec (abfd)->reloc_count > 0 + || obj_datasec (abfd)->reloc_count > 0) { execp->a_trsize = execp->a_text; execp->a_drsize = execp->a_data; @@ -443,38 +301,33 @@ pdp11_aout_write_headers (abfd, execp) execp->a_drsize = 0; } - NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes); + NAME (aout, swap_exec_header_out) (abfd, execp, & exec_bytes); if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return FALSE; - if (bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd) + if (bfd_bwrite ((void *) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd) != EXEC_BYTES_SIZE) return FALSE; - /* Now write out reloc info, followed by syms and strings */ - - if (bfd_get_outsymbols (abfd) != (asymbol **) NULL + /* Now write out reloc info, followed by syms and strings. */ + if (bfd_get_outsymbols (abfd) != NULL && bfd_get_symcount (abfd) != 0) { if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0) return FALSE; - if (! NAME(aout,write_syms) (abfd)) + if (! NAME (aout, write_syms) (abfd)) return FALSE; } - if (obj_textsec (abfd)->reloc_count > 0 || - obj_datasec (abfd)->reloc_count > 0) + if (obj_textsec (abfd)->reloc_count > 0 + || obj_datasec (abfd)->reloc_count > 0) { - if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) != 0) - return FALSE; - if (!NAME(aout,squirt_out_relocs) (abfd, obj_textsec (abfd))) - return FALSE; - - if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) != 0) - return FALSE; - if (!NAME(aout,squirt_out_relocs) (abfd, obj_datasec (abfd))) + if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) != 0 + || !NAME (aout, squirt_out_relocs) (abfd, obj_textsec (abfd)) + || bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) != 0 + || !NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd))) return FALSE; } @@ -486,8 +339,7 @@ pdp11_aout_write_headers (abfd, execp) file header, symbols, and relocation. */ static bfd_boolean -MY(write_object_contents) (abfd) - bfd *abfd; +MY(write_object_contents) (bfd *abfd) { struct internal_exec *execp = exec_hdr (abfd); @@ -499,55 +351,29 @@ MY(write_object_contents) (abfd) bfd_size_type text_size; file_ptr text_end; - NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end); + NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end); } obj_reloc_entry_size (abfd) = RELOC_SIZE; - return WRITE_HEADERS(abfd, execp); + return WRITE_HEADERS (abfd, execp); } -/* -SUBSECTION - Internal entry points - -DESCRIPTION - @file{aoutx.h} exports several routines for accessing the - contents of an a.out file, which are gathered and exported in - turn by various format specific files (eg sunos.c). - -*/ - -/* -FUNCTION - aout_@var{size}_swap_exec_header_in - -SYNOPSIS - void aout_@var{size}_swap_exec_header_in, - (bfd *abfd, - struct external_exec *raw_bytes, - struct internal_exec *execp); - -DESCRIPTION - Swap the information in an executable header @var{raw_bytes} taken - from a raw byte stream memory image into the internal exec header - structure @var{execp}. -*/ +/* Swap the information in an executable header @var{raw_bytes} taken + from a raw byte stream memory image into the internal exec header + structure "execp". */ #ifndef NAME_swap_exec_header_in void -NAME(aout,swap_exec_header_in) (abfd, raw_bytes, execp) - bfd *abfd; - struct external_exec *raw_bytes; - struct internal_exec *execp; +NAME (aout, swap_exec_header_in) (bfd *abfd, + struct external_exec *bytes, + struct internal_exec *execp) { - struct external_exec *bytes = (struct external_exec *)raw_bytes; - /* The internal_exec structure has some fields that are unused in this configuration (IE for i960), so ensure that all such uninitialized fields are zero'd out. There are places where two of these structs - are memcmp'd, and thus the contents do matter. */ - memset ((PTR) execp, 0, sizeof (struct internal_exec)); + are memcmp'd, and thus the contents do matter. */ + memset ((void *) execp, 0, sizeof (struct internal_exec)); /* Now fill in fields in the execp, from the bytes in the raw data. */ execp->a_info = GET_MAGIC (abfd, bytes->e_info); execp->a_text = GET_WORD (abfd, bytes->e_text); @@ -567,32 +393,17 @@ NAME(aout,swap_exec_header_in) (abfd, raw_bytes, execp) execp->a_drsize = execp->a_data; } } -#define NAME_swap_exec_header_in NAME(aout,swap_exec_header_in) +#define NAME_swap_exec_header_in NAME (aout, swap_exec_header_in) #endif -/* -FUNCTION - aout_@var{size}_swap_exec_header_out - -SYNOPSIS - void aout_@var{size}_swap_exec_header_out - (bfd *abfd, - struct internal_exec *execp, - struct external_exec *raw_bytes); - -DESCRIPTION - Swap the information in an internal exec header structure - @var{execp} into the buffer @var{raw_bytes} ready for writing to disk. -*/ +/* Swap the information in an internal exec header structure + "execp" into the buffer "bytes" ready for writing to disk. */ void -NAME(aout,swap_exec_header_out) (abfd, execp, raw_bytes) - bfd *abfd; - struct internal_exec *execp; - struct external_exec *raw_bytes; +NAME (aout, swap_exec_header_out) (bfd *abfd, + struct internal_exec *execp, + struct external_exec *bytes) { - struct external_exec *bytes = (struct external_exec *)raw_bytes; - - /* Now fill in fields in the raw data, from the fields in the exec struct. */ + /* Now fill in fields in the raw data, from the fields in the exec struct. */ PUT_MAGIC (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); @@ -601,15 +412,15 @@ NAME(aout,swap_exec_header_out) (abfd, execp, raw_bytes) PUT_WORD (abfd, execp->a_entry, bytes->e_entry); PUT_WORD (abfd, 0, bytes->e_unused); - if ((execp->a_trsize == 0 || execp->a_text == 0) && - (execp->a_drsize == 0 || execp->a_data == 0)) - PUT_WORD (abfd, A_FLAG_RELOC_STRIPPED, bytes->e_flag); - else if (execp->a_trsize == execp->a_text && - execp->a_drsize == execp->a_data) - PUT_WORD (abfd, 0, bytes->e_flag); + if ((execp->a_trsize == 0 || execp->a_text == 0) + && (execp->a_drsize == 0 || execp->a_data == 0)) + PUT_WORD (abfd, A_FLAG_RELOC_STRIPPED, bytes->e_flag); + else if (execp->a_trsize == execp->a_text + && execp->a_drsize == execp->a_data) + PUT_WORD (abfd, 0, bytes->e_flag); else { - /* TODO: print a proper warning message */ + /* TODO: print a proper warning message. */ fprintf (stderr, "BFD:%s:%d: internal error\n", __FILE__, __LINE__); PUT_WORD (abfd, 0, bytes->e_flag); } @@ -618,49 +429,33 @@ NAME(aout,swap_exec_header_out) (abfd, execp, raw_bytes) /* Make all the section for an a.out file. */ bfd_boolean -NAME(aout,make_sections) (abfd) - bfd *abfd; +NAME (aout, make_sections) (bfd *abfd) { - if (obj_textsec (abfd) == (asection *) NULL - && bfd_make_section (abfd, ".text") == (asection *) NULL) + if (obj_textsec (abfd) == NULL && bfd_make_section (abfd, ".text") == NULL) return FALSE; - if (obj_datasec (abfd) == (asection *) NULL - && bfd_make_section (abfd, ".data") == (asection *) NULL) + if (obj_datasec (abfd) == NULL && bfd_make_section (abfd, ".data") == NULL) return FALSE; - if (obj_bsssec (abfd) == (asection *) NULL - && bfd_make_section (abfd, ".bss") == (asection *) NULL) + if (obj_bsssec (abfd) == NULL && bfd_make_section (abfd, ".bss") == NULL) return FALSE; return TRUE; } -/* -FUNCTION - aout_@var{size}_some_aout_object_p - -SYNOPSIS - const bfd_target *aout_@var{size}_some_aout_object_p - (bfd *abfd, - const bfd_target *(*callback_to_real_object_p)()); - -DESCRIPTION - Some a.out variant thinks that the file open in @var{abfd} - checking is an a.out file. Do some more checking, and set up - for access if it really is. Call back to the calling - environment's "finish up" function just before returning, to - handle any last-minute setup. -*/ +/* Some a.out variant thinks that the file open in ABFD + checking is an a.out file. Do some more checking, and set up + for access if it really is. Call back to the calling + environment's "finish up" function just before returning, to + handle any last-minute setup. */ const bfd_target * -NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) - bfd *abfd; - struct internal_exec *execp; - const bfd_target *(*callback_to_real_object_p) PARAMS ((bfd *)); +NAME (aout, some_aout_object_p) (bfd *abfd, + struct internal_exec *execp, + const bfd_target *(*callback_to_real_object_p) (bfd *)) { struct aout_data_struct *rawptr, *oldrawptr; const bfd_target *result; bfd_size_type amt = sizeof (struct aout_data_struct); - rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt); + rawptr = bfd_zalloc (abfd, amt); if (rawptr == NULL) return 0; @@ -675,14 +470,14 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) *abfd->tdata.aout_data = *oldrawptr; abfd->tdata.aout_data->a.hdr = &rawptr->e; - *(abfd->tdata.aout_data->a.hdr) = *execp; /* Copy in the internal_exec struct */ + *(abfd->tdata.aout_data->a.hdr) = *execp; /* Copy in the internal_exec struct. */ execp = abfd->tdata.aout_data->a.hdr; - /* Set the file flags */ + /* Set the file flags. */ abfd->flags = BFD_NO_FLAGS; if (execp->a_drsize || execp->a_trsize) abfd->flags |= HAS_RELOC; - /* Setting of EXEC_P has been deferred to the bottom of this function */ + /* Setting of EXEC_P has been deferred to the bottom of this function. */ if (execp->a_syms) abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS; if (N_DYNAMIC(*execp)) @@ -716,24 +511,25 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) bfd_get_start_address (abfd) = execp->a_entry; - obj_aout_symbols (abfd) = (aout_symbol_type *)NULL; + obj_aout_symbols (abfd) = NULL; bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct external_nlist); /* The default relocation entry size is that of traditional V7 Unix. */ obj_reloc_entry_size (abfd) = RELOC_SIZE; - /* The default symbol entry size is that of traditional Unix. */ + /* The default symbol entry size is that of traditional Unix. */ obj_symbol_entry_size (abfd) = EXTERNAL_NLIST_SIZE; #ifdef USE_MMAP bfd_init_window (&obj_aout_sym_window (abfd)); bfd_init_window (&obj_aout_string_window (abfd)); #endif + obj_aout_external_syms (abfd) = NULL; obj_aout_external_strings (abfd) = NULL; obj_aout_sym_hashes (abfd) = NULL; - if (! NAME(aout,make_sections) (abfd)) + if (! NAME (aout, make_sections) (abfd)) return NULL; obj_datasec (abfd)->size = execp->a_data; @@ -759,22 +555,21 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) /* Call back to the format-dependent code to fill in the rest of the fields and do any further cleanup. Things that should be filled in by the callback: */ - struct exec *execp = exec_hdr (abfd); obj_textsec (abfd)->size = N_TXTSIZE(*execp); - /* data and bss are already filled in since they're so standard */ + /* Data and bss are already filled in since they're so standard. */ - /* The virtual memory addresses of the sections */ + /* The virtual memory addresses of the sections. */ obj_textsec (abfd)->vma = N_TXTADDR(*execp); obj_datasec (abfd)->vma = N_DATADDR(*execp); obj_bsssec (abfd)->vma = N_BSSADDR(*execp); - /* The file offsets of the sections */ + /* The file offsets of the sections. */ obj_textsec (abfd)->filepos = N_TXTOFF(*execp); obj_datasec (abfd)->filepos = N_DATOFF(*execp); - /* The file offsets of the relocation info */ + /* The file offsets of the relocation info. */ obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp); obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp); @@ -799,7 +594,7 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) Formats such as b.out, which have additional fields in the a.out header, should cope with them in this callback as well. */ -#endif /* DOCUMENTATION */ +#endif /* DOCUMENTATION */ result = (*callback_to_real_object_p)(abfd); @@ -850,28 +645,18 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) return result; } -/* -FUNCTION - aout_@var{size}_mkobject - -SYNOPSIS - bfd_boolean aout_@var{size}_mkobject, (bfd *abfd); - -DESCRIPTION - Initialize BFD @var{abfd} for use with a.out files. -*/ +/* Initialize ABFD for use with a.out files. */ bfd_boolean -NAME(aout,mkobject) (abfd) - bfd *abfd; +NAME (aout, mkobject) (bfd *abfd) { struct aout_data_struct *rawptr; bfd_size_type amt = sizeof (struct aout_data_struct); bfd_set_error (bfd_error_system_call); - /* Use an intermediate variable for clarity */ - rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt); + /* Use an intermediate variable for clarity. */ + rawptr = bfd_zalloc (abfd, amt); if (rawptr == NULL) return FALSE; @@ -879,38 +664,25 @@ NAME(aout,mkobject) (abfd) abfd->tdata.aout_data = rawptr; exec_hdr (abfd) = &(rawptr->e); - obj_textsec (abfd) = (asection *)NULL; - obj_datasec (abfd) = (asection *)NULL; - obj_bsssec (abfd) = (asection *)NULL; + obj_textsec (abfd) = NULL; + obj_datasec (abfd) = NULL; + obj_bsssec (abfd) = NULL; return TRUE; } +/* Keep track of machine architecture and machine type for + a.out's. Return the <<machine_type>> for a particular + architecture and machine, or <<M_UNKNOWN>> if that exact architecture + and machine can't be represented in a.out format. -/* -FUNCTION - aout_@var{size}_machine_type - -SYNOPSIS - enum machine_type aout_@var{size}_machine_type - (enum bfd_architecture arch, - unsigned long machine)); - -DESCRIPTION - Keep track of machine architecture and machine type for - a.out's. Return the <<machine_type>> for a particular - architecture and machine, or <<M_UNKNOWN>> if that exact architecture - and machine can't be represented in a.out format. - - If the architecture is understood, machine type 0 (default) - is always understood. -*/ + If the architecture is understood, machine type 0 (default) + is always understood. */ enum machine_type -NAME(aout,machine_type) (arch, machine, unknown) - enum bfd_architecture arch; - unsigned long machine; - bfd_boolean *unknown; +NAME (aout, machine_type) (enum bfd_architecture arch, + unsigned long machine, + bfd_boolean *unknown) { enum machine_type arch_flags; @@ -963,10 +735,10 @@ NAME(aout,machine_type) (arch, machine, unknown) case bfd_mach_mips3000: arch_flags = M_MIPS1; break; - case bfd_mach_mips4000: /* mips3 */ + case bfd_mach_mips4000: /* MIPS3 */ case bfd_mach_mips4400: - case bfd_mach_mips8000: /* mips4 */ - case bfd_mach_mips6000: /* real mips2: */ + case bfd_mach_mips8000: /* MIPS4 */ + case bfd_mach_mips6000: /* Real MIPS2: */ arch_flags = M_MIPS2; break; default: @@ -1004,28 +776,14 @@ NAME(aout,machine_type) (arch, machine, unknown) return arch_flags; } - -/* -FUNCTION - aout_@var{size}_set_arch_mach - -SYNOPSIS - bfd_boolean aout_@var{size}_set_arch_mach, - (bfd *, - enum bfd_architecture arch, - unsigned long machine)); - -DESCRIPTION - Set the architecture and the machine of the BFD @var{abfd} to the - values @var{arch} and @var{machine}. Verify that @var{abfd}'s format - can support the architecture required. -*/ +/* Set the architecture and the machine of the ABFD to the + values ARCH and MACHINE. Verify that @ABFD's format + can support the architecture required. */ bfd_boolean -NAME(aout,set_arch_mach) (abfd, arch, machine) - bfd *abfd; - enum bfd_architecture arch; - unsigned long machine; +NAME (aout, set_arch_mach) (bfd *abfd, + enum bfd_architecture arch, + unsigned long machine) { if (! bfd_default_set_arch_mach (abfd, arch, machine)) return FALSE; @@ -1034,7 +792,7 @@ NAME(aout,set_arch_mach) (abfd, arch, machine) { bfd_boolean unknown; - NAME(aout,machine_type) (arch, machine, &unknown); + NAME (aout, machine_type) (arch, machine, &unknown); if (unknown) return FALSE; } @@ -1045,9 +803,7 @@ NAME(aout,set_arch_mach) (abfd, arch, machine) } static void -adjust_o_magic (abfd, execp) - bfd *abfd; - struct internal_exec *execp; +adjust_o_magic (bfd *abfd, struct internal_exec *execp) { file_ptr pos = adata (abfd).exec_bytes_size; bfd_vma vma = 0; @@ -1107,9 +863,7 @@ adjust_o_magic (abfd, execp) } static void -adjust_z_magic (abfd, execp) - bfd *abfd; - struct internal_exec *execp; +adjust_z_magic (bfd *abfd, struct internal_exec *execp) { bfd_size_type data_pad, text_pad; file_ptr text_end; @@ -1222,9 +976,7 @@ adjust_z_magic (abfd, execp) } static void -adjust_n_magic (abfd, execp) - bfd *abfd; - struct internal_exec *execp; +adjust_n_magic (bfd *abfd, struct internal_exec *execp) { file_ptr pos = adata(abfd).exec_bytes_size; bfd_vma vma = 0; @@ -1265,14 +1017,13 @@ adjust_n_magic (abfd, execp) } bfd_boolean -NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end) - bfd *abfd; - bfd_size_type *text_size; - file_ptr * text_end ATTRIBUTE_UNUSED; +NAME (aout, adjust_sizes_and_vmas) (bfd *abfd, + bfd_size_type *text_size, + file_ptr * text_end ATTRIBUTE_UNUSED) { struct internal_exec *execp = exec_hdr (abfd); - if (! NAME(aout,make_sections) (abfd)) + if (! NAME (aout, make_sections) (abfd)) return FALSE; if (adata(abfd).magic != undecided_magic) @@ -1352,28 +1103,14 @@ NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end) return TRUE; } -/* -FUNCTION - aout_@var{size}_new_section_hook - -SYNOPSIS - bfd_boolean aout_@var{size}_new_section_hook, - (bfd *abfd, - asection *newsect)); +/* Called by the BFD in response to a bfd_make_section request. */ -DESCRIPTION - Called by the BFD in response to a @code{bfd_make_section} - request. -*/ bfd_boolean -NAME(aout,new_section_hook) (abfd, newsect) - bfd *abfd; - asection *newsect; +NAME (aout, new_section_hook) (bfd *abfd, asection *newsect) { - /* align to double at least */ + /* Align to double at least. */ newsect->alignment_power = bfd_get_arch_info(abfd)->section_align_power; - if (bfd_get_format (abfd) == bfd_object) { if (obj_textsec (abfd) == NULL @@ -1401,24 +1138,23 @@ NAME(aout,new_section_hook) (abfd, newsect) } } - /* We allow more than three sections internally */ + /* We allow more than three sections internally. */ return TRUE; } bfd_boolean -NAME(aout,set_section_contents) (abfd, section, location, offset, count) - bfd *abfd; - sec_ptr section; - const PTR location; - file_ptr offset; - bfd_size_type count; +NAME (aout, set_section_contents) (bfd *abfd, + sec_ptr section, + const void * location, + file_ptr offset, + bfd_size_type count) { file_ptr text_end; bfd_size_type text_size; if (! abfd->output_has_begun) { - if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end)) + if (! NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end)) return FALSE; } @@ -1451,10 +1187,9 @@ NAME(aout,set_section_contents) (abfd, section, location, offset, count) /* Read the external symbols from an a.out file. */ static bfd_boolean -aout_get_external_symbols (abfd) - bfd *abfd; +aout_get_external_symbols (bfd *abfd) { - if (obj_aout_external_syms (abfd) == (struct external_nlist *) NULL) + if (obj_aout_external_syms (abfd) == NULL) { bfd_size_type count; struct external_nlist *syms; @@ -1471,8 +1206,8 @@ aout_get_external_symbols (abfd) /* We allocate using malloc to make the values easy to free later on. If we put them on the objalloc it might not be possible to free them. */ - syms = (struct external_nlist *) bfd_malloc (count * EXTERNAL_NLIST_SIZE); - if (syms == (struct external_nlist *) NULL && count != 0) + syms = bfd_malloc (count * EXTERNAL_NLIST_SIZE); + if (syms == NULL && count != 0) return FALSE; if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0 @@ -1497,7 +1232,7 @@ aout_get_external_symbols (abfd) /* Get the size of the strings. */ if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0 - || (bfd_bread ((PTR) string_chars, (bfd_size_type) BYTES_IN_LONG, + || (bfd_bread ((void *) string_chars, (bfd_size_type) BYTES_IN_LONG, abfd) != BYTES_IN_LONG)) return FALSE; stringsize = H_GET_32 (abfd, string_chars); @@ -1508,7 +1243,7 @@ aout_get_external_symbols (abfd) return FALSE; strings = (char *) obj_aout_string_window (abfd).data; #else - strings = (char *) bfd_malloc (stringsize + 1); + strings = bfd_malloc (stringsize + 1); if (strings == NULL) return FALSE; @@ -1520,7 +1255,6 @@ aout_get_external_symbols (abfd) return FALSE; } #endif - /* Ensure that a zero index yields an empty string. */ strings[0] = '\0'; @@ -1539,9 +1273,8 @@ aout_get_external_symbols (abfd) symbol->flags and symbol->section, and adjusting symbol->value. */ static bfd_boolean -translate_from_native_sym_flags (abfd, cache_ptr) - bfd *abfd; - aout_symbol_type *cache_ptr; +translate_from_native_sym_flags (bfd *abfd, + aout_symbol_type *cache_ptr) { flagword visible; @@ -1550,7 +1283,6 @@ translate_from_native_sym_flags (abfd, cache_ptr) asection *sec; /* This is a debugging symbol. */ - cache_ptr->symbol.flags = BSF_DEBUGGING; /* Work out the symbol section. */ @@ -1632,10 +1364,9 @@ translate_from_native_sym_flags (abfd, cache_ptr) /* Set the fields of SYM_POINTER according to CACHE_PTR. */ static bfd_boolean -translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer) - bfd *abfd; - asymbol *cache_ptr; - struct external_nlist *sym_pointer; +translate_to_native_sym_flags (bfd *abfd, + asymbol *cache_ptr, + struct external_nlist *sym_pointer) { bfd_vma value = cache_ptr->value; asection *sec; @@ -1702,11 +1433,11 @@ translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer) /* Native-level interface to symbols. */ asymbol * -NAME(aout,make_empty_symbol) (abfd) - bfd *abfd; +NAME (aout, make_empty_symbol) (bfd *abfd) { bfd_size_type amt = sizeof (aout_symbol_type); - aout_symbol_type *new = (aout_symbol_type *) bfd_zalloc (abfd, amt); + aout_symbol_type *new = bfd_zalloc (abfd, amt); + if (!new) return NULL; new->symbol.the_bfd = abfd; @@ -1717,14 +1448,13 @@ NAME(aout,make_empty_symbol) (abfd) /* Translate a set of internal symbols into external symbols. */ bfd_boolean -NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic) - bfd *abfd; - aout_symbol_type *in; - struct external_nlist *ext; - bfd_size_type count; - char *str; - bfd_size_type strsize; - bfd_boolean dynamic; +NAME (aout, translate_symbol_table) (bfd *abfd, + aout_symbol_type *in, + struct external_nlist *ext, + bfd_size_type count, + char *str, + bfd_size_type strsize, + bfd_boolean dynamic) { struct external_nlist *ext_end; @@ -1749,7 +1479,7 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic) return FALSE; in->symbol.value = GET_SWORD (abfd, ext->e_value); - /* TODO: is 0 a safe value here? */ + /* TODO: is 0 a safe value here? */ in->desc = 0; in->other = 0; in->type = H_GET_8 (abfd, ext->e_type); @@ -1767,18 +1497,17 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic) /* We read the symbols into a buffer, which is discarded when this function exits. We read the strings into a buffer large enough to - hold them all plus all the cached symbol entries. */ + hold them all plus all the cached symbol entries. */ bfd_boolean -NAME(aout,slurp_symbol_table) (abfd) - bfd *abfd; +NAME (aout, slurp_symbol_table) (bfd *abfd) { struct external_nlist *old_external_syms; aout_symbol_type *cached; bfd_size_type cached_size; - /* If there's no work to be done, don't do any */ - if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL) + /* If there's no work to be done, don't do any. */ + if (obj_aout_symbols (abfd) != NULL) return TRUE; old_external_syms = obj_aout_external_syms (abfd); @@ -1788,12 +1517,12 @@ NAME(aout,slurp_symbol_table) (abfd) cached_size = obj_aout_external_sym_count (abfd); cached_size *= sizeof (aout_symbol_type); - cached = (aout_symbol_type *) bfd_zmalloc (cached_size); + cached = bfd_zmalloc (cached_size); if (cached == NULL && cached_size != 0) return FALSE; /* Convert from external symbol information to internal. */ - if (! (NAME(aout,translate_symbol_table) + if (! (NAME (aout, translate_symbol_table) (abfd, cached, obj_aout_external_syms (abfd), obj_aout_external_sym_count (abfd), @@ -1813,8 +1542,8 @@ NAME(aout,slurp_symbol_table) (abfd) want the external symbol information, so if it was allocated because of our call to aout_get_external_symbols, we free it up right away to save space. */ - if (old_external_syms == (struct external_nlist *) NULL - && obj_aout_external_syms (abfd) != (struct external_nlist *) NULL) + if (old_external_syms == NULL + && obj_aout_external_syms (abfd) != NULL) { #ifdef USE_MMAP bfd_free_window (&obj_aout_sym_window (abfd)); @@ -1836,19 +1565,14 @@ NAME(aout,slurp_symbol_table) (abfd) This hash table code breaks dbx on SunOS 4.1.3, so we don't do it if BFD_TRADITIONAL_FORMAT is set. */ -static bfd_size_type add_to_stringtab - PARAMS ((bfd *, struct bfd_strtab_hash *, const char *, bfd_boolean)); -static bfd_boolean emit_stringtab PARAMS ((bfd *, struct bfd_strtab_hash *)); - /* Get the index of a string in a strtab, adding it if it is not already present. */ static INLINE bfd_size_type -add_to_stringtab (abfd, tab, str, copy) - bfd *abfd; - struct bfd_strtab_hash *tab; - const char *str; - bfd_boolean copy; +add_to_stringtab (bfd *abfd, + struct bfd_strtab_hash *tab, + const char *str, + bfd_boolean copy) { bfd_boolean hash; bfd_size_type index; @@ -1866,11 +1590,9 @@ add_to_stringtab (abfd, tab, str, copy) index = _bfd_stringtab_add (tab, str, hash, copy); if (index != (bfd_size_type) -1) - { - /* Add BYTES_IN_LONG to the return value to account for the - space taken up by the string table size. */ - index += BYTES_IN_LONG; - } + /* Add BYTES_IN_LONG to the return value to account for the + space taken up by the string table size. */ + index += BYTES_IN_LONG; return index; } @@ -1879,15 +1601,13 @@ add_to_stringtab (abfd, tab, str, copy) file. */ static bfd_boolean -emit_stringtab (abfd, tab) - register bfd *abfd; - struct bfd_strtab_hash *tab; +emit_stringtab (bfd *abfd, struct bfd_strtab_hash *tab) { bfd_byte buffer[BYTES_IN_LONG]; /* The string table starts with the size. */ H_PUT_32 (abfd, _bfd_stringtab_size (tab) + BYTES_IN_LONG, buffer); - if (bfd_bwrite ((PTR) buffer, (bfd_size_type) BYTES_IN_LONG, abfd) + if (bfd_bwrite ((void *) buffer, (bfd_size_type) BYTES_IN_LONG, abfd) != BYTES_IN_LONG) return FALSE; @@ -1895,8 +1615,7 @@ emit_stringtab (abfd, tab) } bfd_boolean -NAME(aout,write_syms) (abfd) - bfd *abfd; +NAME (aout, write_syms) (bfd *abfd) { unsigned int count ; asymbol **generic = bfd_get_outsymbols (abfd); @@ -1929,7 +1648,7 @@ NAME(aout,write_syms) (abfd) H_PUT_8 (abfd, 0, nsp.e_ovly); - if (bfd_bwrite ((PTR)&nsp, (bfd_size_type) EXTERNAL_NLIST_SIZE, abfd) + if (bfd_bwrite ((void *)&nsp, (bfd_size_type) EXTERNAL_NLIST_SIZE, abfd) != EXTERNAL_NLIST_SIZE) goto error_return; @@ -1952,33 +1671,25 @@ error_return: long -NAME(aout,canonicalize_symtab) (abfd, location) - bfd *abfd; - asymbol **location; +NAME (aout, canonicalize_symtab) (bfd *abfd, asymbol **location) { - unsigned int counter = 0; - aout_symbol_type *symbase; + unsigned int counter = 0; + aout_symbol_type *symbase; - if (!NAME(aout,slurp_symbol_table)(abfd)) - return -1; + if (!NAME (aout, slurp_symbol_table) (abfd)) + return -1; - for (symbase = obj_aout_symbols(abfd); counter++ < bfd_get_symcount (abfd);) - *(location++) = (asymbol *)( symbase++); - *location++ =0; - return bfd_get_symcount (abfd); + for (symbase = obj_aout_symbols (abfd); counter++ < bfd_get_symcount (abfd);) + *(location++) = (asymbol *)(symbase++); + *location++ =0; + return bfd_get_symcount (abfd); } -/* Standard reloc stuff */ - -/* Extended stuff */ -/* Output extended relocation information to a file in target byte order. */ +/* Output extended relocation information to a file in target byte order. */ -void -pdp11_aout_swap_reloc_out (abfd, g, natptr) - bfd *abfd; - arelent *g; - bfd_byte *natptr; +static void +pdp11_aout_swap_reloc_out (bfd *abfd, arelent *g, bfd_byte *natptr) { int r_index; int r_pcrel; @@ -2065,15 +1776,13 @@ pdp11_aout_swap_reloc_out (abfd, g, natptr) } \ } -void -pdp11_aout_swap_reloc_in (abfd, bytes, cache_ptr, offset, - symbols, symcount) - bfd *abfd; - bfd_byte *bytes; - arelent *cache_ptr; - bfd_size_type offset; - asymbol **symbols; - bfd_size_type symcount; +static void +pdp11_aout_swap_reloc_in (bfd * abfd, + bfd_byte * bytes, + arelent * cache_ptr, + bfd_size_type offset, + asymbol ** symbols, + bfd_size_type symcount) { struct aoutdata *su = &(abfd->tdata.aout_data->a); unsigned int r_index; @@ -2081,7 +1790,7 @@ pdp11_aout_swap_reloc_in (abfd, bytes, cache_ptr, offset, int r_extern; int r_pcrel; - reloc_entry = GET_WORD (abfd, (PTR)bytes); + reloc_entry = GET_WORD (abfd, (void *) bytes); r_pcrel = reloc_entry & RELFLG; @@ -2111,15 +1820,12 @@ pdp11_aout_swap_reloc_in (abfd, bytes, cache_ptr, offset, /* Read and swap the relocs for a section. */ bfd_boolean -NAME(aout,slurp_reloc_table) (abfd, asect, symbols) - bfd *abfd; - sec_ptr asect; - asymbol **symbols; +NAME (aout, slurp_reloc_table) (bfd *abfd, sec_ptr asect, asymbol **symbols) { bfd_byte *rptr; bfd_size_type count; bfd_size_type reloc_size; - PTR relocs; + void * relocs; arelent *reloc_cache; size_t each_size; unsigned int counter = 0; @@ -2160,7 +1866,7 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols) count = reloc_size / each_size; - /* Count the number of NON-ZERO relocs, this is the count we want. */ + /* Count the number of NON-ZERO relocs, this is the count we want. */ { unsigned int real_count = 0; @@ -2176,7 +1882,7 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols) count = real_count; } - reloc_cache = (arelent *) bfd_zmalloc (count * sizeof (arelent)); + reloc_cache = bfd_zmalloc (count * sizeof (arelent)); if (reloc_cache == NULL && count != 0) return FALSE; @@ -2187,7 +1893,7 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols) counter < count; counter++, rptr += RELOC_SIZE, cache_ptr++) { - while (GET_WORD (abfd, (PTR)rptr) == 0) + while (GET_WORD (abfd, (void *) rptr) == 0) { rptr += RELOC_SIZE; if ((char *) rptr >= (char *) relocs + reloc_size) @@ -2201,7 +1907,7 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols) } done: /* Just in case, if rptr >= relocs + reloc_size should happen - too early. */ + too early. */ BFD_ASSERT (counter == count); free (relocs); @@ -2215,9 +1921,7 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols) /* Write out a relocation section into an object file. */ bfd_boolean -NAME(aout,squirt_out_relocs) (abfd, section) - bfd *abfd; - asection *section; +NAME (aout, squirt_out_relocs) (bfd *abfd, asection *section) { arelent **generic; unsigned char *native; @@ -2225,7 +1929,7 @@ NAME(aout,squirt_out_relocs) (abfd, section) bfd_size_type natsize; natsize = section->size; - native = (unsigned char *) bfd_zalloc (abfd, natsize); + native = bfd_zalloc (abfd, natsize); if (!native) return FALSE; @@ -2243,7 +1947,7 @@ NAME(aout,squirt_out_relocs) (abfd, section) } } - if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize) + if (bfd_bwrite ((void *) native, natsize, abfd) != natsize) { bfd_release (abfd, native); return FALSE; @@ -2253,13 +1957,13 @@ NAME(aout,squirt_out_relocs) (abfd, section) return TRUE; } -/* This is stupid. This function should be a boolean predicate */ +/* This is stupid. This function should be a boolean predicate. */ + long -NAME(aout,canonicalize_reloc) (abfd, section, relptr, symbols) - bfd *abfd; - sec_ptr section; - arelent **relptr; - asymbol **symbols; +NAME (aout, canonicalize_reloc) (bfd *abfd, + sec_ptr section, + arelent **relptr, + asymbol **symbols) { arelent *tblptr = section->relocation; unsigned int count; @@ -2270,7 +1974,7 @@ NAME(aout,canonicalize_reloc) (abfd, section, relptr, symbols) return 0; } - if (!(tblptr || NAME(aout,slurp_reloc_table)(abfd, section, symbols))) + if (!(tblptr || NAME (aout, slurp_reloc_table)(abfd, section, symbols))) return -1; if (section->flags & SEC_CONSTRUCTOR) @@ -2297,9 +2001,7 @@ NAME(aout,canonicalize_reloc) (abfd, section, relptr, symbols) } long -NAME(aout,get_reloc_upper_bound) (abfd, asect) - bfd *abfd; - sec_ptr asect; +NAME (aout, get_reloc_upper_bound) (bfd *abfd, sec_ptr asect) { if (bfd_get_format (abfd) != bfd_object) { @@ -2308,16 +2010,16 @@ NAME(aout,get_reloc_upper_bound) (abfd, asect) } if (asect->flags & SEC_CONSTRUCTOR) - return (sizeof (arelent *) * (asect->reloc_count+1)); + return (sizeof (arelent *) * (asect->reloc_count + 1)); if (asect == obj_datasec (abfd)) return (sizeof (arelent *) - * ((exec_hdr(abfd)->a_drsize / obj_reloc_entry_size (abfd)) + * ((exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd)) + 1)); if (asect == obj_textsec (abfd)) return (sizeof (arelent *) - * ((exec_hdr(abfd)->a_trsize / obj_reloc_entry_size (abfd)) + * ((exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd)) + 1)); /* TODO: why are there two if statements for obj_bsssec()? */ @@ -2334,28 +2036,25 @@ NAME(aout,get_reloc_upper_bound) (abfd, asect) long -NAME(aout,get_symtab_upper_bound) (abfd) - bfd *abfd; +NAME (aout, get_symtab_upper_bound) (bfd *abfd) { - if (!NAME(aout,slurp_symbol_table)(abfd)) + if (!NAME (aout, slurp_symbol_table) (abfd)) return -1; return (bfd_get_symcount (abfd) + 1) * (sizeof (aout_symbol_type *)); } alent * -NAME(aout,get_lineno) (abfd, symbol) - bfd * abfd ATTRIBUTE_UNUSED; - asymbol * symbol ATTRIBUTE_UNUSED; +NAME (aout, get_lineno) (bfd * abfd ATTRIBUTE_UNUSED, + asymbol * symbol ATTRIBUTE_UNUSED) { - return (alent *)NULL; + return NULL; } void -NAME(aout,get_symbol_info) (abfd, symbol, ret) - bfd * abfd ATTRIBUTE_UNUSED; - asymbol *symbol; - symbol_info *ret; +NAME (aout, get_symbol_info) (bfd * abfd ATTRIBUTE_UNUSED, + asymbol *symbol, + symbol_info *ret) { bfd_symbol_info (symbol, ret); @@ -2371,21 +2070,20 @@ NAME(aout,get_symbol_info) (abfd, symbol, ret) stab_name = buf; } ret->type = '-'; - ret->stab_type = type_code; - ret->stab_other = (unsigned)(aout_symbol(symbol)->other & 0xff); - ret->stab_desc = (unsigned)(aout_symbol(symbol)->desc & 0xffff); - ret->stab_name = stab_name; + ret->stab_type = type_code; + ret->stab_other = (unsigned) (aout_symbol(symbol)->other & 0xff); + ret->stab_desc = (unsigned) (aout_symbol(symbol)->desc & 0xffff); + ret->stab_name = stab_name; } } void -NAME(aout,print_symbol) (abfd, afile, symbol, how) - bfd * abfd; - PTR afile; - asymbol *symbol; - bfd_print_symbol_type how; +NAME (aout, print_symbol) (bfd * abfd, + void * afile, + asymbol *symbol, + bfd_print_symbol_type how) { - FILE *file = (FILE *)afile; + FILE *file = (FILE *) afile; switch (how) { @@ -2394,21 +2092,22 @@ NAME(aout,print_symbol) (abfd, afile, symbol, how) fprintf(file,"%s", symbol->name); break; case bfd_print_symbol_more: - fprintf(file,"%4x %2x %2x",(unsigned)(aout_symbol(symbol)->desc & 0xffff), - (unsigned)(aout_symbol(symbol)->other & 0xff), - (unsigned)(aout_symbol(symbol)->type)); + fprintf(file,"%4x %2x %2x", + (unsigned) (aout_symbol (symbol)->desc & 0xffff), + (unsigned) (aout_symbol (symbol)->other & 0xff), + (unsigned) (aout_symbol (symbol)->type)); break; case bfd_print_symbol_all: { const char *section_name = symbol->section->name; - bfd_print_symbol_vandf (abfd, (PTR)file, symbol); + bfd_print_symbol_vandf (abfd, (void *) file, symbol); fprintf (file," %-5s %04x %02x %02x", section_name, - (unsigned)(aout_symbol(symbol)->desc & 0xffff), - (unsigned)(aout_symbol(symbol)->other & 0xff), - (unsigned)(aout_symbol(symbol)->type & 0xff)); + (unsigned) (aout_symbol (symbol)->desc & 0xffff), + (unsigned) (aout_symbol (symbol)->other & 0xff), + (unsigned) (aout_symbol (symbol)->type & 0xff)); if (symbol->name) fprintf(file," %s", symbol->name); } @@ -2426,18 +2125,15 @@ NAME(aout,print_symbol) (abfd, afile, symbol, how) BFD asymbol structures. */ long -NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep) - bfd *abfd; - bfd_boolean dynamic; - PTR *minisymsp; - unsigned int *sizep; +NAME (aout, read_minisymbols) (bfd *abfd, + bfd_boolean dynamic, + void * *minisymsp, + unsigned int *sizep) { if (dynamic) - { - /* We could handle the dynamic symbols here as well, but it's - easier to hand them off. */ - return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep); - } + /* We could handle the dynamic symbols here as well, but it's + easier to hand them off. */ + return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep); if (! aout_get_external_symbols (abfd)) return -1; @@ -2445,7 +2141,7 @@ NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep) if (obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD) return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep); - *minisymsp = (PTR) obj_aout_external_syms (abfd); + *minisymsp = (void *) obj_aout_external_syms (abfd); /* By passing the external symbols back from this routine, we are giving up control over the memory block. Clear @@ -2462,11 +2158,10 @@ NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep) by bfd_make_empty_symbol, which we fill in here. */ asymbol * -NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym) - bfd *abfd; - bfd_boolean dynamic; - const PTR minisym; - asymbol *sym; +NAME (aout, minisymbol_to_symbol) (bfd *abfd, + bfd_boolean dynamic, + const void * minisym, + asymbol *sym) { if (dynamic || obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD) @@ -2475,7 +2170,7 @@ NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym) memset (sym, 0, sizeof (aout_symbol_type)); /* We call translate_symbol_table to translate a single symbol. */ - if (! (NAME(aout,translate_symbol_table) + if (! (NAME (aout, translate_symbol_table) (abfd, (aout_symbol_type *) sym, (struct external_nlist *) minisym, @@ -2488,29 +2183,25 @@ NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym) return sym; } -/* - provided a BFD, a section and an offset into the section, calculate - and return the name of the source file and the line nearest to the - wanted location. -*/ +/* Provided a BFD, a section and an offset into the section, calculate + and return the name of the source file and the line nearest to the + wanted location. */ bfd_boolean -NAME(aout,find_nearest_line) - (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr) - bfd *abfd; - asection *section; - asymbol **symbols; - bfd_vma offset; - const char **filename_ptr; - const char **functionname_ptr; - unsigned int *line_ptr; +NAME (aout, find_nearest_line) (bfd *abfd, + asection *section, + asymbol **symbols, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, + unsigned int *line_ptr) { - /* Run down the file looking for the filename, function and linenumber */ + /* Run down the file looking for the filename, function and linenumber. */ asymbol **p; const char *directory_name = NULL; const char *main_file_name = NULL; const char *current_file_name = NULL; - const char *line_file_name = NULL; /* Value of current_file_name at line number. */ + const char *line_file_name = NULL; /* Value of current_file_name at line number. */ bfd_vma low_line_vma = 0; bfd_vma low_func_vma = 0; asymbol *func = 0; @@ -2521,7 +2212,7 @@ NAME(aout,find_nearest_line) *functionname_ptr = 0; *line_ptr = 0; - if (symbols != (asymbol **)NULL) + if (symbols != NULL) { for (p = symbols; *p; p++) { @@ -2573,15 +2264,15 @@ NAME(aout,find_nearest_line) } main_file_name = current_file_name = q->symbol.name; - /* Look ahead to next symbol to check if that too is an N_SO. */ + /* Look ahead to next symbol to check if that too is an N_SO. */ p++; if (*p == NULL) break; q = (aout_symbol_type *)(*p); - if (q->type != (int)N_SO) + if (q->type != (int) N_SO) goto next; - /* Found a second N_SO First is directory; second is filename. */ + /* Found a second N_SO First is directory; second is filename. */ directory_name = current_file_name; main_file_name = current_file_name = q->symbol.name; if (obj_textsec(abfd) != section) @@ -2607,12 +2298,12 @@ NAME(aout,find_nearest_line) case N_FUN: { - /* We'll keep this if it is nearer than the one we have already */ + /* We'll keep this if it is nearer than the one we have already. */ if (q->symbol.value >= low_func_vma && q->symbol.value <= offset) { low_func_vma = q->symbol.value; - func = (asymbol *)q; + func = (asymbol *) q; } else if (q->symbol.value > offset) goto done; @@ -2643,7 +2334,7 @@ NAME(aout,find_nearest_line) adata (abfd).line_buf = buf = NULL; else { - buf = (char *) bfd_malloc ((bfd_size_type) filelen + funclen + 3); + buf = bfd_malloc ((bfd_size_type) filelen + funclen + 3); adata (abfd).line_buf = buf; if (buf == NULL) return FALSE; @@ -2688,19 +2379,16 @@ NAME(aout,find_nearest_line) } int -NAME(aout,sizeof_headers) (abfd, execable) - bfd *abfd; - bfd_boolean execable ATTRIBUTE_UNUSED; +NAME (aout, sizeof_headers) (bfd *abfd, bfd_boolean execable ATTRIBUTE_UNUSED) { - return adata(abfd).exec_bytes_size; + return adata (abfd).exec_bytes_size; } /* Free all information we have cached for this BFD. We can always read it again later if we need it. */ bfd_boolean -NAME(aout,bfd_free_cached_info) (abfd) - bfd *abfd; +NAME (aout, bfd_free_cached_info) (bfd *abfd) { asection *o; @@ -2709,6 +2397,7 @@ NAME(aout,bfd_free_cached_info) (abfd) #define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; } BFCI_FREE (obj_aout_symbols (abfd)); + #ifdef USE_MMAP obj_aout_external_syms (abfd) = 0; bfd_free_window (&obj_aout_sym_window (abfd)); @@ -2718,47 +2407,32 @@ NAME(aout,bfd_free_cached_info) (abfd) BFCI_FREE (obj_aout_external_syms (abfd)); BFCI_FREE (obj_aout_external_strings (abfd)); #endif - for (o = abfd->sections; o != (asection *) NULL; o = o->next) + for (o = abfd->sections; o != NULL; o = o->next) BFCI_FREE (o->relocation); #undef BFCI_FREE return TRUE; } -/* a.out link code. */ - -static bfd_boolean aout_link_add_object_symbols - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean aout_link_check_archive_element - PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *)); -static bfd_boolean aout_link_free_symbols PARAMS ((bfd *)); -static bfd_boolean aout_link_check_ar_symbols - PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded)); -static bfd_boolean aout_link_add_symbols - PARAMS ((bfd *, struct bfd_link_info *)); - /* Routine to create an entry in an a.out link hash table. */ struct bfd_hash_entry * -NAME(aout,link_hash_newfunc) (entry, table, string) - struct bfd_hash_entry *entry; - struct bfd_hash_table *table; - const char *string; +NAME (aout, link_hash_newfunc) (struct bfd_hash_entry *entry, + struct bfd_hash_table *table, + const char *string) { struct aout_link_hash_entry *ret = (struct aout_link_hash_entry *) entry; /* Allocate the structure if it has not already been allocated by a subclass. */ - if (ret == (struct aout_link_hash_entry *) NULL) - ret = ((struct aout_link_hash_entry *) - bfd_hash_allocate (table, sizeof (struct aout_link_hash_entry))); - if (ret == (struct aout_link_hash_entry *) NULL) - return (struct bfd_hash_entry *) ret; + if (ret == NULL) + ret = bfd_hash_allocate (table, sizeof (* ret)); + if (ret == NULL) + return NULL; /* Call the allocation method of the superclass. */ - ret = ((struct aout_link_hash_entry *) - _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret, - table, string)); + ret = (struct aout_link_hash_entry *) + _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret, table, string); if (ret) { /* Set local fields. */ @@ -2772,12 +2446,11 @@ NAME(aout,link_hash_newfunc) (entry, table, string) /* Initialize an a.out link hash table. */ bfd_boolean -NAME(aout,link_hash_table_init) (table, abfd, newfunc) - struct aout_link_hash_table *table; - bfd *abfd; - struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *, - struct bfd_hash_table *, - const char *)); +NAME (aout, link_hash_table_init) (struct aout_link_hash_table *table, + bfd *abfd, + struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *, + struct bfd_hash_table *, + const char *)) { return _bfd_link_hash_table_init (&table->root, abfd, newfunc); } @@ -2785,31 +2458,55 @@ NAME(aout,link_hash_table_init) (table, abfd, newfunc) /* Create an a.out link hash table. */ struct bfd_link_hash_table * -NAME(aout,link_hash_table_create) (abfd) - bfd *abfd; +NAME (aout, link_hash_table_create) (bfd *abfd) { struct aout_link_hash_table *ret; bfd_size_type amt = sizeof (struct aout_link_hash_table); - ret = ((struct aout_link_hash_table *) bfd_alloc (abfd, amt)); + ret = bfd_alloc (abfd, amt); if (ret == NULL) - return (struct bfd_link_hash_table *) NULL; - if (! NAME(aout,link_hash_table_init) (ret, abfd, - NAME(aout,link_hash_newfunc))) + return NULL; + if (! NAME (aout, link_hash_table_init) (ret, abfd, + NAME (aout, link_hash_newfunc))) { free (ret); - return (struct bfd_link_hash_table *) NULL; + return NULL; } return &ret->root; } +/* Free up the internal symbols read from an a.out file. */ + +static bfd_boolean +aout_link_free_symbols (bfd *abfd) +{ + if (obj_aout_external_syms (abfd) != NULL) + { +#ifdef USE_MMAP + bfd_free_window (&obj_aout_sym_window (abfd)); +#else + free ((void *) obj_aout_external_syms (abfd)); +#endif + obj_aout_external_syms (abfd) = NULL; + } + + if (obj_aout_external_strings (abfd) != NULL) + { +#ifdef USE_MMAP + bfd_free_window (&obj_aout_string_window (abfd)); +#else + free ((void *) obj_aout_external_strings (abfd)); +#endif + obj_aout_external_strings (abfd) = NULL; + } + return TRUE; +} + /* Given an a.out BFD, add symbols to the global hash table as appropriate. */ bfd_boolean -NAME(aout,link_add_symbols) (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +NAME (aout, link_add_symbols) (bfd *abfd, struct bfd_link_info *info) { switch (bfd_get_format (abfd)) { @@ -2827,9 +2524,7 @@ NAME(aout,link_add_symbols) (abfd, info) /* Add symbols from an a.out object file. */ static bfd_boolean -aout_link_add_object_symbols (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +aout_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) { if (! aout_get_external_symbols (abfd)) return FALSE; @@ -2843,65 +2538,6 @@ aout_link_add_object_symbols (abfd, info) return TRUE; } -/* Check a single archive element to see if we need to include it in - the link. *PNEEDED is set according to whether this element is - needed in the link or not. This is called from - _bfd_generic_link_add_archive_symbols. */ - -static bfd_boolean -aout_link_check_archive_element (abfd, info, pneeded) - bfd *abfd; - struct bfd_link_info *info; - bfd_boolean *pneeded; -{ - if (! aout_get_external_symbols (abfd)) - return FALSE; - - if (! aout_link_check_ar_symbols (abfd, info, pneeded)) - return FALSE; - - if (*pneeded) - { - if (! aout_link_add_symbols (abfd, info)) - return FALSE; - } - - if (! info->keep_memory || ! *pneeded) - { - if (! aout_link_free_symbols (abfd)) - return FALSE; - } - - return TRUE; -} - -/* Free up the internal symbols read from an a.out file. */ - -static bfd_boolean -aout_link_free_symbols (abfd) - bfd *abfd; -{ - if (obj_aout_external_syms (abfd) != (struct external_nlist *) NULL) - { -#ifdef USE_MMAP - bfd_free_window (&obj_aout_sym_window (abfd)); -#else - free ((PTR) obj_aout_external_syms (abfd)); -#endif - obj_aout_external_syms (abfd) = (struct external_nlist *) NULL; - } - if (obj_aout_external_strings (abfd) != (char *) NULL) - { -#ifdef USE_MMAP - bfd_free_window (&obj_aout_string_window (abfd)); -#else - free ((PTR) obj_aout_external_strings (abfd)); -#endif - obj_aout_external_strings (abfd) = (char *) NULL; - } - return TRUE; -} - /* Look through the internal symbols to see if this object file should be included in the link. We should include this object file if it defines any symbols which are currently undefined. If this object @@ -2910,12 +2546,11 @@ aout_link_free_symbols (abfd) (unless there is some other reason to include it). */ static bfd_boolean -aout_link_check_ar_symbols (abfd, info, pneeded) - bfd *abfd; - struct bfd_link_info *info; - bfd_boolean *pneeded; +aout_link_check_ar_symbols (bfd *abfd, + struct bfd_link_info *info, + bfd_boolean *pneeded) { - register struct external_nlist *p; + struct external_nlist *p; struct external_nlist *pend; char *strings; @@ -2943,7 +2578,7 @@ aout_link_check_ar_symbols (abfd, info, pneeded) /* We are only interested in symbols that are currently undefined or common. */ - if (h == (struct bfd_link_hash_entry *) NULL + if (h == NULL || (h->type != bfd_link_hash_undefined && h->type != bfd_link_hash_common)) continue; @@ -2989,15 +2624,14 @@ aout_link_check_ar_symbols (abfd, info, pneeded) unsigned int power; symbfd = h->u.undef.abfd; - if (symbfd == (bfd *) NULL) + if (symbfd == NULL) { /* This symbol was created as undefined from outside BFD. We assume that we should link in the object file. This is done for the -u option in the linker. */ - if (! (*info->callbacks->add_archive_element) (info, - abfd, - name)) + if (! (*info->callbacks->add_archive_element) + (info, abfd, name)) return FALSE; *pneeded = TRUE; return TRUE; @@ -3005,9 +2639,8 @@ aout_link_check_ar_symbols (abfd, info, pneeded) /* Turn the current link symbol into a common symbol. It is already on the undefs list. */ h->type = bfd_link_hash_common; - h->u.c.p = ((struct bfd_link_hash_common_entry *) - bfd_hash_allocate (&info->hash->table, - sizeof (struct bfd_link_hash_common_entry))); + h->u.c.p = bfd_hash_allocate (&info->hash->table, + sizeof (struct bfd_link_hash_common_entry)); if (h->u.c.p == NULL) return FALSE; @@ -3040,23 +2673,52 @@ aout_link_check_ar_symbols (abfd, info, pneeded) return TRUE; } +/* Check a single archive element to see if we need to include it in + the link. *PNEEDED is set according to whether this element is + needed in the link or not. This is called from + _bfd_generic_link_add_archive_symbols. */ + +static bfd_boolean +aout_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, + bfd_boolean *pneeded) +{ + if (! aout_get_external_symbols (abfd)) + return FALSE; + + if (! aout_link_check_ar_symbols (abfd, info, pneeded)) + return FALSE; + + if (*pneeded) + { + if (! aout_link_add_symbols (abfd, info)) + return FALSE; + } + + if (! info->keep_memory || ! *pneeded) + { + if (! aout_link_free_symbols (abfd)) + return FALSE; + } + + return TRUE; +} + /* Add all symbols from an object file to the hash table. */ static bfd_boolean -aout_link_add_symbols (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +aout_link_add_symbols (bfd *abfd, struct bfd_link_info *info) { bfd_boolean (*add_one_symbol) - PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *, - bfd_vma, const char *, bfd_boolean, bfd_boolean, - struct bfd_link_hash_entry **)); + (struct bfd_link_info *, bfd *, const char *, flagword, asection *, + bfd_vma, const char *, bfd_boolean, bfd_boolean, + struct bfd_link_hash_entry **); struct external_nlist *syms; bfd_size_type sym_count; char *strings; bfd_boolean copy; struct aout_link_hash_entry **sym_hash; - register struct external_nlist *p; + struct external_nlist *p; struct external_nlist *pend; syms = obj_aout_external_syms (abfd); @@ -3078,9 +2740,8 @@ aout_link_add_symbols (abfd, info) to particular symbols. We could just look them up in the hash table, but keeping the list is more efficient. Perhaps this should be conditional on info->keep_memory. */ - sym_hash = ((struct aout_link_hash_entry **) - bfd_alloc (abfd, - sym_count * sizeof (struct aout_link_hash_entry *))); + sym_hash = bfd_alloc (abfd, + sym_count * sizeof (struct aout_link_hash_entry *)); if (sym_hash == NULL && sym_count != 0) return FALSE; obj_aout_sym_hashes (abfd) = sym_hash; @@ -3180,119 +2841,789 @@ aout_link_add_symbols (abfd, info) return TRUE; } -/* A hash table used for header files with N_BINCL entries. */ +/* Look up an entry in an the header file hash table. */ -struct aout_link_includes_table +#define aout_link_includes_lookup(table, string, create, copy) \ + ((struct aout_link_includes_entry *) \ + bfd_hash_lookup (&(table)->root, (string), (create), (copy))) + +/* The function to create a new entry in the header file hash table. */ + +static struct bfd_hash_entry * +aout_link_includes_newfunc (struct bfd_hash_entry *entry, + struct bfd_hash_table *table, + const char *string) { - struct bfd_hash_table root; -}; + struct aout_link_includes_entry * ret = + (struct aout_link_includes_entry *) entry; -/* A linked list of totals that we have found for a particular header - file. */ + /* Allocate the structure if it has not already been allocated by a + subclass. */ + if (ret == NULL) + ret = bfd_hash_allocate (table, + sizeof (struct aout_link_includes_entry)); + if (ret == NULL) + return NULL; -struct aout_link_includes_totals + /* Call the allocation method of the superclass. */ + ret = ((struct aout_link_includes_entry *) + bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string)); + if (ret) + /* Set local fields. */ + ret->totals = NULL; + + return (struct bfd_hash_entry *) ret; +} + +static bfd_boolean +aout_link_write_other_symbol (struct aout_link_hash_entry *h, void * data) { - struct aout_link_includes_totals *next; - bfd_vma total; -}; + struct aout_final_link_info *finfo = (struct aout_final_link_info *) data; + bfd *output_bfd; + int type; + bfd_vma val; + struct external_nlist outsym; + bfd_size_type indx; + bfd_size_type amt; -/* An entry in the header file hash table. */ + if (h->root.type == bfd_link_hash_warning) + { + h = (struct aout_link_hash_entry *) h->root.u.i.link; + if (h->root.type == bfd_link_hash_new) + return TRUE; + } -struct aout_link_includes_entry + output_bfd = finfo->output_bfd; + + if (aout_backend_info (output_bfd)->write_dynamic_symbol != NULL) + { + if (! ((*aout_backend_info (output_bfd)->write_dynamic_symbol) + (output_bfd, finfo->info, h))) + { + /* FIXME: No way to handle errors. */ + abort (); + } + } + + if (h->written) + return TRUE; + + h->written = TRUE; + + /* An indx of -2 means the symbol must be written. */ + if (h->indx != -2 + && (finfo->info->strip == strip_all + || (finfo->info->strip == strip_some + && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string, + FALSE, FALSE) == NULL))) + return TRUE; + + switch (h->root.type) + { + default: + abort (); + /* Avoid variable not initialized warnings. */ + return TRUE; + case bfd_link_hash_new: + /* This can happen for set symbols when sets are not being + built. */ + return TRUE; + case bfd_link_hash_undefined: + type = N_UNDF | N_EXT; + val = 0; + break; + case bfd_link_hash_defined: + case bfd_link_hash_defweak: + { + asection *sec; + + sec = h->root.u.def.section->output_section; + BFD_ASSERT (bfd_is_abs_section (sec) + || sec->owner == output_bfd); + if (sec == obj_textsec (output_bfd)) + type = h->root.type == bfd_link_hash_defined ? N_TEXT : N_WEAKT; + else if (sec == obj_datasec (output_bfd)) + type = h->root.type == bfd_link_hash_defined ? N_DATA : N_WEAKD; + else if (sec == obj_bsssec (output_bfd)) + type = h->root.type == bfd_link_hash_defined ? N_BSS : N_WEAKB; + else + type = h->root.type == bfd_link_hash_defined ? N_ABS : N_WEAKA; + type |= N_EXT; + val = (h->root.u.def.value + + sec->vma + + h->root.u.def.section->output_offset); + } + break; + case bfd_link_hash_common: + type = N_UNDF | N_EXT; + val = h->root.u.c.size; + break; + case bfd_link_hash_undefweak: + type = N_WEAKU; + val = 0; + case bfd_link_hash_indirect: + case bfd_link_hash_warning: + /* FIXME: Ignore these for now. The circumstances under which + they should be written out are not clear to me. */ + return TRUE; + } + + H_PUT_8 (output_bfd, type, outsym.e_type); + indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string, + FALSE); + if (indx == (bfd_size_type) -1) + /* FIXME: No way to handle errors. */ + abort (); + + PUT_WORD (output_bfd, indx, outsym.e_strx); + PUT_WORD (output_bfd, val, outsym.e_value); + + amt = EXTERNAL_NLIST_SIZE; + if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0 + || bfd_bwrite ((void *) &outsym, amt, output_bfd) != amt) + /* FIXME: No way to handle errors. */ + abort (); + + finfo->symoff += amt; + h->indx = obj_aout_external_sym_count (output_bfd); + ++obj_aout_external_sym_count (output_bfd); + + return TRUE; +} + +/* Handle a link order which is supposed to generate a reloc. */ + +static bfd_boolean +aout_link_reloc_link_order (struct aout_final_link_info *finfo, + asection *o, + struct bfd_link_order *p) { - struct bfd_hash_entry root; - /* List of totals we have found for this file. */ - struct aout_link_includes_totals *totals; -}; + struct bfd_link_order_reloc *pr; + int r_index; + int r_extern; + reloc_howto_type *howto; + file_ptr *reloff_ptr; + struct reloc_std_external srel; + void * rel_ptr; + bfd_size_type rel_size; -/* Look up an entry in an the header file hash table. */ + pr = p->u.reloc.p; -#define aout_link_includes_lookup(table, string, create, copy) \ - ((struct aout_link_includes_entry *) \ - bfd_hash_lookup (&(table)->root, (string), (create), (copy))) + if (p->type == bfd_section_reloc_link_order) + { + r_extern = 0; + if (bfd_is_abs_section (pr->u.section)) + r_index = N_ABS | N_EXT; + else + { + BFD_ASSERT (pr->u.section->owner == finfo->output_bfd); + r_index = pr->u.section->target_index; + } + } + else + { + struct aout_link_hash_entry *h; -/* During the final link step we need to pass around a bunch of - information, so we do it in an instance of this structure. */ + BFD_ASSERT (p->type == bfd_symbol_reloc_link_order); + r_extern = 1; + h = ((struct aout_link_hash_entry *) + bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info, + pr->u.name, FALSE, FALSE, TRUE)); + if (h != NULL + && h->indx >= 0) + r_index = h->indx; + else if (h != NULL) + { + /* We decided to strip this symbol, but it turns out that we + can't. Note that we lose the other and desc information + here. I don't think that will ever matter for a global + symbol. */ + h->indx = -2; + h->written = FALSE; + if (! aout_link_write_other_symbol (h, (void *) finfo)) + return FALSE; + r_index = h->indx; + } + else + { + if (! ((*finfo->info->callbacks->unattached_reloc) + (finfo->info, pr->u.name, NULL, NULL, (bfd_vma) 0))) + return FALSE; + r_index = 0; + } + } -struct aout_final_link_info + howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc); + if (howto == 0) + { + bfd_set_error (bfd_error_bad_value); + return FALSE; + } + + if (o == obj_textsec (finfo->output_bfd)) + reloff_ptr = &finfo->treloff; + else if (o == obj_datasec (finfo->output_bfd)) + reloff_ptr = &finfo->dreloff; + else + abort (); + +#ifdef MY_put_reloc + MY_put_reloc(finfo->output_bfd, r_extern, r_index, p->offset, howto, + &srel); +#else + { + int r_pcrel; + int r_baserel; + int r_jmptable; + int r_relative; + int r_length; + + fprintf (stderr, "TODO: line %d in bfd/pdp11.c\n", __LINE__); + + r_pcrel = howto->pc_relative; + r_baserel = (howto->type & 8) != 0; + r_jmptable = (howto->type & 16) != 0; + r_relative = (howto->type & 32) != 0; + r_length = howto->size; + + PUT_WORD (finfo->output_bfd, p->offset, srel.r_address); + if (bfd_header_big_endian (finfo->output_bfd)) + { + srel.r_index[0] = r_index >> 16; + srel.r_index[1] = r_index >> 8; + srel.r_index[2] = r_index; + srel.r_type[0] = + ((r_extern ? RELOC_STD_BITS_EXTERN_BIG : 0) + | (r_pcrel ? RELOC_STD_BITS_PCREL_BIG : 0) + | (r_baserel ? RELOC_STD_BITS_BASEREL_BIG : 0) + | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0) + | (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0) + | (r_length << RELOC_STD_BITS_LENGTH_SH_BIG)); + } + else + { + srel.r_index[2] = r_index >> 16; + srel.r_index[1] = r_index >> 8; + srel.r_index[0] = r_index; + srel.r_type[0] = + ((r_extern ? RELOC_STD_BITS_EXTERN_LITTLE : 0) + | (r_pcrel ? RELOC_STD_BITS_PCREL_LITTLE : 0) + | (r_baserel ? RELOC_STD_BITS_BASEREL_LITTLE : 0) + | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0) + | (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0) + | (r_length << RELOC_STD_BITS_LENGTH_SH_LITTLE)); + } + } +#endif + rel_ptr = (void *) &srel; + + /* We have to write the addend into the object file, since + standard a.out relocs are in place. It would be more + reliable if we had the current contents of the file here, + rather than assuming zeroes, but we can't read the file since + it was opened using bfd_openw. */ + if (pr->addend != 0) + { + bfd_size_type size; + bfd_reloc_status_type r; + bfd_byte *buf; + bfd_boolean ok; + + size = bfd_get_reloc_size (howto); + buf = bfd_zmalloc (size); + if (buf == NULL) + return FALSE; + r = MY_relocate_contents (howto, finfo->output_bfd, + pr->addend, buf); + switch (r) + { + case bfd_reloc_ok: + break; + default: + case bfd_reloc_outofrange: + abort (); + case bfd_reloc_overflow: + if (! ((*finfo->info->callbacks->reloc_overflow) + (finfo->info, NULL, + (p->type == bfd_section_reloc_link_order + ? bfd_section_name (finfo->output_bfd, + pr->u.section) + : pr->u.name), + howto->name, pr->addend, NULL, + (asection *) NULL, (bfd_vma) 0))) + { + free (buf); + return FALSE; + } + break; + } + ok = bfd_set_section_contents (finfo->output_bfd, o, + (void *) buf, + (file_ptr) p->offset, + size); + free (buf); + if (! ok) + return FALSE; + } + + rel_size = obj_reloc_entry_size (finfo->output_bfd); + if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0 + || bfd_bwrite (rel_ptr, rel_size, finfo->output_bfd) != rel_size) + return FALSE; + + *reloff_ptr += rel_size; + + /* Assert that the relocs have not run into the symbols, and that n + the text relocs have not run into the data relocs. */ + BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd) + && (reloff_ptr != &finfo->treloff + || (*reloff_ptr + <= obj_datasec (finfo->output_bfd)->rel_filepos))); + + return TRUE; +} + +/* Get the section corresponding to a reloc index. */ + +static inline asection * +aout_reloc_type_to_section (bfd *abfd, int type) { - /* General link information. */ - struct bfd_link_info *info; - /* Output bfd. */ + switch (type) + { + case RTEXT: return obj_textsec (abfd); + case RDATA: return obj_datasec (abfd); + case RBSS: return obj_bsssec (abfd); + case RABS: return bfd_abs_section_ptr; + case REXT: return bfd_und_section_ptr; + default: abort (); + } +} + +static bfd_boolean +pdp11_aout_link_input_section (struct aout_final_link_info *finfo, + bfd *input_bfd, + asection *input_section, + bfd_byte *relocs, + bfd_size_type rel_size, + bfd_byte *contents) +{ + bfd_boolean (*check_dynamic_reloc) + (struct bfd_link_info *, bfd *, asection *, + struct aout_link_hash_entry *, void *, bfd_byte *, bfd_boolean *, + bfd_vma *); bfd *output_bfd; - /* Reloc file positions. */ - file_ptr treloff, dreloff; - /* File position of symbols. */ - file_ptr symoff; - /* String table. */ - struct bfd_strtab_hash *strtab; - /* Header file hash table. */ - struct aout_link_includes_table includes; - /* A buffer large enough to hold the contents of any section. */ - bfd_byte *contents; - /* A buffer large enough to hold the relocs of any section. */ - PTR relocs; - /* A buffer large enough to hold the symbol map of any input BFD. */ + bfd_boolean relocatable; + struct external_nlist *syms; + char *strings; + struct aout_link_hash_entry **sym_hashes; int *symbol_map; - /* A buffer large enough to hold output symbols of any input BFD. */ - struct external_nlist *output_syms; -}; + bfd_size_type reloc_count; + bfd_byte *rel; + bfd_byte *rel_end; -static struct bfd_hash_entry *aout_link_includes_newfunc - PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *)); -static bfd_boolean aout_link_input_bfd - PARAMS ((struct aout_final_link_info *, bfd *input_bfd)); -static bfd_boolean aout_link_write_symbols - PARAMS ((struct aout_final_link_info *, bfd *input_bfd)); -static bfd_boolean aout_link_write_other_symbol - PARAMS ((struct aout_link_hash_entry *, PTR)); -static bfd_boolean aout_link_input_section - PARAMS ((struct aout_final_link_info *, bfd *input_bfd, - asection *input_section, file_ptr *reloff_ptr, - bfd_size_type rel_size)); -static INLINE asection *aout_reloc_type_to_section - PARAMS ((bfd *, int)); -static bfd_boolean aout_link_reloc_link_order - PARAMS ((struct aout_final_link_info *, asection *, - struct bfd_link_order *)); -static bfd_boolean pdp11_aout_link_input_section - PARAMS ((struct aout_final_link_info *finfo, - bfd *input_bfd, - asection *input_section, - bfd_byte *relocs, - bfd_size_type rel_size, - bfd_byte *contents)); + output_bfd = finfo->output_bfd; + check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc; -/* The function to create a new entry in the header file hash table. */ + BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_SIZE); + BFD_ASSERT (input_bfd->xvec->header_byteorder + == output_bfd->xvec->header_byteorder); -static struct bfd_hash_entry * -aout_link_includes_newfunc (entry, table, string) - struct bfd_hash_entry *entry; - struct bfd_hash_table *table; - const char *string; + relocatable = finfo->info->relocatable; + syms = obj_aout_external_syms (input_bfd); + strings = obj_aout_external_strings (input_bfd); + sym_hashes = obj_aout_sym_hashes (input_bfd); + symbol_map = finfo->symbol_map; + + reloc_count = rel_size / RELOC_SIZE; + rel = relocs; + rel_end = rel + rel_size; + for (; rel < rel_end; rel += RELOC_SIZE) + { + bfd_vma r_addr; + int r_index; + int r_type; + int r_pcrel; + int r_extern; + reloc_howto_type *howto; + struct aout_link_hash_entry *h = NULL; + bfd_vma relocation; + bfd_reloc_status_type r; + int reloc_entry; + + reloc_entry = GET_WORD (input_bfd, (void *) rel); + if (reloc_entry == 0) + continue; + + { + unsigned int howto_idx; + + r_index = (reloc_entry & RIDXMASK) >> 4; + r_type = reloc_entry & RTYPE; + r_pcrel = reloc_entry & RELFLG; + r_addr = (char *) rel - (char *) relocs; + + r_extern = (r_type == REXT); + + howto_idx = r_pcrel; + BFD_ASSERT (howto_idx < TABLE_SIZE (howto_table_pdp11)); + howto = howto_table_pdp11 + howto_idx; + } + + if (relocatable) + { + /* We are generating a relocatable output file, and must + modify the reloc accordingly. */ + if (r_extern) + { + /* If we know the symbol this relocation is against, + convert it into a relocation against a section. This + is what the native linker does. */ + h = sym_hashes[r_index]; + if (h != NULL + && (h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak)) + { + asection *output_section; + + /* Compute a new r_index. */ + output_section = h->root.u.def.section->output_section; + if (output_section == obj_textsec (output_bfd)) + r_type = N_TEXT; + else if (output_section == obj_datasec (output_bfd)) + r_type = N_DATA; + else if (output_section == obj_bsssec (output_bfd)) + r_type = N_BSS; + else + r_type = N_ABS; + + /* Add the symbol value and the section VMA to the + addend stored in the contents. */ + relocation = (h->root.u.def.value + + output_section->vma + + h->root.u.def.section->output_offset); + } + else + { + /* We must change r_index according to the symbol + map. */ + r_index = symbol_map[r_index]; + + if (r_index == -1) + { + if (h != NULL) + { + /* We decided to strip this symbol, but it + turns out that we can't. Note that we + lose the other and desc information here. + I don't think that will ever matter for a + global symbol. */ + if (h->indx < 0) + { + h->indx = -2; + h->written = FALSE; + if (! aout_link_write_other_symbol (h, + (void *) finfo)) + return FALSE; + } + r_index = h->indx; + } + else + { + const char *name; + + name = strings + GET_WORD (input_bfd, + syms[r_index].e_strx); + if (! ((*finfo->info->callbacks->unattached_reloc) + (finfo->info, name, input_bfd, input_section, + r_addr))) + return FALSE; + r_index = 0; + } + } + + relocation = 0; + } + + /* Write out the new r_index value. */ + reloc_entry = GET_WORD (input_bfd, rel); + reloc_entry &= RIDXMASK; + reloc_entry |= r_index << 4; + PUT_WORD (input_bfd, reloc_entry, rel); + } + else + { + asection *section; + + /* This is a relocation against a section. We must + adjust by the amount that the section moved. */ + section = aout_reloc_type_to_section (input_bfd, r_type); + relocation = (section->output_section->vma + + section->output_offset + - section->vma); + } + + /* Change the address of the relocation. */ + fprintf (stderr, "TODO: change the address of the relocation\n"); + + /* Adjust a PC relative relocation by removing the reference + to the original address in the section and including the + reference to the new address. */ + if (r_pcrel) + relocation -= (input_section->output_section->vma + + input_section->output_offset + - input_section->vma); + +#ifdef MY_relocatable_reloc + MY_relocatable_reloc (howto, output_bfd, rel, relocation, r_addr); +#endif + + if (relocation == 0) + r = bfd_reloc_ok; + else + r = MY_relocate_contents (howto, + input_bfd, relocation, + contents + r_addr); + } + else + { + bfd_boolean hundef; + + /* We are generating an executable, and must do a full + relocation. */ + hundef = FALSE; + if (r_extern) + { + h = sym_hashes[r_index]; + + if (h != NULL + && (h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak)) + { + relocation = (h->root.u.def.value + + h->root.u.def.section->output_section->vma + + h->root.u.def.section->output_offset); + } + else if (h != NULL + && h->root.type == bfd_link_hash_undefweak) + relocation = 0; + else + { + hundef = TRUE; + relocation = 0; + } + } + else + { + asection *section; + + section = aout_reloc_type_to_section (input_bfd, r_type); + relocation = (section->output_section->vma + + section->output_offset + - section->vma); + if (r_pcrel) + relocation += input_section->vma; + } + + if (check_dynamic_reloc != NULL) + { + bfd_boolean skip; + + if (! ((*check_dynamic_reloc) + (finfo->info, input_bfd, input_section, h, + (void *) rel, contents, &skip, &relocation))) + return FALSE; + if (skip) + continue; + } + + /* Now warn if a global symbol is undefined. We could not + do this earlier, because check_dynamic_reloc might want + to skip this reloc. */ + if (hundef && ! finfo->info->shared) + { + const char *name; + + if (h != NULL) + name = h->root.root.string; + else + name = strings + GET_WORD (input_bfd, syms[r_index].e_strx); + if (! ((*finfo->info->callbacks->undefined_symbol) + (finfo->info, name, input_bfd, input_section, + r_addr, TRUE))) + return FALSE; + } + + r = MY_final_link_relocate (howto, + input_bfd, input_section, + contents, r_addr, relocation, + (bfd_vma) 0); + } + + if (r != bfd_reloc_ok) + { + switch (r) + { + default: + case bfd_reloc_outofrange: + abort (); + case bfd_reloc_overflow: + { + const char *name; + + if (h != NULL) + name = NULL; + else if (r_extern) + name = strings + GET_WORD (input_bfd, + syms[r_index].e_strx); + else + { + asection *s; + + s = aout_reloc_type_to_section (input_bfd, r_type); + name = bfd_section_name (input_bfd, s); + } + if (! ((*finfo->info->callbacks->reloc_overflow) + (finfo->info, (h ? &h->root : NULL), name, + howto->name, (bfd_vma) 0, input_bfd, + input_section, r_addr))) + return FALSE; + } + break; + } + } + } + + return TRUE; +} + +/* Link an a.out section into the output file. */ + +static bfd_boolean +aout_link_input_section (struct aout_final_link_info *finfo, + bfd *input_bfd, + asection *input_section, + file_ptr *reloff_ptr, + bfd_size_type rel_size) { - struct aout_link_includes_entry *ret = - (struct aout_link_includes_entry *) entry; + bfd_size_type input_size; + void * relocs; - /* Allocate the structure if it has not already been allocated by a - subclass. */ - if (ret == (struct aout_link_includes_entry *) NULL) - ret = ((struct aout_link_includes_entry *) - bfd_hash_allocate (table, - sizeof (struct aout_link_includes_entry))); - if (ret == (struct aout_link_includes_entry *) NULL) - return (struct bfd_hash_entry *) ret; + /* Get the section contents. */ + input_size = input_section->size; + if (! bfd_get_section_contents (input_bfd, input_section, + (void *) finfo->contents, + (file_ptr) 0, input_size)) + return FALSE; - /* Call the allocation method of the superclass. */ - ret = ((struct aout_link_includes_entry *) - bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string)); - if (ret) + /* Read in the relocs if we haven't already done it. */ + if (aout_section_data (input_section) != NULL + && aout_section_data (input_section)->relocs != NULL) + relocs = aout_section_data (input_section)->relocs; + else { - /* Set local fields. */ - ret->totals = NULL; + relocs = finfo->relocs; + if (rel_size > 0) + { + if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0 + || bfd_bread (relocs, rel_size, input_bfd) != rel_size) + return FALSE; + } } - return (struct bfd_hash_entry *) ret; + /* Relocate the section contents. */ + if (! pdp11_aout_link_input_section (finfo, input_bfd, input_section, + (bfd_byte *) relocs, + rel_size, finfo->contents)) + return FALSE; + + /* Write out the section contents. */ + if (! bfd_set_section_contents (finfo->output_bfd, + input_section->output_section, + (void *) finfo->contents, + (file_ptr) input_section->output_offset, + input_size)) + return FALSE; + + /* If we are producing relocatable output, the relocs were + modified, and we now write them out. */ + if (finfo->info->relocatable && rel_size > 0) + { + if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0) + return FALSE; + if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size) + return FALSE; + *reloff_ptr += rel_size; + + /* Assert that the relocs have not run into the symbols, and + that if these are the text relocs they have not run into the + data relocs. */ + BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd) + && (reloff_ptr != &finfo->treloff + || (*reloff_ptr + <= obj_datasec (finfo->output_bfd)->rel_filepos))); + } + + return TRUE; +} + +/* Link an a.out input BFD into the output file. */ + +static bfd_boolean +aout_link_input_bfd (struct aout_final_link_info *finfo, bfd *input_bfd) +{ + bfd_size_type sym_count; + + BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object); + + /* If this is a dynamic object, it may need special handling. */ + if ((input_bfd->flags & DYNAMIC) != 0 + && aout_backend_info (input_bfd)->link_dynamic_object != NULL) + return ((*aout_backend_info (input_bfd)->link_dynamic_object) + (finfo->info, input_bfd)); + + /* Get the symbols. We probably have them already, unless + finfo->info->keep_memory is FALSE. */ + if (! aout_get_external_symbols (input_bfd)) + return FALSE; + + sym_count = obj_aout_external_sym_count (input_bfd); + + /* Write out the symbols and get a map of the new indices. The map + is placed into finfo->symbol_map. */ + if (! aout_link_write_symbols (finfo, input_bfd)) + return FALSE; + + /* Relocate and write out the sections. These functions use the + symbol map created by aout_link_write_symbols. The linker_mark + field will be set if these sections are to be included in the + link, which will normally be the case. */ + if (obj_textsec (input_bfd)->linker_mark) + { + if (! aout_link_input_section (finfo, input_bfd, + obj_textsec (input_bfd), + &finfo->treloff, + exec_hdr (input_bfd)->a_trsize)) + return FALSE; + } + if (obj_datasec (input_bfd)->linker_mark) + { + if (! aout_link_input_section (finfo, input_bfd, + obj_datasec (input_bfd), + &finfo->dreloff, + exec_hdr (input_bfd)->a_drsize)) + return FALSE; + } + + /* If we are not keeping memory, we don't need the symbols any + longer. We still need them if we are keeping memory, because the + strings in the hash table point into them. */ + if (! finfo->info->keep_memory) + { + if (! aout_link_free_symbols (input_bfd)) + return FALSE; + } + + return TRUE; } /* Do the final link step. This is called on the output BFD. The @@ -3303,21 +3634,20 @@ aout_link_includes_newfunc (entry, table, string) the output section. */ bfd_boolean -NAME(aout,final_link) (abfd, info, callback) - bfd *abfd; - struct bfd_link_info *info; - void (*callback) PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *)); +NAME (aout, final_link) (bfd *abfd, + struct bfd_link_info *info, + void (*callback) (bfd *, file_ptr *, file_ptr *, file_ptr *)) { struct aout_final_link_info aout_info; bfd_boolean includes_hash_initialized = FALSE; - register bfd *sub; + bfd *sub; bfd_size_type trsize, drsize; bfd_size_type max_contents_size; bfd_size_type max_relocs_size; bfd_size_type max_sym_count; bfd_size_type text_size; file_ptr text_end; - register struct bfd_link_order *p; + struct bfd_link_order *p; asection *o; bfd_boolean have_link_order_relocs; @@ -3394,11 +3724,11 @@ NAME(aout,final_link) (abfd, info, callback) if (info->relocatable) { - if (obj_textsec (abfd) != (asection *) NULL) + if (obj_textsec (abfd) != NULL) trsize += (_bfd_count_link_order_relocs (obj_textsec (abfd) ->link_order_head) * obj_reloc_entry_size (abfd)); - if (obj_datasec (abfd) != (asection *) NULL) + if (obj_datasec (abfd) != NULL) drsize += (_bfd_count_link_order_relocs (obj_datasec (abfd) ->link_order_head) * obj_reloc_entry_size (abfd)); @@ -3406,13 +3736,12 @@ NAME(aout,final_link) (abfd, info, callback) exec_hdr (abfd)->a_trsize = trsize; exec_hdr (abfd)->a_drsize = drsize; - exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd); /* Adjust the section sizes and vmas according to the magic number. This sets a_text, a_data and a_bss in the exec_hdr and sets the filepos for each section. */ - if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end)) + if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end)) goto error_return; /* The relocation and symbol file positions differ among a.out @@ -3438,12 +3767,11 @@ NAME(aout,final_link) (abfd, info, callback) goto error_return; /* Allocate buffers to hold section contents and relocs. */ - aout_info.contents = (bfd_byte *) bfd_malloc (max_contents_size); - aout_info.relocs = (PTR) bfd_malloc (max_relocs_size); - aout_info.symbol_map = (int *) bfd_malloc (max_sym_count * sizeof (int *)); - aout_info.output_syms = ((struct external_nlist *) - bfd_malloc ((max_sym_count + 1) - * sizeof (struct external_nlist))); + aout_info.contents = bfd_malloc (max_contents_size); + aout_info.relocs = bfd_malloc (max_relocs_size); + aout_info.symbol_map = bfd_malloc (max_sym_count * sizeof (int *)); + aout_info.output_syms = bfd_malloc ((max_sym_count + 1) + * sizeof (struct external_nlist)); if ((aout_info.contents == NULL && max_contents_size != 0) || (aout_info.relocs == NULL && max_relocs_size != 0) || (aout_info.symbol_map == NULL && max_sym_count != 0) @@ -3484,7 +3812,7 @@ NAME(aout,final_link) (abfd, info, callback) We use the output_has_begun field of the input BFDs to see whether we have already handled it. */ - for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next) + for (sub = info->input_bfds; sub != NULL; sub = sub->link_next) sub->output_has_begun = FALSE; /* Mark all sections which are to be included in the link. This @@ -3494,17 +3822,15 @@ NAME(aout,final_link) (abfd, info, callback) for (o = abfd->sections; o != NULL; o = o->next) { for (p = o->link_order_head; p != NULL; p = p->next) - { - if (p->type == bfd_indirect_link_order) - p->u.indirect.section->linker_mark = TRUE; - } + if (p->type == bfd_indirect_link_order) + p->u.indirect.section->linker_mark = TRUE; } have_link_order_relocs = FALSE; - for (o = abfd->sections; o != (asection *) NULL; o = o->next) + for (o = abfd->sections; o != NULL; o = o->next) { for (p = o->link_order_head; - p != (struct bfd_link_order *) NULL; + p != NULL; p = p->next) { if (p->type == bfd_indirect_link_order @@ -3523,10 +3849,8 @@ NAME(aout,final_link) (abfd, info, callback) } else if (p->type == bfd_section_reloc_link_order || p->type == bfd_symbol_reloc_link_order) - { - /* These are handled below. */ - have_link_order_relocs = TRUE; - } + /* These are handled below. */ + have_link_order_relocs = TRUE; else { if (! _bfd_default_link_order (abfd, info, o, p)) @@ -3538,7 +3862,7 @@ NAME(aout,final_link) (abfd, info, callback) /* Write out any symbols that we have not already written out. */ aout_link_hash_traverse (aout_hash_table (info), aout_link_write_other_symbol, - (PTR) &aout_info); + (void *) &aout_info); /* Now handle any relocs we were asked to create by the linker. These did not come from any input file. We must do these after @@ -3546,10 +3870,10 @@ NAME(aout,final_link) (abfd, info, callback) indices to use. */ if (have_link_order_relocs) { - for (o = abfd->sections; o != (asection *) NULL; o = o->next) + for (o = abfd->sections; o != NULL; o = o->next) { for (p = o->link_order_head; - p != (struct bfd_link_order *) NULL; + p != NULL; p = p->next) { if (p->type == bfd_section_reloc_link_order @@ -3642,77 +3966,11 @@ NAME(aout,final_link) (abfd, info, callback) return FALSE; } -/* Link an a.out input BFD into the output file. */ - -static bfd_boolean -aout_link_input_bfd (finfo, input_bfd) - struct aout_final_link_info *finfo; - bfd *input_bfd; -{ - bfd_size_type sym_count; - - BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object); - - /* If this is a dynamic object, it may need special handling. */ - if ((input_bfd->flags & DYNAMIC) != 0 - && aout_backend_info (input_bfd)->link_dynamic_object != NULL) - { - return ((*aout_backend_info (input_bfd)->link_dynamic_object) - (finfo->info, input_bfd)); - } - - /* Get the symbols. We probably have them already, unless - finfo->info->keep_memory is FALSE. */ - if (! aout_get_external_symbols (input_bfd)) - return FALSE; - - sym_count = obj_aout_external_sym_count (input_bfd); - - /* Write out the symbols and get a map of the new indices. The map - is placed into finfo->symbol_map. */ - if (! aout_link_write_symbols (finfo, input_bfd)) - return FALSE; - - /* Relocate and write out the sections. These functions use the - symbol map created by aout_link_write_symbols. The linker_mark - field will be set if these sections are to be included in the - link, which will normally be the case. */ - if (obj_textsec (input_bfd)->linker_mark) - { - if (! aout_link_input_section (finfo, input_bfd, - obj_textsec (input_bfd), - &finfo->treloff, - exec_hdr (input_bfd)->a_trsize)) - return FALSE; - } - if (obj_datasec (input_bfd)->linker_mark) - { - if (! aout_link_input_section (finfo, input_bfd, - obj_datasec (input_bfd), - &finfo->dreloff, - exec_hdr (input_bfd)->a_drsize)) - return FALSE; - } - - /* If we are not keeping memory, we don't need the symbols any - longer. We still need them if we are keeping memory, because the - strings in the hash table point into them. */ - if (! finfo->info->keep_memory) - { - if (! aout_link_free_symbols (input_bfd)) - return FALSE; - } - - return TRUE; -} - /* Adjust and write out the symbols for an a.out file. Set the new symbol indices into a symbol_map. */ static bfd_boolean -aout_link_write_symbols (finfo, input_bfd) - struct aout_final_link_info *finfo; - bfd *input_bfd; +aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd) { bfd *output_bfd; bfd_size_type sym_count; @@ -3721,7 +3979,7 @@ aout_link_write_symbols (finfo, input_bfd) enum bfd_link_discard discard; struct external_nlist *outsym; bfd_size_type strtab_index; - register struct external_nlist *sym; + struct external_nlist *sym; struct external_nlist *sym_end; struct aout_link_hash_entry **sym_hash; int *symbol_map; @@ -3827,7 +4085,7 @@ aout_link_write_symbols (finfo, input_bfd) that the relocation routines relocate against the real symbol. */ hresolve = h; - if (h != (struct aout_link_hash_entry *) NULL + if (h != NULL && (h->root.type == bfd_link_hash_indirect || h->root.type == bfd_link_hash_warning)) { @@ -3840,7 +4098,7 @@ aout_link_write_symbols (finfo, input_bfd) } /* If the symbol has already been written out, skip it. */ - if (h != (struct aout_link_hash_entry *) NULL + if (h != NULL && h->root.type != bfd_link_hash_warning && h->written) { @@ -3872,7 +4130,7 @@ aout_link_write_symbols (finfo, input_bfd) } if (skip) { - if (h != (struct aout_link_hash_entry *) NULL) + if (h != NULL) h->written = TRUE; continue; } @@ -3891,7 +4149,7 @@ aout_link_write_symbols (finfo, input_bfd) || type == N_WEAKA) symsec = bfd_abs_section_ptr; else if (((type & N_TYPE) == N_INDR - && (hresolve == (struct aout_link_hash_entry *) NULL + && (hresolve == NULL || (hresolve->root.type != bfd_link_hash_defined && hresolve->root.type != bfd_link_hash_defweak && hresolve->root.type != bfd_link_hash_common))) @@ -3925,7 +4183,7 @@ aout_link_write_symbols (finfo, input_bfd) /* We need to get the value from the hash table. We use hresolve so that if we have defined an indirect symbol we output the final definition. */ - if (h == (struct aout_link_hash_entry *) NULL) + if (h == NULL) { switch (type & N_TYPE) { @@ -4000,7 +4258,7 @@ aout_link_write_symbols (finfo, input_bfd) else val = 0; } - if (symsec != (asection *) NULL) + if (symsec != NULL) val = (symsec->output_section->vma + symsec->output_offset + (GET_WORD (input_bfd, sym->e_value) @@ -4008,7 +4266,7 @@ aout_link_write_symbols (finfo, input_bfd) /* If this is a global symbol set the written flag, and if it is a local symbol see if we should discard it. */ - if (h != (struct aout_link_hash_entry *) NULL) + if (h != NULL) { h->written = TRUE; h->indx = obj_aout_external_sym_count (output_bfd); @@ -4102,9 +4360,8 @@ aout_link_write_symbols (finfo, input_bfd) { /* This is the first time we have seen this header file with this set of stabs strings. */ - t = ((struct aout_link_includes_totals *) - bfd_hash_allocate (&finfo->includes.root, - sizeof *t)); + t = bfd_hash_allocate (&finfo->includes.root, + sizeof *t); if (t == NULL) return FALSE; t->total = val; @@ -4155,7 +4412,7 @@ aout_link_write_symbols (finfo, input_bfd) /* name points into a string table which we are going to free. If there is a hash table entry, use that string. Otherwise, copy name into memory. */ - if (h != (struct aout_link_hash_entry *) NULL) + if (h != NULL) name = h->root.root.string; else copy = TRUE; @@ -4180,7 +4437,7 @@ aout_link_write_symbols (finfo, input_bfd) return FALSE; size = outsym - finfo->output_syms; size *= EXTERNAL_NLIST_SIZE; - if (bfd_bwrite ((PTR) finfo->output_syms, size, output_bfd) != size) + if (bfd_bwrite ((void *) finfo->output_syms, size, output_bfd) != size) return FALSE; finfo->symoff += size; } @@ -4191,722 +4448,12 @@ aout_link_write_symbols (finfo, input_bfd) /* Write out a symbol that was not associated with an a.out input object. */ -static bfd_boolean -aout_link_write_other_symbol (h, data) - struct aout_link_hash_entry *h; - PTR data; -{ - struct aout_final_link_info *finfo = (struct aout_final_link_info *) data; - bfd *output_bfd; - int type; - bfd_vma val; - struct external_nlist outsym; - bfd_size_type indx; - bfd_size_type amt; - - if (h->root.type == bfd_link_hash_warning) - { - h = (struct aout_link_hash_entry *) h->root.u.i.link; - if (h->root.type == bfd_link_hash_new) - return TRUE; - } - - output_bfd = finfo->output_bfd; - - if (aout_backend_info (output_bfd)->write_dynamic_symbol != NULL) - { - if (! ((*aout_backend_info (output_bfd)->write_dynamic_symbol) - (output_bfd, finfo->info, h))) - { - /* FIXME: No way to handle errors. */ - abort (); - } - } - - if (h->written) - return TRUE; - - h->written = TRUE; - - /* An indx of -2 means the symbol must be written. */ - if (h->indx != -2 - && (finfo->info->strip == strip_all - || (finfo->info->strip == strip_some - && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string, - FALSE, FALSE) == NULL))) - return TRUE; - - switch (h->root.type) - { - default: - abort (); - /* Avoid variable not initialized warnings. */ - return TRUE; - case bfd_link_hash_new: - /* This can happen for set symbols when sets are not being - built. */ - return TRUE; - case bfd_link_hash_undefined: - type = N_UNDF | N_EXT; - val = 0; - break; - case bfd_link_hash_defined: - case bfd_link_hash_defweak: - { - asection *sec; - - sec = h->root.u.def.section->output_section; - BFD_ASSERT (bfd_is_abs_section (sec) - || sec->owner == output_bfd); - if (sec == obj_textsec (output_bfd)) - type = h->root.type == bfd_link_hash_defined ? N_TEXT : N_WEAKT; - else if (sec == obj_datasec (output_bfd)) - type = h->root.type == bfd_link_hash_defined ? N_DATA : N_WEAKD; - else if (sec == obj_bsssec (output_bfd)) - type = h->root.type == bfd_link_hash_defined ? N_BSS : N_WEAKB; - else - type = h->root.type == bfd_link_hash_defined ? N_ABS : N_WEAKA; - type |= N_EXT; - val = (h->root.u.def.value - + sec->vma - + h->root.u.def.section->output_offset); - } - break; - case bfd_link_hash_common: - type = N_UNDF | N_EXT; - val = h->root.u.c.size; - break; - case bfd_link_hash_undefweak: - type = N_WEAKU; - val = 0; - case bfd_link_hash_indirect: - case bfd_link_hash_warning: - /* FIXME: Ignore these for now. The circumstances under which - they should be written out are not clear to me. */ - return TRUE; - } - - H_PUT_8 (output_bfd, type, outsym.e_type); - indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string, - FALSE); - if (indx == (bfd_size_type) -1) - { - /* FIXME: No way to handle errors. */ - abort (); - } - PUT_WORD (output_bfd, indx, outsym.e_strx); - PUT_WORD (output_bfd, val, outsym.e_value); - - amt = EXTERNAL_NLIST_SIZE; - if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0 - || bfd_bwrite ((PTR) &outsym, amt, output_bfd) != amt) - { - /* FIXME: No way to handle errors. */ - abort (); - } - - finfo->symoff += amt; - h->indx = obj_aout_external_sym_count (output_bfd); - ++obj_aout_external_sym_count (output_bfd); - - return TRUE; -} - -/* Link an a.out section into the output file. */ - -static bfd_boolean -aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr, - rel_size) - struct aout_final_link_info *finfo; - bfd *input_bfd; - asection *input_section; - file_ptr *reloff_ptr; - bfd_size_type rel_size; -{ - bfd_size_type input_size; - PTR relocs; - - /* Get the section contents. */ - input_size = input_section->size; - if (! bfd_get_section_contents (input_bfd, input_section, - (PTR) finfo->contents, - (file_ptr) 0, input_size)) - return FALSE; - - /* Read in the relocs if we haven't already done it. */ - if (aout_section_data (input_section) != NULL - && aout_section_data (input_section)->relocs != NULL) - relocs = aout_section_data (input_section)->relocs; - else - { - relocs = finfo->relocs; - if (rel_size > 0) - { - if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0 - || bfd_bread (relocs, rel_size, input_bfd) != rel_size) - return FALSE; - } - } - - /* Relocate the section contents. */ - if (! pdp11_aout_link_input_section (finfo, input_bfd, input_section, - (bfd_byte *) relocs, - rel_size, finfo->contents)) - return FALSE; - - /* Write out the section contents. */ - if (! bfd_set_section_contents (finfo->output_bfd, - input_section->output_section, - (PTR) finfo->contents, - (file_ptr) input_section->output_offset, - input_size)) - return FALSE; - - /* If we are producing relocatable output, the relocs were - modified, and we now write them out. */ - if (finfo->info->relocatable && rel_size > 0) - { - if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0) - return FALSE; - if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size) - return FALSE; - *reloff_ptr += rel_size; - - /* Assert that the relocs have not run into the symbols, and - that if these are the text relocs they have not run into the - data relocs. */ - BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd) - && (reloff_ptr != &finfo->treloff - || (*reloff_ptr - <= obj_datasec (finfo->output_bfd)->rel_filepos))); - } - - return TRUE; -} - -/* Get the section corresponding to a reloc index. */ - -static INLINE asection * -aout_reloc_type_to_section (abfd, type) - bfd *abfd; - int type; -{ - switch (type) - { - case RTEXT: - return obj_textsec (abfd); - case RDATA: - return obj_datasec (abfd); - case RBSS: - return obj_bsssec (abfd); - case RABS: - return bfd_abs_section_ptr; - case REXT: - return bfd_und_section_ptr; - default: - abort (); - } -} - -static bfd_boolean -pdp11_aout_link_input_section (finfo, input_bfd, input_section, relocs, - rel_size, contents) - struct aout_final_link_info *finfo; - bfd *input_bfd; - asection *input_section; - bfd_byte *relocs; - bfd_size_type rel_size; - bfd_byte *contents; -{ - bfd_boolean (*check_dynamic_reloc) - PARAMS ((struct bfd_link_info *, bfd *, asection *, - struct aout_link_hash_entry *, PTR, bfd_byte *, bfd_boolean *, - bfd_vma *)); - bfd *output_bfd; - bfd_boolean relocatable; - struct external_nlist *syms; - char *strings; - struct aout_link_hash_entry **sym_hashes; - int *symbol_map; - bfd_size_type reloc_count; - bfd_byte *rel; - bfd_byte *rel_end; - - output_bfd = finfo->output_bfd; - check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc; - - BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_SIZE); - BFD_ASSERT (input_bfd->xvec->header_byteorder - == output_bfd->xvec->header_byteorder); - - relocatable = finfo->info->relocatable; - syms = obj_aout_external_syms (input_bfd); - strings = obj_aout_external_strings (input_bfd); - sym_hashes = obj_aout_sym_hashes (input_bfd); - symbol_map = finfo->symbol_map; - - reloc_count = rel_size / RELOC_SIZE; - rel = relocs; - rel_end = rel + rel_size; - for (; rel < rel_end; rel += RELOC_SIZE) - { - bfd_vma r_addr; - int r_index; - int r_type; - int r_pcrel; - int r_extern; - reloc_howto_type *howto; - struct aout_link_hash_entry *h = NULL; - bfd_vma relocation; - bfd_reloc_status_type r; - int reloc_entry; - - reloc_entry = GET_WORD (input_bfd, (PTR)rel); - if (reloc_entry == 0) - continue; - - { - unsigned int howto_idx; - - r_index = (reloc_entry & RIDXMASK) >> 4; - r_type = reloc_entry & RTYPE; - r_pcrel = reloc_entry & RELFLG; - r_addr = (char *)rel - (char *)relocs; - - r_extern = (r_type == REXT); - - howto_idx = r_pcrel; - BFD_ASSERT (howto_idx < TABLE_SIZE (howto_table_pdp11)); - howto = howto_table_pdp11 + howto_idx; - } - - if (relocatable) - { - /* We are generating a relocatable output file, and must - modify the reloc accordingly. */ - if (r_extern) - { - /* If we know the symbol this relocation is against, - convert it into a relocation against a section. This - is what the native linker does. */ - h = sym_hashes[r_index]; - if (h != (struct aout_link_hash_entry *) NULL - && (h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak)) - { - asection *output_section; - - /* Compute a new r_index. */ - output_section = h->root.u.def.section->output_section; - if (output_section == obj_textsec (output_bfd)) - r_type = N_TEXT; - else if (output_section == obj_datasec (output_bfd)) - r_type = N_DATA; - else if (output_section == obj_bsssec (output_bfd)) - r_type = N_BSS; - else - r_type = N_ABS; - - /* Add the symbol value and the section VMA to the - addend stored in the contents. */ - relocation = (h->root.u.def.value - + output_section->vma - + h->root.u.def.section->output_offset); - } - else - { - /* We must change r_index according to the symbol - map. */ - r_index = symbol_map[r_index]; - - if (r_index == -1) - { - if (h != NULL) - { - /* We decided to strip this symbol, but it - turns out that we can't. Note that we - lose the other and desc information here. - I don't think that will ever matter for a - global symbol. */ - if (h->indx < 0) - { - h->indx = -2; - h->written = FALSE; - if (! aout_link_write_other_symbol (h, - (PTR) finfo)) - return FALSE; - } - r_index = h->indx; - } - else - { - const char *name; - - name = strings + GET_WORD (input_bfd, - syms[r_index].e_strx); - if (! ((*finfo->info->callbacks->unattached_reloc) - (finfo->info, name, input_bfd, input_section, - r_addr))) - return FALSE; - r_index = 0; - } - } - - relocation = 0; - } - - /* Write out the new r_index value. */ - reloc_entry = GET_WORD (input_bfd, rel); - reloc_entry &= RIDXMASK; - reloc_entry |= r_index << 4; - PUT_WORD (input_bfd, reloc_entry, rel); - } - else - { - asection *section; - - /* This is a relocation against a section. We must - adjust by the amount that the section moved. */ - section = aout_reloc_type_to_section (input_bfd, r_type); - relocation = (section->output_section->vma - + section->output_offset - - section->vma); - } - - /* Change the address of the relocation. */ - fprintf (stderr, "TODO: change the address of the relocation\n"); - - /* Adjust a PC relative relocation by removing the reference - to the original address in the section and including the - reference to the new address. */ - if (r_pcrel) - relocation -= (input_section->output_section->vma - + input_section->output_offset - - input_section->vma); - -#ifdef MY_relocatable_reloc - MY_relocatable_reloc (howto, output_bfd, rel, relocation, r_addr); -#endif - - if (relocation == 0) - r = bfd_reloc_ok; - else - r = MY_relocate_contents (howto, - input_bfd, relocation, - contents + r_addr); - } - else - { - bfd_boolean hundef; - - /* We are generating an executable, and must do a full - relocation. */ - hundef = FALSE; - if (r_extern) - { - h = sym_hashes[r_index]; - - if (h != (struct aout_link_hash_entry *) NULL - && (h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak)) - { - relocation = (h->root.u.def.value - + h->root.u.def.section->output_section->vma - + h->root.u.def.section->output_offset); - } - else if (h != (struct aout_link_hash_entry *) NULL - && h->root.type == bfd_link_hash_undefweak) - relocation = 0; - else - { - hundef = TRUE; - relocation = 0; - } - } - else - { - asection *section; - - section = aout_reloc_type_to_section (input_bfd, r_type); - relocation = (section->output_section->vma - + section->output_offset - - section->vma); - if (r_pcrel) - relocation += input_section->vma; - } - - if (check_dynamic_reloc != NULL) - { - bfd_boolean skip; - - if (! ((*check_dynamic_reloc) - (finfo->info, input_bfd, input_section, h, - (PTR) rel, contents, &skip, &relocation))) - return FALSE; - if (skip) - continue; - } - - /* Now warn if a global symbol is undefined. We could not - do this earlier, because check_dynamic_reloc might want - to skip this reloc. */ - if (hundef && ! finfo->info->shared) - { - const char *name; - - if (h != NULL) - name = h->root.root.string; - else - name = strings + GET_WORD (input_bfd, syms[r_index].e_strx); - if (! ((*finfo->info->callbacks->undefined_symbol) - (finfo->info, name, input_bfd, input_section, - r_addr, TRUE))) - return FALSE; - } - - r = MY_final_link_relocate (howto, - input_bfd, input_section, - contents, r_addr, relocation, - (bfd_vma) 0); - } - - if (r != bfd_reloc_ok) - { - switch (r) - { - default: - case bfd_reloc_outofrange: - abort (); - case bfd_reloc_overflow: - { - const char *name; - - if (h != NULL) - name = NULL; - else if (r_extern) - name = strings + GET_WORD (input_bfd, - syms[r_index].e_strx); - else - { - asection *s; - - s = aout_reloc_type_to_section (input_bfd, r_type); - name = bfd_section_name (input_bfd, s); - } - if (! ((*finfo->info->callbacks->reloc_overflow) - (finfo->info, (h ? &h->root : NULL), name, - howto->name, (bfd_vma) 0, input_bfd, - input_section, r_addr))) - return FALSE; - } - break; - } - } - } - - return TRUE; -} - -/* Handle a link order which is supposed to generate a reloc. */ - -static bfd_boolean -aout_link_reloc_link_order (finfo, o, p) - struct aout_final_link_info *finfo; - asection *o; - struct bfd_link_order *p; -{ - struct bfd_link_order_reloc *pr; - int r_index; - int r_extern; - reloc_howto_type *howto; - file_ptr *reloff_ptr; - struct reloc_std_external srel; - PTR rel_ptr; - bfd_size_type rel_size; - - pr = p->u.reloc.p; - - if (p->type == bfd_section_reloc_link_order) - { - r_extern = 0; - if (bfd_is_abs_section (pr->u.section)) - r_index = N_ABS | N_EXT; - else - { - BFD_ASSERT (pr->u.section->owner == finfo->output_bfd); - r_index = pr->u.section->target_index; - } - } - else - { - struct aout_link_hash_entry *h; - - BFD_ASSERT (p->type == bfd_symbol_reloc_link_order); - r_extern = 1; - h = ((struct aout_link_hash_entry *) - bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info, - pr->u.name, FALSE, FALSE, TRUE)); - if (h != (struct aout_link_hash_entry *) NULL - && h->indx >= 0) - r_index = h->indx; - else if (h != NULL) - { - /* We decided to strip this symbol, but it turns out that we - can't. Note that we lose the other and desc information - here. I don't think that will ever matter for a global - symbol. */ - h->indx = -2; - h->written = FALSE; - if (! aout_link_write_other_symbol (h, (PTR) finfo)) - return FALSE; - r_index = h->indx; - } - else - { - if (! ((*finfo->info->callbacks->unattached_reloc) - (finfo->info, pr->u.name, (bfd *) NULL, - (asection *) NULL, (bfd_vma) 0))) - return FALSE; - r_index = 0; - } - } - - howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc); - if (howto == 0) - { - bfd_set_error (bfd_error_bad_value); - return FALSE; - } - - if (o == obj_textsec (finfo->output_bfd)) - reloff_ptr = &finfo->treloff; - else if (o == obj_datasec (finfo->output_bfd)) - reloff_ptr = &finfo->dreloff; - else - abort (); - -#ifdef MY_put_reloc - MY_put_reloc(finfo->output_bfd, r_extern, r_index, p->offset, howto, - &srel); -#else - { - int r_pcrel; - int r_baserel; - int r_jmptable; - int r_relative; - int r_length; - - fprintf (stderr, "TODO: line %d in bfd/pdp11.c\n", __LINE__); - - r_pcrel = howto->pc_relative; - r_baserel = (howto->type & 8) != 0; - r_jmptable = (howto->type & 16) != 0; - r_relative = (howto->type & 32) != 0; - r_length = howto->size; - - PUT_WORD (finfo->output_bfd, p->offset, srel.r_address); - if (bfd_header_big_endian (finfo->output_bfd)) - { - srel.r_index[0] = r_index >> 16; - srel.r_index[1] = r_index >> 8; - srel.r_index[2] = r_index; - srel.r_type[0] = - ((r_extern ? RELOC_STD_BITS_EXTERN_BIG : 0) - | (r_pcrel ? RELOC_STD_BITS_PCREL_BIG : 0) - | (r_baserel ? RELOC_STD_BITS_BASEREL_BIG : 0) - | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0) - | (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0) - | (r_length << RELOC_STD_BITS_LENGTH_SH_BIG)); - } - else - { - srel.r_index[2] = r_index >> 16; - srel.r_index[1] = r_index >> 8; - srel.r_index[0] = r_index; - srel.r_type[0] = - ((r_extern ? RELOC_STD_BITS_EXTERN_LITTLE : 0) - | (r_pcrel ? RELOC_STD_BITS_PCREL_LITTLE : 0) - | (r_baserel ? RELOC_STD_BITS_BASEREL_LITTLE : 0) - | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0) - | (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0) - | (r_length << RELOC_STD_BITS_LENGTH_SH_LITTLE)); - } - } -#endif - rel_ptr = (PTR) &srel; - - /* We have to write the addend into the object file, since - standard a.out relocs are in place. It would be more - reliable if we had the current contents of the file here, - rather than assuming zeroes, but we can't read the file since - it was opened using bfd_openw. */ - if (pr->addend != 0) - { - bfd_size_type size; - bfd_reloc_status_type r; - bfd_byte *buf; - bfd_boolean ok; - - size = bfd_get_reloc_size (howto); - buf = (bfd_byte *) bfd_zmalloc (size); - if (buf == (bfd_byte *) NULL) - return FALSE; - r = MY_relocate_contents (howto, finfo->output_bfd, - pr->addend, buf); - switch (r) - { - case bfd_reloc_ok: - break; - default: - case bfd_reloc_outofrange: - abort (); - case bfd_reloc_overflow: - if (! ((*finfo->info->callbacks->reloc_overflow) - (finfo->info, NULL, - (p->type == bfd_section_reloc_link_order - ? bfd_section_name (finfo->output_bfd, - pr->u.section) - : pr->u.name), - howto->name, pr->addend, (bfd *) NULL, - (asection *) NULL, (bfd_vma) 0))) - { - free (buf); - return FALSE; - } - break; - } - ok = bfd_set_section_contents (finfo->output_bfd, o, - (PTR) buf, - (file_ptr) p->offset, - size); - free (buf); - if (! ok) - return FALSE; - } - - rel_size = obj_reloc_entry_size (finfo->output_bfd); - if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0 - || bfd_bwrite (rel_ptr, rel_size, finfo->output_bfd) != rel_size) - return FALSE; - - *reloff_ptr += rel_size; - - /* Assert that the relocs have not run into the symbols, and that n - the text relocs have not run into the data relocs. */ - BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd) - && (reloff_ptr != &finfo->treloff - || (*reloff_ptr - <= obj_datasec (finfo->output_bfd)->rel_filepos))); - - return TRUE; -} -/* end of modified aoutx.h */ - static bfd_vma bfd_getp32 (const void *p) { const bfd_byte *addr = p; unsigned long v; + v = (unsigned long) addr[1] << 24; v |= (unsigned long) addr[0] << 16; v |= (unsigned long) addr[3] << 8; @@ -4921,6 +4468,7 @@ bfd_getp_signed_32 (const void *p) { const bfd_byte *addr = p; unsigned long v; + v = (unsigned long) addr[1] << 24; v |= (unsigned long) addr[0] << 16; v |= (unsigned long) addr[3] << 8; @@ -4932,8 +4480,51 @@ static void bfd_putp32 (bfd_vma data, void *p) { bfd_byte *addr = p; + addr[0] = (data >> 16) & 0xff; addr[1] = (data >> 24) & 0xff; addr[2] = (data >> 0) & 0xff; addr[3] = (data >> 8) & 0xff; } + +const bfd_target MY (vec) = +{ + TARGETNAME, /* Name. */ + bfd_target_aout_flavour, + BFD_ENDIAN_LITTLE, /* Target byte order (little). */ + BFD_ENDIAN_LITTLE, /* Target headers byte order (little). */ + (HAS_RELOC | EXEC_P | /* Object flags. */ + HAS_LINENO | HAS_DEBUG | + HAS_SYMS | HAS_LOCALS | WP_TEXT), + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA), + MY_symbol_leading_char, + AR_PAD_CHAR, /* AR_pad_char. */ + 15, /* AR_max_namelen. */ + bfd_getl64, bfd_getl_signed_64, bfd_putl64, + bfd_getp32, bfd_getp_signed_32, bfd_putp32, + bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data. */ + bfd_getl64, bfd_getl_signed_64, bfd_putl64, + bfd_getp32, bfd_getp_signed_32, bfd_putp32, + bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Headers. */ + {_bfd_dummy_target, MY_object_p, /* bfd_check_format. */ + bfd_generic_archive_p, MY_core_file_p}, + {bfd_false, MY_mkobject, /* bfd_set_format. */ + _bfd_generic_mkarchive, bfd_false}, + {bfd_false, MY_write_object_contents, /* bfd_write_contents. */ + _bfd_write_archive_contents, bfd_false}, + + BFD_JUMP_TABLE_GENERIC (MY), + BFD_JUMP_TABLE_COPY (MY), + BFD_JUMP_TABLE_CORE (MY), + BFD_JUMP_TABLE_ARCHIVE (MY), + BFD_JUMP_TABLE_SYMBOLS (MY), + BFD_JUMP_TABLE_RELOCS (MY), + BFD_JUMP_TABLE_WRITE (MY), + BFD_JUMP_TABLE_LINK (MY), + BFD_JUMP_TABLE_DYNAMIC (MY), + + /* Alternative_target. */ + NULL, + + (void *) MY_backend_data +}; |