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/aout-adobe.c | |
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/aout-adobe.c')
-rw-r--r-- | bfd/aout-adobe.c | 371 |
1 files changed, 157 insertions, 214 deletions
diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c index 9277bc0..de3667e 100644 --- a/bfd/aout-adobe.c +++ b/bfd/aout-adobe.c @@ -1,72 +1,43 @@ /* BFD back-end for a.out.adobe binaries. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, - 2001, 2002, 2003, 2004 + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Written by Cygnus Support. Based on bout.c. -This file is part of BFD, the Binary File Descriptor library. + 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 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. + 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. */ + 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. */ #include "bfd.h" #include "sysdep.h" #include "libbfd.h" - #include "aout/adobe.h" - #include "aout/stab_gnu.h" #include "libaout.h" /* BFD a.out internal data structures. */ /* Forward decl. */ extern const bfd_target a_out_adobe_vec; -static const bfd_target *aout_adobe_callback - PARAMS ((bfd *)); -extern bfd_boolean aout_32_slurp_symbol_table - PARAMS ((bfd *abfd)); -extern bfd_boolean aout_32_write_syms - PARAMS ((bfd *)); -static void aout_adobe_write_section - PARAMS ((bfd *abfd, sec_ptr sect)); -static const bfd_target * aout_adobe_object_p - PARAMS ((bfd *)); -static bfd_boolean aout_adobe_mkobject - PARAMS ((bfd *)); -static bfd_boolean aout_adobe_write_object_contents - PARAMS ((bfd *)); -static bfd_boolean aout_adobe_set_section_contents - PARAMS ((bfd *, asection *, const PTR, file_ptr, bfd_size_type)); -static bfd_boolean aout_adobe_set_arch_mach - PARAMS ((bfd *, enum bfd_architecture, unsigned long)); -static int aout_adobe_sizeof_headers - PARAMS ((bfd *, bfd_boolean)); - /* Swaps the information in an executable header taken from a raw byte stream memory image, into the internal exec_header structure. */ -void aout_adobe_swap_exec_header_in - PARAMS ((bfd *, struct external_exec *, struct internal_exec *)); - -void -aout_adobe_swap_exec_header_in (abfd, raw_bytes, execp) - bfd *abfd; - struct external_exec *raw_bytes; - struct internal_exec *execp; +static void +aout_adobe_swap_exec_header_in (bfd *abfd, + struct external_exec *bytes, + struct internal_exec *execp) { - struct external_exec *bytes = (struct external_exec *) raw_bytes; - /* Now fill in fields in the execp, from the bytes in the raw data. */ execp->a_info = H_GET_32 (abfd, bytes->e_info); execp->a_text = GET_WORD (abfd, bytes->e_text); @@ -81,17 +52,11 @@ aout_adobe_swap_exec_header_in (abfd, raw_bytes, execp) /* Swaps the information in an internal exec header structure into the supplied buffer ready for writing to disk. */ -void aout_adobe_swap_exec_header_out - PARAMS ((bfd *, struct internal_exec *, struct external_exec *)); - -void -aout_adobe_swap_exec_header_out (abfd, execp, raw_bytes) - bfd *abfd; - struct internal_exec *execp; - struct external_exec *raw_bytes; +static void +aout_adobe_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. */ H_PUT_32 (abfd, execp->a_info , bytes->e_info); @@ -104,53 +69,11 @@ aout_adobe_swap_exec_header_out (abfd, execp, raw_bytes) PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize); } -static const bfd_target * -aout_adobe_object_p (abfd) - bfd *abfd; -{ - struct internal_exec anexec; - struct external_exec exec_bytes; - char *targ; - bfd_size_type amt = EXEC_BYTES_SIZE; - - if (bfd_bread ((PTR) &exec_bytes, amt, abfd) != amt) - { - if (bfd_get_error () != bfd_error_system_call) - bfd_set_error (bfd_error_wrong_format); - return 0; - } - - anexec.a_info = H_GET_32 (abfd, exec_bytes.e_info); - - /* Normally we just compare for the magic number. - However, a bunch of Adobe tools aren't fixed up yet; they generate - files using ZMAGIC(!). - If the environment variable GNUTARGET is set to "a.out.adobe", we will - take just about any a.out file as an Adobe a.out file. FIXME! */ - - if (N_BADMAG (anexec)) - { - targ = getenv ("GNUTARGET"); - if (targ && !strcmp (targ, a_out_adobe_vec.name)) - /* Just continue anyway, if specifically set to this format. */ - ; - else - { - bfd_set_error (bfd_error_wrong_format); - return 0; - } - } - - aout_adobe_swap_exec_header_in (abfd, &exec_bytes, &anexec); - return aout_32_some_aout_object_p (abfd, &anexec, aout_adobe_callback); -} - /* Finish up the opening of a b.out file for reading. Fill in all the fields that are not handled by common code. */ static const bfd_target * -aout_adobe_callback (abfd) - bfd *abfd; +aout_adobe_callback (bfd *abfd) { struct internal_exec *execp = exec_hdr (abfd); asection *sect; @@ -172,12 +95,12 @@ aout_adobe_callback (abfd) for (;;) { bfd_size_type amt = sizeof (*ext); - if (bfd_bread ((PTR) ext, amt, abfd) != amt) + if (bfd_bread ( ext, amt, abfd) != amt) { if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); - return 0; + return NULL; } switch (ext->e_type[0]) { @@ -216,7 +139,7 @@ aout_adobe_callback (abfd) { if (bfd_get_error () != bfd_error_no_error) /* Some other error -- slide into the sunset. */ - return 0; + return NULL; sprintf (try_again, "%s%d", section_name, ++trynum); sect = bfd_make_section (abfd, try_again); } @@ -225,9 +148,9 @@ aout_adobe_callback (abfd) if (sect->name == try_again) { amt = strlen (sect->name); - newname = (char *) bfd_zalloc (abfd, amt); + newname = bfd_zalloc (abfd, amt); if (newname == NULL) - return 0; + return NULL; strcpy (newname, sect->name); sect->name = newname; } @@ -271,20 +194,59 @@ aout_adobe_callback (abfd) return abfd->xvec; } +static const bfd_target * +aout_adobe_object_p (bfd *abfd) +{ + struct internal_exec anexec; + struct external_exec exec_bytes; + char *targ; + bfd_size_type amt = EXEC_BYTES_SIZE; + + if (bfd_bread (& exec_bytes, amt, abfd) != amt) + { + if (bfd_get_error () != bfd_error_system_call) + bfd_set_error (bfd_error_wrong_format); + return NULL; + } + + anexec.a_info = H_GET_32 (abfd, exec_bytes.e_info); + + /* Normally we just compare for the magic number. + However, a bunch of Adobe tools aren't fixed up yet; they generate + files using ZMAGIC(!). + If the environment variable GNUTARGET is set to "a.out.adobe", we will + take just about any a.out file as an Adobe a.out file. FIXME! */ + + if (N_BADMAG (anexec)) + { + targ = getenv ("GNUTARGET"); + if (targ && !strcmp (targ, a_out_adobe_vec.name)) + /* Just continue anyway, if specifically set to this format. */ + ; + else + { + bfd_set_error (bfd_error_wrong_format); + return NULL; + } + } + + aout_adobe_swap_exec_header_in (abfd, &exec_bytes, &anexec); + return aout_32_some_aout_object_p (abfd, &anexec, aout_adobe_callback); +} + struct bout_data_struct - { - struct aoutdata a; - struct internal_exec e; - }; +{ + struct aoutdata a; + struct internal_exec e; +}; static bfd_boolean -aout_adobe_mkobject (abfd) - bfd *abfd; +aout_adobe_mkobject (bfd *abfd) { struct bout_data_struct *rawptr; bfd_size_type amt = sizeof (struct bout_data_struct); - rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, amt); + rawptr = bfd_zalloc (abfd, amt); if (rawptr == NULL) return FALSE; @@ -300,9 +262,15 @@ aout_adobe_mkobject (abfd) return TRUE; } +static void +aout_adobe_write_section (bfd *abfd ATTRIBUTE_UNUSED, + sec_ptr sect ATTRIBUTE_UNUSED) +{ + /* FIXME XXX. */ +} + static bfd_boolean -aout_adobe_write_object_contents (abfd) - bfd *abfd; +aout_adobe_write_object_contents (bfd *abfd) { struct external_exec swapped_hdr; static struct external_segdesc sentinel[1]; /* Initialized to zero. */ @@ -312,7 +280,6 @@ aout_adobe_write_object_contents (abfd) exec_hdr (abfd)->a_info = ZMAGIC; /* Calculate text size as total of text sections, etc. */ - exec_hdr (abfd)->a_text = 0; exec_hdr (abfd)->a_data = 0; exec_hdr (abfd)->a_bss = 0; @@ -334,9 +301,7 @@ aout_adobe_write_object_contents (abfd) sizeof (struct reloc_std_external); } else if (sect->flags & SEC_ALLOC && !(sect->flags & SEC_LOAD)) - { - exec_hdr (abfd)->a_bss += sect->size; - } + exec_hdr (abfd)->a_bss += sect->size; } exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) @@ -347,12 +312,11 @@ aout_adobe_write_object_contents (abfd) amt = EXEC_BYTES_SIZE; if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0 - || bfd_bwrite ((PTR) &swapped_hdr, amt, abfd) != amt) + || bfd_bwrite (& swapped_hdr, amt, abfd) != amt) return FALSE; /* Now write out the section information. Text first, data next, rest afterward. */ - for (sect = abfd->sections; sect; sect = sect->next) if (sect->flags & SEC_CODE) aout_adobe_write_section (abfd, sect); @@ -367,7 +331,7 @@ aout_adobe_write_object_contents (abfd) /* Write final `sentinel` section header (with type of 0). */ amt = sizeof (*sentinel); - if (bfd_bwrite ((PTR) sentinel, amt, abfd) != amt) + if (bfd_bwrite (sentinel, amt, abfd) != amt) return FALSE; /* Now write out reloc info, followed by syms and strings. */ @@ -401,22 +365,13 @@ aout_adobe_write_object_contents (abfd) return TRUE; } - -static void -aout_adobe_write_section (abfd, sect) - bfd *abfd ATTRIBUTE_UNUSED; - sec_ptr sect ATTRIBUTE_UNUSED; -{ - /* FIXME XXX */ -} static bfd_boolean -aout_adobe_set_section_contents (abfd, section, location, offset, count) - bfd *abfd; - asection *section; - const PTR location; - file_ptr offset; - bfd_size_type count; +aout_adobe_set_section_contents (bfd *abfd, + asection *section, + const void * location, + file_ptr offset, + bfd_size_type count) { file_ptr section_start; sec_ptr sect; @@ -468,14 +423,13 @@ aout_adobe_set_section_contents (abfd, section, location, offset, count) if (count == 0) return TRUE; - return bfd_bwrite ((PTR) location, count, abfd) == count; + return bfd_bwrite (location, count, abfd) == count; } static bfd_boolean -aout_adobe_set_arch_mach (abfd, arch, machine) - bfd *abfd; - enum bfd_architecture arch; - unsigned long machine; +aout_adobe_set_arch_mach (bfd *abfd, + enum bfd_architecture arch, + unsigned long machine) { if (! bfd_default_set_arch_mach (abfd, arch, machine)) return FALSE; @@ -488,86 +442,75 @@ aout_adobe_set_arch_mach (abfd, arch, machine) } static int -aout_adobe_sizeof_headers (ignore_abfd, ignore) - bfd *ignore_abfd ATTRIBUTE_UNUSED; - bfd_boolean ignore ATTRIBUTE_UNUSED; +aout_adobe_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED, + bfd_boolean ignore ATTRIBUTE_UNUSED) { return sizeof (struct internal_exec); } /* Build the transfer vector for Adobe A.Out files. */ -#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info - -#define aout_32_bfd_make_debug_symbol \ - ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr) - -#define aout_32_bfd_reloc_type_lookup \ - ((reloc_howto_type *(*) \ - PARAMS ((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr) - -#define aout_32_set_arch_mach aout_adobe_set_arch_mach -#define aout_32_set_section_contents aout_adobe_set_section_contents - -#define aout_32_sizeof_headers aout_adobe_sizeof_headers -#define aout_32_bfd_get_relocated_section_contents \ - bfd_generic_get_relocated_section_contents -#define aout_32_get_section_contents_in_window _bfd_generic_get_section_contents_in_window -#define aout_32_bfd_relax_section bfd_generic_relax_section -#define aout_32_bfd_gc_sections bfd_generic_gc_sections -#define aout_32_bfd_merge_sections bfd_generic_merge_sections -#define aout_32_bfd_is_group_section bfd_generic_is_group_section -#define aout_32_bfd_discard_group bfd_generic_discard_group -#define aout_32_section_already_linked \ - _bfd_generic_section_already_linked -#define aout_32_bfd_link_hash_table_create \ - _bfd_generic_link_hash_table_create -#define aout_32_bfd_link_hash_table_free \ - _bfd_generic_link_hash_table_free -#define aout_32_bfd_link_add_symbols _bfd_generic_link_add_symbols -#define aout_32_bfd_link_just_syms _bfd_generic_link_just_syms -#define aout_32_bfd_final_link _bfd_generic_final_link -#define aout_32_bfd_link_split_section _bfd_generic_link_split_section +#define aout_32_bfd_make_debug_symbol ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr) +#define aout_32_bfd_reloc_type_lookup ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr) +#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info +#define aout_32_set_arch_mach aout_adobe_set_arch_mach +#define aout_32_set_section_contents aout_adobe_set_section_contents +#define aout_32_sizeof_headers aout_adobe_sizeof_headers +#define aout_32_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents +#define aout_32_get_section_contents_in_window _bfd_generic_get_section_contents_in_window +#define aout_32_bfd_relax_section bfd_generic_relax_section +#define aout_32_bfd_gc_sections bfd_generic_gc_sections +#define aout_32_bfd_merge_sections bfd_generic_merge_sections +#define aout_32_bfd_is_group_section bfd_generic_is_group_section +#define aout_32_bfd_discard_group bfd_generic_discard_group +#define aout_32_section_already_linked _bfd_generic_section_already_linked +#define aout_32_bfd_link_hash_table_create _bfd_generic_link_hash_table_create +#define aout_32_bfd_link_hash_table_free _bfd_generic_link_hash_table_free +#define aout_32_bfd_link_add_symbols _bfd_generic_link_add_symbols +#define aout_32_bfd_link_just_syms _bfd_generic_link_just_syms +#define aout_32_bfd_final_link _bfd_generic_final_link +#define aout_32_bfd_link_split_section _bfd_generic_link_split_section const bfd_target a_out_adobe_vec = - { - "a.out.adobe", /* name */ - bfd_target_aout_flavour, - BFD_ENDIAN_BIG, /* data byte order is unknown (big assumed) */ - BFD_ENDIAN_BIG, /* hdr byte order is big */ - (HAS_RELOC | EXEC_P | /* object flags */ - HAS_LINENO | HAS_DEBUG | - HAS_SYMS | HAS_LOCALS | WP_TEXT ), - /* section flags */ - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_DATA | SEC_RELOC), - '_', /* symbol leading char */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ - - bfd_getb64, bfd_getb_signed_64, bfd_putb64, - bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */ - bfd_getb64, bfd_getb_signed_64, bfd_putb64, - bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */ - {_bfd_dummy_target, aout_adobe_object_p, /* bfd_check_format */ - bfd_generic_archive_p, _bfd_dummy_target}, - {bfd_false, aout_adobe_mkobject, /* bfd_set_format */ - _bfd_generic_mkarchive, bfd_false}, - {bfd_false, aout_adobe_write_object_contents,/* bfd_write_contents */ - _bfd_write_archive_contents, bfd_false}, - - BFD_JUMP_TABLE_GENERIC (aout_32), - BFD_JUMP_TABLE_COPY (_bfd_generic), - BFD_JUMP_TABLE_CORE (_bfd_nocore), - BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd), - BFD_JUMP_TABLE_SYMBOLS (aout_32), - BFD_JUMP_TABLE_RELOCS (aout_32), - BFD_JUMP_TABLE_WRITE (aout_32), - BFD_JUMP_TABLE_LINK (aout_32), - BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), - - NULL, - - (PTR) 0 - }; +{ + "a.out.adobe", /* Name. */ + bfd_target_aout_flavour, + BFD_ENDIAN_BIG, /* Data byte order is unknown (big assumed). */ + BFD_ENDIAN_BIG, /* Header byte order is big. */ + (HAS_RELOC | EXEC_P | /* Object flags. */ + HAS_LINENO | HAS_DEBUG | + HAS_SYMS | HAS_LOCALS | WP_TEXT ), + /* section flags */ + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_DATA | SEC_RELOC), + '_', /* Symbol leading char. */ + ' ', /* AR_pad_char. */ + 16, /* AR_max_namelen. */ + + bfd_getb64, bfd_getb_signed_64, bfd_putb64, + bfd_getb32, bfd_getb_signed_32, bfd_putb32, + bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Data. */ + bfd_getb64, bfd_getb_signed_64, bfd_putb64, + bfd_getb32, bfd_getb_signed_32, bfd_putb32, + bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Headers. */ + + {_bfd_dummy_target, aout_adobe_object_p, /* bfd_check_format. */ + bfd_generic_archive_p, _bfd_dummy_target}, + {bfd_false, aout_adobe_mkobject, /* bfd_set_format. */ + _bfd_generic_mkarchive, bfd_false}, + {bfd_false, aout_adobe_write_object_contents,/* bfd_write_contents. */ + _bfd_write_archive_contents, bfd_false}, + + BFD_JUMP_TABLE_GENERIC (aout_32), + BFD_JUMP_TABLE_COPY (_bfd_generic), + BFD_JUMP_TABLE_CORE (_bfd_nocore), + BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd), + BFD_JUMP_TABLE_SYMBOLS (aout_32), + BFD_JUMP_TABLE_RELOCS (aout_32), + BFD_JUMP_TABLE_WRITE (aout_32), + BFD_JUMP_TABLE_LINK (aout_32), + BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + + NULL, + + NULL +}; |