X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Flibaout.h;h=330f60e6ad0e7378ced0b717a7ce0b27c15a5ce0;hb=fdfe2d146613e37c909be73c5ef87e3a96490daa;hp=01eb50e07265f3fbac8997cc92254639fe47acfd;hpb=7de245d36283de0344bf0798cb594f14ea6f2f3a;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/libaout.h b/bfd/libaout.h index 01eb50e072..330f60e6ad 100644 --- a/bfd/libaout.h +++ b/bfd/libaout.h @@ -1,5 +1,5 @@ /* BFD back-end data structures for a.out (and similar) files. - Copyright (C) 1990-1991 Free Software Foundation, Inc. + Copyright 1990, 1991, 1992 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -22,36 +22,63 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ variants in a few routines, and otherwise share large masses of code. This means we only have to fix bugs in one place, most of the time. */ -/* $Id$ */ - -#ifdef __STDC__ -#define CAT3(a,b,c) a##b##c -#else -#define CAT3(a,b,c) a/**/b/**/c -#endif - /* Parameterize the a.out code based on whether it is being built for a 32-bit architecture or a 64-bit architecture. */ #if ARCH_SIZE==64 #define GET_WORD bfd_h_get_64 -#define GET_SWORD (int64_type)GET_WORD +#define GET_SWORD bfd_h_get_signed_64 #define PUT_WORD bfd_h_put_64 +#ifndef NAME #define NAME(x,y) CAT3(x,_64_,y) +#endif #define JNAME(x) CAT(x,_64) #define BYTES_IN_WORD 8 -#else +#else /* ARCH_SIZE == 32 */ #define GET_WORD bfd_h_get_32 -#define GET_SWORD (int32_type)GET_WORD +#define GET_SWORD bfd_h_get_signed_32 #define PUT_WORD bfd_h_put_32 +#ifndef NAME #define NAME(x,y) CAT3(x,_32_,y) +#endif #define JNAME(x) CAT(x,_32) #define BYTES_IN_WORD 4 -#endif +#endif /* ARCH_SIZE==32 */ -/* Declare these types at file level, since they are used in parameter - lists, which have wierd scope. */ +/* Declare at file level, since it isused in parameter lists, which + have weird scope. */ struct external_exec; -struct internal_exec; + +/* Back-end information for various a.out targets. */ +struct aout_backend_data +{ + /* Are ZMAGIC files mapped contiguously? If so, the text section may + need more padding, if the segment size (granularity for memory access + control) is larger than the page size. */ + unsigned char zmagic_mapped_contiguous; + /* If this flag is set, ZMAGIC/NMAGIC file headers get mapped in with the + text section, which starts immediately after the file header. + If not, the text section starts on the next page. */ + unsigned char text_includes_header; + + /* If the text section VMA isn't specified, and we need an absolute + address, use this as the default. If we're producing a relocatable + file, zero is always used. */ + /* ?? Perhaps a callback would be a better choice? Will this do anything + reasonable for a format that handles multiple CPUs with different + load addresses for each? */ + bfd_vma default_text_vma; + + /* Callback for setting the page and segment sizes, if they can't be + trivially determined from the architecture. */ + boolean (*set_sizes) PARAMS ((bfd *)); + + /* zmagic files only. For go32, the length of the exec header contributes + to the size of the text section in the file for alignment purposes but + does *not* get counted in the length of the text section. */ + unsigned char exec_header_not_counted; +}; +#define aout_backend_info(abfd) \ + ((CONST struct aout_backend_data *)((abfd)->xvec->backend_data)) /* This is the layout in memory of a "struct exec" while we process it. All 'lengths' are given as a number of bytes. @@ -75,6 +102,7 @@ struct internal_exec unsigned char a_talign; /* Alignment of text segment */ unsigned char a_dalign; /* Alignment of data segment */ unsigned char a_balign; /* Alignment of bss segment */ + char a_relaxable; /* Enough info for linker relax */ }; /* Magic number is written @@ -82,39 +110,66 @@ struct internal_exec 3130292827262524232221201918171615141312111009080706050403020100 < FLAGS >< MACHINE TYPE >< MAGIC NUMBER > */ +/* Magic number for NetBSD is + +3130292827262524232221201918171615141312111009080706050403020100 +< FLAGS >< >< MAGIC NUMBER > +*/ + enum machine_type { M_UNKNOWN = 0, M_68010 = 1, M_68020 = 2, M_SPARC = 3, - /* skip a bunch so we dont run into any of suns numbers */ + /* skip a bunch so we don't run into any of suns numbers */ M_386 = 100, - M_29K = 101, + M_29K = 101, /* AMD 29000 */ + M_386_DYNIX = 102, /* Sequent running dynix */ + M_386_NETBSD = 134, /* NetBSD/386 binary */ + M_MIPS1 = 151, /* MIPS R2000/R3000 binary */ + M_MIPS2 = 152, /* MIPS R4000/R6000 binary */ M_HP200 = 200, /* HP 200 (68010) BSD binary */ M_HP300 = (300 % 256), /* HP 300 (68020+68881) BSD binary */ - M_HPUX = (0x20c % 256),/* HP 200/300 HPUX binary */ + M_HPUX = (0x20c % 256)/* HP 200/300 HPUX binary */ }; #define N_DYNAMIC(exec) ((exec).a_info & 0x8000000) -#define N_MAGIC(exec) ((exec).a_info & 0xffff) -#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) -#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) -#define N_SET_INFO(exec, magic, type, flags) \ +#ifndef N_MAGIC +# define N_MAGIC(exec) ((exec).a_info & 0xffff) +#endif + +#ifndef N_MACHTYPE +# define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) +#endif + +#ifndef N_FLAGS +# define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) +#endif + +#ifndef N_SET_INFO +# define N_SET_INFO(exec, magic, type, flags) \ ((exec).a_info = ((magic) & 0xffff) \ | (((int)(type) & 0xff) << 16) \ | (((flags) & 0xff) << 24)) +#endif -#define N_SET_MAGIC(exec, magic) \ +#ifndef N_SET_MAGIC +# define N_SET_MAGIC(exec, magic) \ ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff))) +#endif -#define N_SET_MACHTYPE(exec, machtype) \ +#ifndef N_SET_MACHTYPE +# define N_SET_MACHTYPE(exec, machtype) \ ((exec).a_info = \ ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16)) +#endif -#define N_SET_FLAGS(exec, flags) \ +#ifndef N_SET_FLAGS +# define N_SET_FLAGS(exec, flags) \ ((exec).a_info = \ ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24)) +#endif typedef struct aout_symbol { asymbol symbol; @@ -154,18 +209,46 @@ struct aoutdata { unsigned long segment_size; unsigned exec_bytes_size; + unsigned vma_adjusted : 1; + + /* used when a bfd supports several highly similar formats */ + enum { + default_format = 0, + gnu_encap_format } subformat; + + enum { + undecided_magic = 0, + z_magic, + o_magic, + n_magic } magic; + + /* The external symbol information. */ + struct external_nlist *external_syms; + bfd_size_type external_sym_count; + char *external_strings; + struct aout_link_hash_entry **sym_hashes; }; -#define adata(bfd) ((struct aoutdata *) ((bfd)->tdata)) -#define exec_hdr(bfd) (adata(bfd)->hdr) -#define obj_aout_symbols(bfd) (adata(bfd)->symbols) -#define obj_textsec(bfd) (adata(bfd)->textsec) -#define obj_datasec(bfd) (adata(bfd)->datasec) -#define obj_bsssec(bfd) (adata(bfd)->bsssec) -#define obj_sym_filepos(bfd) (adata(bfd)->sym_filepos) -#define obj_str_filepos(bfd) (adata(bfd)->str_filepos) -#define obj_reloc_entry_size(bfd) (adata(bfd)->reloc_entry_size) -#define obj_symbol_entry_size(bfd) (adata(bfd)->symbol_entry_size) +struct aout_data_struct { + struct aoutdata a; + struct internal_exec e; +}; + +#define adata(bfd) ((bfd)->tdata.aout_data->a) +#define exec_hdr(bfd) (adata(bfd).hdr) +#define obj_aout_symbols(bfd) (adata(bfd).symbols) +#define obj_textsec(bfd) (adata(bfd).textsec) +#define obj_datasec(bfd) (adata(bfd).datasec) +#define obj_bsssec(bfd) (adata(bfd).bsssec) +#define obj_sym_filepos(bfd) (adata(bfd).sym_filepos) +#define obj_str_filepos(bfd) (adata(bfd).str_filepos) +#define obj_reloc_entry_size(bfd) (adata(bfd).reloc_entry_size) +#define obj_symbol_entry_size(bfd) (adata(bfd).symbol_entry_size) +#define obj_aout_subformat(bfd) (adata(bfd).subformat) +#define obj_aout_external_syms(bfd) (adata(bfd).external_syms) +#define obj_aout_external_sym_count(bfd) (adata(bfd).external_sym_count) +#define obj_aout_external_strings(bfd) (adata(bfd).external_strings) +#define obj_aout_sym_hashes(bfd) (adata(bfd).sym_hashes) /* We take the address of the first element of an asymbol to ensure that the macro is only ever applied to an asymbol */ @@ -173,52 +256,113 @@ struct aoutdata { /* Prototype declarations for functions defined in aoutx.h */ -PROTO (boolean, NAME(aout,squirt_out_relocs),(bfd *abfd, asection *section)); +boolean +NAME(aout,squirt_out_relocs) PARAMS ((bfd *abfd, asection *section)); + +bfd_target * +NAME(aout,some_aout_object_p) PARAMS ((bfd *abfd, + struct internal_exec *execp, + bfd_target * (*callback)(bfd *))); + +boolean +NAME(aout,mkobject) PARAMS ((bfd *abfd)); -PROTO (bfd_target *, NAME(aout,some_aout_object_p), (bfd *abfd, - struct internal_exec *execp, - bfd_target *(*callback)())); -PROTO (boolean, NAME(aout,mkobject), (bfd *abfd)); -PROTO (enum machine_type, NAME(aout,machine_type), (enum bfd_architecture arch, - unsigned long machine)); -PROTO (boolean, NAME(aout,set_arch_mach), (bfd *abfd, enum bfd_architecture arch, - unsigned long machine)); +enum machine_type +NAME(aout,machine_type) PARAMS ((enum bfd_architecture arch, + unsigned long machine)); -PROTO (boolean, NAME(aout,new_section_hook), (bfd *abfd, asection *newsect)); -PROTO (boolean, NAME(aout,set_section_contents), (bfd *abfd, sec_ptr section, +boolean +NAME(aout,set_arch_mach) PARAMS ((bfd *abfd, enum bfd_architecture arch, + unsigned long machine)); + +boolean +NAME(aout,new_section_hook) PARAMS ((bfd *abfd, asection *newsect)); + +boolean +NAME(aout,set_section_contents) PARAMS ((bfd *abfd, sec_ptr section, PTR location, file_ptr offset, bfd_size_type count)); -PROTO (asymbol *,NAME(aout,make_empty_symbol), (bfd *abfd)); -PROTO (boolean, NAME(aout,slurp_symbol_table), (bfd *abfd)); -PROTO (void, NAME(aout,write_syms), (bfd *abfd)); -PROTO (void, NAME(aout,reclaim_symbol_table), (bfd *abfd)); -PROTO (unsigned int, NAME(aout,get_symtab_upper_bound), (bfd *abfd)); -PROTO (unsigned int, NAME(aout,get_symtab), (bfd *abfd, asymbol **location)); -PROTO (boolean, NAME(aout,slurp_reloc_table), (bfd *abfd, sec_ptr asect, - asymbol **symbols)); -PROTO (unsigned int, NAME(aout,canonicalize_reloc), (bfd *abfd, sec_ptr section, - arelent **relptr, asymbol **symbols)); -PROTO (unsigned int, NAME(aout,get_reloc_upper_bound), (bfd *abfd, sec_ptr asect)); -PROTO (void, NAME(aout,reclaim_reloc), (bfd *ignore_abfd, sec_ptr ignore)); -PROTO (alent *, NAME(aout,get_lineno), (bfd *ignore_abfd, asymbol *ignore_symbol)); -PROTO (void, NAME(aout,print_symbol), (bfd *ignore_abfd, PTR file, +asymbol * +NAME(aout,make_empty_symbol) PARAMS ((bfd *abfd)); + +boolean +NAME(aout,slurp_symbol_table) PARAMS ((bfd *abfd)); + +boolean +NAME(aout,write_syms) PARAMS ((bfd *abfd)); + +void +NAME(aout,reclaim_symbol_table) PARAMS ((bfd *abfd)); + +unsigned int +NAME(aout,get_symtab_upper_bound) PARAMS ((bfd *abfd)); + +unsigned int +NAME(aout,get_symtab) PARAMS ((bfd *abfd, asymbol **location)); + +boolean +NAME(aout,slurp_reloc_table) PARAMS ((bfd *abfd, sec_ptr asect, + asymbol **symbols)); + +unsigned int +NAME(aout,canonicalize_reloc) PARAMS ((bfd *abfd, sec_ptr section, + arelent **relptr, asymbol **symbols)); + +unsigned int +NAME(aout,get_reloc_upper_bound) PARAMS ((bfd *abfd, sec_ptr asect)); + +void +NAME(aout,reclaim_reloc) PARAMS ((bfd *ignore_abfd, sec_ptr ignore)); + +alent * +NAME(aout,get_lineno) PARAMS ((bfd *ignore_abfd, asymbol *ignore_symbol)); + +void +NAME(aout,print_symbol) PARAMS ((bfd *ignore_abfd, PTR file, asymbol *symbol, bfd_print_symbol_type how)); -PROTO (boolean, NAME(aout,close_and_cleanup), (bfd *abfd)); -PROTO (boolean, NAME(aout,find_nearest_line), (bfd *abfd, asection *section, + +void +NAME(aout,get_symbol_info) PARAMS ((bfd *ignore_abfd, + asymbol *symbol, symbol_info *ret)); + +boolean +NAME(aout,close_and_cleanup) PARAMS ((bfd *abfd)); + +boolean +NAME(aout,find_nearest_line) PARAMS ((bfd *abfd, asection *section, asymbol **symbols, bfd_vma offset, CONST char **filename_ptr, CONST char **functionname_ptr, unsigned int *line_ptr)); -PROTO (int, NAME(aout,sizeof_headers), (bfd *abfd, boolean exec)); +int +NAME(aout,sizeof_headers) PARAMS ((bfd *abfd, boolean exec)); + +boolean +NAME(aout,adjust_sizes_and_vmas) PARAMS ((bfd *abfd, + bfd_size_type *text_size, file_ptr *text_end)); -PROTO (void, NAME(aout,swap_exec_header_in), (bfd *abfd, - struct external_exec *raw_bytes, struct internal_exec *execp)); +void +NAME(aout,swap_exec_header_in) PARAMS ((bfd *abfd, + struct external_exec *raw_bytes, struct internal_exec *execp)); -PROTO (void, NAME(aout,swap_exec_header_out),(bfd *abfd, struct internal_exec *execp, - struct external_exec *raw_bytes)); +void +NAME(aout,swap_exec_header_out) PARAMS ((bfd *abfd, + struct internal_exec *execp, struct external_exec *raw_bytes)); + +struct bfd_link_hash_table * +NAME(aout,link_hash_table_create) PARAMS ((bfd *)); + +boolean +NAME(aout,link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *)); + +boolean +NAME(aout,final_link) PARAMS ((bfd *, struct bfd_link_info *, + void (*) (bfd *, file_ptr *, file_ptr *, + file_ptr *))); /* Prototypes for functions in stab-syms.c. */ -PROTO(char *, aout_stab_name, (int code)); +CONST char * +aout_stab_name PARAMS ((int code)); /* A.out uses the generic versions of these routines... */ @@ -227,64 +371,17 @@ PROTO(char *, aout_stab_name, (int code)); #define aout_64_get_section_contents bfd_generic_get_section_contents #define aout_64_close_and_cleanup bfd_generic_close_and_cleanup +#ifndef NO_WRITE_HEADER_KLUDGE +#define NO_WRITE_HEADER_KLUDGE 0 +#endif -/* Calculate the file positions of the parts of a newly read aout header */ -#define WORK_OUT_FILE_POSITIONS(abfd, execp) \ - obj_textsec (abfd)->size = N_TXTSIZE(*execp); \ - \ - /* 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 */ \ - obj_textsec (abfd)->filepos = N_TXTOFF (*execp); \ - obj_datasec (abfd)->filepos = N_DATOFF (*execp); \ - \ - /* The file offsets of the relocation info */ \ - obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp); \ - obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp); \ - \ - /* The file offsets of the string table and symbol table. */ \ - obj_sym_filepos (abfd) = N_SYMOFF (*execp); \ - obj_str_filepos (abfd) = N_STROFF (*execp); \ - - +#ifndef WRITE_HEADERS #define WRITE_HEADERS(abfd, execp) \ { \ - if (abfd->flags & D_PAGED) \ - { \ - execp->a_text = obj_textsec (abfd)->size; \ - /* Kludge to distinguish old- and new-style ZMAGIC. \ - The latter includes the exec header in the text size. */ \ - if (obj_textsec(abfd)->filepos == EXEC_BYTES_SIZE) \ - execp->a_text += EXEC_BYTES_SIZE; \ - N_SET_MAGIC (*execp, ZMAGIC); \ - } \ - else \ - { \ - execp->a_text = obj_textsec (abfd)->size; \ - if (abfd->flags & WP_TEXT) \ - { N_SET_MAGIC (*execp, NMAGIC); } \ - else \ - { N_SET_MAGIC(*execp, OMAGIC); } \ - } \ - if (abfd->flags & D_PAGED) \ - { \ - data_pad = ALIGN(obj_datasec(abfd)->size, PAGE_SIZE) \ - - obj_datasec(abfd)->size; \ - \ - if (data_pad > obj_bsssec(abfd)->size) \ - execp->a_bss = 0; \ - else \ - execp->a_bss = obj_bsssec(abfd)->size - data_pad; \ - execp->a_data = obj_datasec(abfd)->size + data_pad; \ - } \ - else \ - { \ - execp->a_data = obj_datasec (abfd)->size; \ - execp->a_bss = obj_bsssec (abfd)->size; \ - } \ + bfd_size_type text_size; /* dummy vars */ \ + file_ptr text_end; \ + if (adata(abfd).magic == undecided_magic) \ + 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); \ @@ -295,22 +392,23 @@ PROTO(char *, aout_stab_name, (int code)); obj_reloc_entry_size (abfd)); \ NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes); \ \ - bfd_seek (abfd, 0L, false); \ + bfd_seek (abfd, (file_ptr) 0, SEEK_SET); \ bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd); \ /* Now write out reloc info, followed by syms and strings */ \ \ - if (bfd_get_symcount (abfd) != 0) \ + if (bfd_get_outsymbols (abfd) != (asymbol **) NULL \ + && bfd_get_symcount (abfd) != 0) \ { \ - bfd_seek (abfd, \ - (long)(N_SYMOFF(*execp)), false); \ + bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET); \ \ - NAME(aout,write_syms)(abfd); \ + if (! NAME(aout,write_syms)(abfd)) return false; \ \ - bfd_seek (abfd, (long)(N_TRELOFF(*execp)), false); \ + bfd_seek (abfd, (file_ptr)(N_TRELOFF(*execp)), SEEK_SET); \ \ if (!NAME(aout,squirt_out_relocs) (abfd, obj_textsec (abfd))) return false; \ - bfd_seek (abfd, (long)(N_DRELOFF(*execp)), false); \ + bfd_seek (abfd, (file_ptr)(N_DRELOFF(*execp)), SEEK_SET); \ \ if (!NAME(aout,squirt_out_relocs)(abfd, obj_datasec (abfd))) return false; \ } \ } +#endif