diff options
Diffstat (limited to 'contrib/binutils/bfd/binary.c')
| -rw-r--r-- | contrib/binutils/bfd/binary.c | 82 |
1 files changed, 42 insertions, 40 deletions
diff --git a/contrib/binutils/bfd/binary.c b/contrib/binutils/bfd/binary.c index 7bddabf..65f46af 100644 --- a/contrib/binutils/bfd/binary.c +++ b/contrib/binutils/bfd/binary.c @@ -1,23 +1,23 @@ /* BFD back-end for binary objects. - Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com> -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. */ /* This is a BFD backend which may be used to write binary objects. It may only be used for output, not input. The intention is that @@ -41,29 +41,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ a start symbol, an end symbol, and an absolute length symbol. */ #define BIN_SYMS 3 -static boolean binary_mkobject PARAMS ((bfd *)); +static bfd_boolean binary_mkobject PARAMS ((bfd *)); static const bfd_target *binary_object_p PARAMS ((bfd *)); -static boolean binary_get_section_contents +static bfd_boolean binary_get_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); static long binary_get_symtab_upper_bound PARAMS ((bfd *)); static char *mangle_name PARAMS ((bfd *, char *)); -static long binary_get_symtab PARAMS ((bfd *, asymbol **)); +static long binary_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static void binary_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); -static boolean binary_set_section_contents - PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); -static int binary_sizeof_headers PARAMS ((bfd *, boolean)); +static bfd_boolean binary_set_section_contents + PARAMS ((bfd *, asection *, const PTR, file_ptr, bfd_size_type)); +static int binary_sizeof_headers PARAMS ((bfd *, bfd_boolean)); -/* Set by external programs - specifies the BFD architecture - to use when creating binary BFDs. */ -enum bfd_architecture bfd_external_binary_architecture = bfd_arch_unknown; +/* Set by external programs - specifies the BFD architecture and + machine number to be uses when creating binary BFDs. */ +enum bfd_architecture bfd_external_binary_architecture = bfd_arch_unknown; +unsigned long bfd_external_machine = 0; /* Create a binary object. Invoked via bfd_set_format. */ -static boolean +static bfd_boolean binary_mkobject (abfd) bfd *abfd ATTRIBUTE_UNUSED; { - return true; + return TRUE; } /* Any file may be considered to be a binary file, provided the target @@ -107,7 +108,8 @@ binary_object_p (abfd) { if ((bfd_get_arch_info (abfd)->arch == bfd_arch_unknown) && (bfd_external_binary_architecture != bfd_arch_unknown)) - bfd_set_arch_info (abfd, bfd_lookup_arch (bfd_external_binary_architecture, 0)); + bfd_set_arch_info (abfd, bfd_lookup_arch + (bfd_external_binary_architecture, bfd_external_machine)); } return abfd->xvec; @@ -119,7 +121,7 @@ binary_object_p (abfd) /* Get contents of the only section. */ -static boolean +static bfd_boolean binary_get_section_contents (abfd, section, location, offset, count) bfd *abfd; asection *section ATTRIBUTE_UNUSED; @@ -129,8 +131,8 @@ binary_get_section_contents (abfd, section, location, offset, count) { if (bfd_seek (abfd, offset, SEEK_SET) != 0 || bfd_bread (location, count, abfd) != count) - return false; - return true; + return FALSE; + return TRUE; } /* Return the amount of memory needed to read the symbol table. */ @@ -174,7 +176,7 @@ mangle_name (abfd, suffix) /* Return the symbol table. */ static long -binary_get_symtab (abfd, alocation) +binary_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { @@ -185,7 +187,7 @@ binary_get_symtab (abfd, alocation) syms = (asymbol *) bfd_alloc (abfd, amt); if (syms == NULL) - return (long) false; + return 0; /* Start symbol. */ syms[0].the_bfd = abfd; @@ -250,27 +252,27 @@ binary_get_symbol_info (ignore_abfd, symbol, ret) /* Write section contents of a binary file. */ -static boolean +static bfd_boolean binary_set_section_contents (abfd, sec, data, offset, size) bfd *abfd; asection *sec; - PTR data; + const PTR data; file_ptr offset; bfd_size_type size; { if (size == 0) - return true; + return TRUE; if (! abfd->output_has_begun) { - boolean found_low; + bfd_boolean found_low; bfd_vma low; asection *s; /* The lowest section LMA sets the virtual address of the start of the file. We use this to set the file position of all the sections. */ - found_low = false; + found_low = FALSE; low = 0; for (s = abfd->sections; s != NULL; s = s->next) if (((s->flags @@ -280,7 +282,7 @@ binary_set_section_contents (abfd, sec, data, offset, size) && (! found_low || s->lma < low)) { low = s->lma; - found_low = true; + found_low = TRUE; } for (s = abfd->sections; s != NULL; s = s->next) @@ -308,16 +310,16 @@ binary_set_section_contents (abfd, sec, data, offset, size) (unsigned long) s->filepos); } - abfd->output_has_begun = true; + abfd->output_has_begun = TRUE; } /* We don't want to output anything for a section that is neither loaded nor allocated. The contents of such a section are not meaningful in the binary format. */ if ((sec->flags & (SEC_LOAD | SEC_ALLOC)) == 0) - return true; + return TRUE; if ((sec->flags & SEC_NEVER_LOAD) != 0) - return true; + return TRUE; return _bfd_generic_set_section_contents (abfd, sec, data, offset, size); } @@ -327,7 +329,7 @@ binary_set_section_contents (abfd, sec, data, offset, size) static int binary_sizeof_headers (abfd, exec) bfd *abfd ATTRIBUTE_UNUSED; - boolean exec ATTRIBUTE_UNUSED; + bfd_boolean exec ATTRIBUTE_UNUSED; { return 0; } |
