diff options
author | Nick Clifton <nickc@redhat.com> | 2005-04-21 07:45:39 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2005-04-21 07:45:39 +0000 |
commit | 7920ce38c3e43d462e360b21db6cc9c17a40b4f4 (patch) | |
tree | 416f762ca89660f4cecf9e1391f12c6ac478ce46 /bfd/libaout.h | |
parent | b450502905875e85aab17371f78bb6befe5a3059 (diff) | |
download | fsf-binutils-gdb-7920ce38c3e43d462e360b21db6cc9c17a40b4f4.zip fsf-binutils-gdb-7920ce38c3e43d462e360b21db6cc9c17a40b4f4.tar.gz fsf-binutils-gdb-7920ce38c3e43d462e360b21db6cc9c17a40b4f4.tar.bz2 |
Update to ISO-C90 and fix formatting
Diffstat (limited to 'bfd/libaout.h')
-rw-r--r-- | bfd/libaout.h | 254 |
1 files changed, 127 insertions, 127 deletions
diff --git a/bfd/libaout.h b/bfd/libaout.h index ef9eae1..887ef31 100644 --- a/bfd/libaout.h +++ b/bfd/libaout.h @@ -1,6 +1,6 @@ /* BFD back-end data structures for a.out (and similar) files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004 + 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Written by Cygnus Support. @@ -31,22 +31,22 @@ /* Macros for accessing components in an aout header. */ -#define H_PUT_64 bfd_h_put_64 -#define H_PUT_32 bfd_h_put_32 -#define H_PUT_16 bfd_h_put_16 -#define H_PUT_8 bfd_h_put_8 +#define H_PUT_64 bfd_h_put_64 +#define H_PUT_32 bfd_h_put_32 +#define H_PUT_16 bfd_h_put_16 +#define H_PUT_8 bfd_h_put_8 #define H_PUT_S64 bfd_h_put_signed_64 #define H_PUT_S32 bfd_h_put_signed_32 #define H_PUT_S16 bfd_h_put_signed_16 -#define H_PUT_S8 bfd_h_put_signed_8 -#define H_GET_64 bfd_h_get_64 -#define H_GET_32 bfd_h_get_32 -#define H_GET_16 bfd_h_get_16 -#define H_GET_8 bfd_h_get_8 +#define H_PUT_S8 bfd_h_put_signed_8 +#define H_GET_64 bfd_h_get_64 +#define H_GET_32 bfd_h_get_32 +#define H_GET_16 bfd_h_get_16 +#define H_GET_8 bfd_h_get_8 #define H_GET_S64 bfd_h_get_signed_64 #define H_GET_S32 bfd_h_get_signed_32 #define H_GET_S16 bfd_h_get_signed_16 -#define H_GET_S8 bfd_h_get_signed_8 +#define H_GET_S8 bfd_h_get_signed_8 /* Parameterize the a.out code based on whether it is being built for a 32-bit architecture or a 64-bit architecture. */ @@ -54,10 +54,10 @@ remove whitespace added here, and thus will fail to concatenate the tokens. */ #if ARCH_SIZE==64 -#define GET_WORD H_GET_64 +#define GET_WORD H_GET_64 #define GET_SWORD H_GET_S64 #define GET_MAGIC H_GET_32 -#define PUT_WORD H_PUT_64 +#define PUT_WORD H_PUT_64 #define PUT_MAGIC H_PUT_32 #ifndef NAME #define NAME(x,y) CONCAT3 (x,_64_,y) @@ -66,10 +66,10 @@ #define BYTES_IN_WORD 8 #else #if ARCH_SIZE==16 -#define GET_WORD H_GET_16 +#define GET_WORD H_GET_16 #define GET_SWORD H_GET_S16 #define GET_MAGIC H_GET_16 -#define PUT_WORD H_PUT_16 +#define PUT_WORD H_PUT_16 #define PUT_MAGIC H_PUT_16 #ifndef NAME #define NAME(x,y) CONCAT3 (x,_16_,y) @@ -77,10 +77,10 @@ #define JNAME(x) CONCAT2 (x,_16) #define BYTES_IN_WORD 2 #else /* ARCH_SIZE == 32 */ -#define GET_WORD H_GET_32 +#define GET_WORD H_GET_32 #define GET_SWORD H_GET_S32 #define GET_MAGIC H_GET_32 -#define PUT_WORD H_PUT_32 +#define PUT_WORD H_PUT_32 #define PUT_MAGIC H_PUT_32 #ifndef NAME #define NAME(x,y) CONCAT3 (x,_32_,y) @@ -126,7 +126,7 @@ struct aout_link_hash_table #define aout_link_hash_traverse(table, func, info) \ (bfd_link_hash_traverse \ (&(table)->root, \ - (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func), \ + (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func), \ (info))) /* Get the a.out link hash table from the info structure. This is @@ -165,8 +165,7 @@ struct aout_backend_data /* Callback for setting the page and segment sizes, if they can't be trivially determined from the architecture. */ - bfd_boolean (*set_sizes) - PARAMS ((bfd *)); + bfd_boolean (*set_sizes) (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 @@ -176,39 +175,38 @@ struct aout_backend_data /* Callback from the add symbols phase of the linker code to handle a dynamic object. */ bfd_boolean (*add_dynamic_symbols) - PARAMS ((bfd *, struct bfd_link_info *, struct external_nlist **, - bfd_size_type *, char **)); + (bfd *, struct bfd_link_info *, struct external_nlist **, + bfd_size_type *, char **); /* Callback from the add symbols phase of the linker code to handle adding a single symbol to the global linker hash table. */ 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 **); /* Called to handle linking a dynamic object. */ bfd_boolean (*link_dynamic_object) - PARAMS ((struct bfd_link_info *, bfd *)); + (struct bfd_link_info *, bfd *); /* Called for each global symbol being written out by the linker. This should write out the dynamic symbol information. */ bfd_boolean (*write_dynamic_symbol) - PARAMS ((bfd *, struct bfd_link_info *, struct aout_link_hash_entry *)); + (bfd *, struct bfd_link_info *, struct aout_link_hash_entry *); /* If this callback is not NULL, the linker calls it for each reloc. RELOC is a pointer to the unswapped reloc. If *SKIP is set to TRUE, the reloc will be skipped. *RELOCATION may be changed to change the effects of the relocation. */ bfd_boolean (*check_dynamic_reloc) - PARAMS ((struct bfd_link_info *info, bfd *input_bfd, - asection *input_section, struct aout_link_hash_entry *h, - PTR reloc, bfd_byte *contents, bfd_boolean *skip, - bfd_vma *relocation)); + (struct bfd_link_info *info, bfd *input_bfd, + asection *input_section, struct aout_link_hash_entry *h, + void * reloc, bfd_byte *contents, bfd_boolean *skip, + bfd_vma *relocation); /* Called at the end of a link to finish up any dynamic linking information. */ - bfd_boolean (*finish_dynamic_link) - PARAMS ((bfd *, struct bfd_link_info *)); + bfd_boolean (*finish_dynamic_link) (bfd *, struct bfd_link_info *); }; #define aout_backend_info(abfd) \ ((const struct aout_backend_data *)((abfd)->xvec->backend_data)) @@ -415,7 +413,7 @@ struct aoutdata struct aout_link_hash_entry **sym_hashes; /* A pointer for shared library information. */ - PTR dynamic_info; + void * dynamic_info; /* A mapping from local symbols to offsets into the global offset table, used when linking on SunOS. This is indexed by the symbol @@ -459,137 +457,138 @@ struct aout_data_struct struct aout_section_data_struct { /* The unswapped relocation entries for this section. */ - PTR relocs; + void * relocs; }; #define aout_section_data(s) \ ((struct aout_section_data_struct *) (s)->used_by_bfd) #define set_aout_section_data(s,v) \ - ((s)->used_by_bfd = (PTR)&(v)->relocs) + ((s)->used_by_bfd = (void *)&(v)->relocs) /* Prototype declarations for functions defined in aoutx.h. */ -extern bfd_boolean NAME(aout,squirt_out_relocs) - PARAMS ((bfd *, asection *)); +extern bfd_boolean NAME (aout, squirt_out_relocs) + (bfd *, asection *); -extern bfd_boolean NAME(aout,make_sections) - PARAMS ((bfd *)); +extern bfd_boolean NAME (aout, make_sections) + (bfd *); -extern const bfd_target * NAME(aout,some_aout_object_p) - PARAMS ((bfd *, struct internal_exec *, const bfd_target *(*) (bfd *))); +extern const bfd_target * NAME (aout, some_aout_object_p) + (bfd *, struct internal_exec *, const bfd_target *(*) (bfd *)); -extern bfd_boolean NAME(aout,mkobject) - PARAMS ((bfd *)); +extern bfd_boolean NAME (aout, mkobject) + (bfd *); -extern enum machine_type NAME(aout,machine_type) - PARAMS ((enum bfd_architecture, unsigned long, bfd_boolean *)); +extern enum machine_type NAME (aout, machine_type) + (enum bfd_architecture, unsigned long, bfd_boolean *); -extern bfd_boolean NAME(aout,set_arch_mach) - PARAMS ((bfd *, enum bfd_architecture, unsigned long)); +extern bfd_boolean NAME (aout, set_arch_mach) + (bfd *, enum bfd_architecture, unsigned long); -extern bfd_boolean NAME(aout,new_section_hook) - PARAMS ((bfd *, asection *)); +extern bfd_boolean NAME (aout, new_section_hook) + (bfd *, asection *); -extern bfd_boolean NAME(aout,set_section_contents) - PARAMS ((bfd *, sec_ptr, const PTR, file_ptr, bfd_size_type)); +extern bfd_boolean NAME (aout, set_section_contents) + (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type); -extern asymbol * NAME(aout,make_empty_symbol) - PARAMS ((bfd *)); +extern asymbol * NAME (aout, make_empty_symbol) + (bfd *); -extern bfd_boolean NAME(aout,translate_symbol_table) - PARAMS ((bfd *, aout_symbol_type *, struct external_nlist *, bfd_size_type, - char *, bfd_size_type, bfd_boolean)); +extern bfd_boolean NAME (aout, translate_symbol_table) + (bfd *, aout_symbol_type *, struct external_nlist *, bfd_size_type, + char *, bfd_size_type, bfd_boolean); -extern bfd_boolean NAME(aout,slurp_symbol_table) - PARAMS ((bfd *)); +extern bfd_boolean NAME (aout, slurp_symbol_table) + (bfd *); -extern bfd_boolean NAME(aout,write_syms) - PARAMS ((bfd *)); +extern bfd_boolean NAME (aout, write_syms) + (bfd *); -extern void NAME(aout,reclaim_symbol_table) - PARAMS ((bfd *)); +extern void NAME (aout, reclaim_symbol_table) + (bfd *); -extern long NAME(aout,get_symtab_upper_bound) - PARAMS ((bfd *)); +extern long NAME (aout, get_symtab_upper_bound) + (bfd *); -extern long NAME(aout,canonicalize_symtab) - PARAMS ((bfd *, asymbol **)); +extern long NAME (aout, canonicalize_symtab) + (bfd *, asymbol **); -extern void NAME(aout,swap_ext_reloc_in) - PARAMS ((bfd *, struct reloc_ext_external *, arelent *, asymbol **, - bfd_size_type)); -extern void NAME(aout,swap_std_reloc_in) - PARAMS ((bfd *, struct reloc_std_external *, arelent *, asymbol **, - bfd_size_type)); +extern void NAME (aout, swap_ext_reloc_in) + (bfd *, struct reloc_ext_external *, arelent *, asymbol **, + bfd_size_type); -extern reloc_howto_type * NAME(aout,reloc_type_lookup) - PARAMS ((bfd *, bfd_reloc_code_real_type)); +extern void NAME (aout, swap_std_reloc_in) + (bfd *, struct reloc_std_external *, arelent *, asymbol **, + bfd_size_type); -extern bfd_boolean NAME(aout,slurp_reloc_table) - PARAMS ((bfd *, sec_ptr, asymbol **)); +extern reloc_howto_type * NAME (aout, reloc_type_lookup) + (bfd *, bfd_reloc_code_real_type); -extern long NAME(aout,canonicalize_reloc) - PARAMS ((bfd *, sec_ptr, arelent **, asymbol **)); +extern bfd_boolean NAME (aout, slurp_reloc_table) + (bfd *, sec_ptr, asymbol **); -extern long NAME(aout,get_reloc_upper_bound) - PARAMS ((bfd *, sec_ptr)); +extern long NAME (aout, canonicalize_reloc) + (bfd *, sec_ptr, arelent **, asymbol **); -extern void NAME(aout,reclaim_reloc) - PARAMS ((bfd *, sec_ptr)); +extern long NAME (aout, get_reloc_upper_bound) + (bfd *, sec_ptr); -extern alent * NAME(aout,get_lineno) - PARAMS ((bfd *, asymbol *)); +extern void NAME (aout, reclaim_reloc) + (bfd *, sec_ptr); -extern void NAME(aout,print_symbol) - PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type)); +extern alent * NAME (aout, get_lineno) + (bfd *, asymbol *); -extern void NAME(aout,get_symbol_info) - PARAMS ((bfd *, asymbol *, symbol_info *)); +extern void NAME (aout, print_symbol) + (bfd *, void *, asymbol *, bfd_print_symbol_type); -extern bfd_boolean NAME(aout,find_nearest_line) - PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **, - const char **, unsigned int *)); +extern void NAME (aout, get_symbol_info) + (bfd *, asymbol *, symbol_info *); -extern long NAME(aout,read_minisymbols) - PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *)); +extern bfd_boolean NAME (aout, find_nearest_line) + (bfd *, asection *, asymbol **, bfd_vma, const char **, + const char **, unsigned int *); -extern asymbol * NAME(aout,minisymbol_to_symbol) - PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *)); +extern long NAME (aout, read_minisymbols) + (bfd *, bfd_boolean, void * *, unsigned int *); -extern int NAME(aout,sizeof_headers) - PARAMS ((bfd *, bfd_boolean)); +extern asymbol * NAME (aout, minisymbol_to_symbol) + (bfd *, bfd_boolean, const void *, asymbol *); -extern bfd_boolean NAME(aout,adjust_sizes_and_vmas) - PARAMS ((bfd *, bfd_size_type *, file_ptr *)); +extern int NAME (aout, sizeof_headers) + (bfd *, bfd_boolean); -extern void NAME(aout,swap_exec_header_in) - PARAMS ((bfd *, struct external_exec *, struct internal_exec *)); +extern bfd_boolean NAME (aout, adjust_sizes_and_vmas) + (bfd *, bfd_size_type *, file_ptr *); -extern void NAME(aout,swap_exec_header_out) - PARAMS ((bfd *, struct internal_exec *, struct external_exec *)); +extern void NAME (aout, swap_exec_header_in) + (bfd *, struct external_exec *, struct internal_exec *); -extern struct bfd_hash_entry * NAME(aout,link_hash_newfunc) - PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *)); +extern void NAME (aout, swap_exec_header_out) + (bfd *, struct internal_exec *, struct external_exec *); -extern bfd_boolean NAME(aout,link_hash_table_init) - PARAMS ((struct aout_link_hash_table *, bfd *, - struct bfd_hash_entry *(*) (struct bfd_hash_entry *, - struct bfd_hash_table *, - const char *))); +extern struct bfd_hash_entry * NAME (aout, link_hash_newfunc) + (struct bfd_hash_entry *, struct bfd_hash_table *, const char *); -extern struct bfd_link_hash_table * NAME(aout,link_hash_table_create) - PARAMS ((bfd *)); +extern bfd_boolean NAME (aout, link_hash_table_init) + (struct aout_link_hash_table *, bfd *, + struct bfd_hash_entry *(*) (struct bfd_hash_entry *, + struct bfd_hash_table *, + const char *)); -extern bfd_boolean NAME(aout,link_add_symbols) - PARAMS ((bfd *, struct bfd_link_info *)); +extern struct bfd_link_hash_table * NAME (aout, link_hash_table_create) + (bfd *); -extern bfd_boolean NAME(aout,final_link) - PARAMS ((bfd *, struct bfd_link_info *, - void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *))); +extern bfd_boolean NAME (aout, link_add_symbols) + (bfd *, struct bfd_link_info *); -extern bfd_boolean NAME(aout,bfd_free_cached_info) - PARAMS ((bfd *)); +extern bfd_boolean NAME (aout, final_link) + (bfd *, struct bfd_link_info *, + void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *)); + +extern bfd_boolean NAME (aout, bfd_free_cached_info) + (bfd *); /* A.out uses the generic versions of these routines... */ @@ -616,8 +615,9 @@ extern bfd_boolean NAME(aout,bfd_free_cached_info) { \ 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); \ + 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); \ @@ -626,32 +626,32 @@ extern bfd_boolean NAME(aout,bfd_free_cached_info) obj_reloc_entry_size (abfd)); \ execp->a_drsize = ((obj_datasec (abfd)->reloc_count) * \ obj_reloc_entry_size (abfd)); \ - 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 \ - || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,\ + || bfd_bwrite (& 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 \ + 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 (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*execp)), SEEK_SET) != 0) \ return FALSE; \ - if (!NAME(aout,squirt_out_relocs) (abfd, obj_textsec (abfd))) \ + 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 (!NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd))) \ return FALSE; \ } #endif |