X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Flibaout.h;h=f063817b89604a835603870b7f16583bc80e8449;hb=cb6d724fb931b9e83889283d1ab01449dadd19be;hp=2e0f9e9e068f49663c5ab64727bcb916eb8b8571;hpb=ce07dd7c0cc9034fd9aac351d34a99b1452c0203;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/libaout.h b/bfd/libaout.h index 2e0f9e9e06..f063817b89 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,31 +22,27 @@ 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 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 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. */ @@ -59,11 +55,11 @@ 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 : 1; + 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 : 1; + 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 @@ -72,6 +68,15 @@ struct aout_backend_data 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)) @@ -98,6 +103,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 @@ -110,9 +116,11 @@ enum machine_type { 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_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 */ @@ -179,6 +187,11 @@ struct aoutdata { 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, @@ -201,6 +214,7 @@ struct aout_data_struct { #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) /* We take the address of the first element of an asymbol to ensure that the macro is only ever applied to an asymbol */ @@ -208,51 +222,102 @@ struct aout_data_struct { /* 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)); + +void +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)); -PROTO (void, NAME(aout,swap_exec_header_in), (bfd *abfd, - struct external_exec *raw_bytes, struct internal_exec *execp)); +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)); + +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)); /* 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... */ @@ -282,21 +347,20 @@ 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) \ { \ - bfd_seek (abfd, \ - (long)(N_SYMOFF(*execp)), false); \ + bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET); \ \ NAME(aout,write_syms)(abfd); \ \ - 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; \ } \