diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/libbfd.c | 99 | ||||
| -rw-r--r-- | bfd/linker.c | 29 | ||||
| -rw-r--r-- | bfd/lynx-core.c | 9 |
4 files changed, 65 insertions, 78 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ac11c6c..1ea669c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2001-01-03 Kazu Hirata <kazu@hxi.com> + + * libbfd.c: Fix formatting. + * linker.c: Likewise. + * lynx-core.c: Likewise. + 2001-01-02 Kazu Hirata <kazu@hxi.com> * pc532-mach.c: Fix formatting. diff --git a/bfd/libbfd.c b/bfd/libbfd.c index c570ddf..8b846f0 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -42,7 +42,6 @@ DESCRIPTION /* A routine which is used in target vectors for unsupported operations. */ -/*ARGSUSED*/ boolean bfd_false (ignore) bfd *ignore ATTRIBUTE_UNUSED; @@ -54,7 +53,6 @@ bfd_false (ignore) /* A routine which is used in target vectors for supported operations which do not actually do anything. */ -/*ARGSUSED*/ boolean bfd_true (ignore) bfd *ignore ATTRIBUTE_UNUSED; @@ -65,7 +63,6 @@ bfd_true (ignore) /* A routine which is used in target vectors for unsupported operations which return a pointer value. */ -/*ARGSUSED*/ PTR bfd_nullvoidptr (ignore) bfd *ignore ATTRIBUTE_UNUSED; @@ -74,23 +71,20 @@ bfd_nullvoidptr (ignore) return NULL; } -/*ARGSUSED*/ -int +int bfd_0 (ignore) bfd *ignore ATTRIBUTE_UNUSED; { return 0; } -/*ARGSUSED*/ -unsigned int +unsigned int bfd_0u (ignore) bfd *ignore ATTRIBUTE_UNUSED; { return 0; } -/*ARGUSED*/ long bfd_0l (ignore) bfd *ignore ATTRIBUTE_UNUSED; @@ -101,7 +95,6 @@ bfd_0l (ignore) /* A routine which is used in target vectors for unsupported operations which return -1 on error. */ -/*ARGSUSED*/ long _bfd_n1 (ignore_abfd) bfd *ignore_abfd ATTRIBUTE_UNUSED; @@ -110,14 +103,12 @@ _bfd_n1 (ignore_abfd) return -1; } -/*ARGSUSED*/ -void +void bfd_void (ignore) bfd *ignore ATTRIBUTE_UNUSED; { } -/*ARGSUSED*/ boolean _bfd_nocore_core_file_matches_executable_p (ignore_core_bfd, ignore_exec_bfd) bfd *ignore_core_bfd ATTRIBUTE_UNUSED; @@ -130,7 +121,6 @@ _bfd_nocore_core_file_matches_executable_p (ignore_core_bfd, ignore_exec_bfd) /* Routine to handle core_file_failing_command entry point for targets without core file support. */ -/*ARGSUSED*/ char * _bfd_nocore_core_file_failing_command (ignore_abfd) bfd *ignore_abfd ATTRIBUTE_UNUSED; @@ -142,7 +132,6 @@ _bfd_nocore_core_file_failing_command (ignore_abfd) /* Routine to handle core_file_failing_signal entry point for targets without core file support. */ -/*ARGSUSED*/ int _bfd_nocore_core_file_failing_signal (ignore_abfd) bfd *ignore_abfd ATTRIBUTE_UNUSED; @@ -151,7 +140,6 @@ _bfd_nocore_core_file_failing_signal (ignore_abfd) return 0; } -/*ARGSUSED*/ const bfd_target * _bfd_dummy_target (ignore_abfd) bfd *ignore_abfd ATTRIBUTE_UNUSED; @@ -217,13 +205,12 @@ bfd_zmalloc (size) /* Some IO code */ - /* Note that archive entries don't have streams; they share their parent's. This allows someone to play with the iostream behind BFD's back. Also, note that the origin pointer points to the beginning of a file's contents (0 for non-archive elements). For archive entries this is the - first octet in the file, NOT the beginning of the archive header. */ + first octet in the file, NOT the beginning of the archive header. */ static int real_read (where, a,b, file) @@ -285,7 +272,7 @@ bfd_read (ptr, size, nitems, abfd) return get; } - nread = real_read (ptr, 1, (size_t)(size*nitems), bfd_cache_lookup(abfd)); + nread = real_read (ptr, 1, (size_t) (size*nitems), bfd_cache_lookup(abfd)); if (nread > 0) abfd->where += nread; @@ -317,7 +304,7 @@ struct _bfd_window_internal { struct _bfd_window_internal *next; PTR data; bfd_size_type size; - int refcount : 31; /* should be enough... */ + int refcount : 31; /* should be enough... */ unsigned mapped : 1; /* 1 = mmap, 0 = malloc */ }; @@ -671,7 +658,7 @@ bfd_seek (abfd, position, direction) file_ptr file_position; /* For the time being, a BFD may not seek to it's end. The problem is that we don't easily have a way to recognize the end of an - element in an archive. */ + element in an archive. */ BFD_ASSERT (direction == SEEK_SET || direction == SEEK_CUR); @@ -683,15 +670,15 @@ bfd_seek (abfd, position, direction) struct bfd_in_memory *bim; bim = (struct bfd_in_memory *) abfd->iostream; - + if (direction == SEEK_SET) abfd->where = position; else abfd->where += position; - + if ((bfd_size_type) abfd->where > bim->size) { - if ((abfd->direction == write_direction) || + if ((abfd->direction == write_direction) || (abfd->direction == both_direction)) { long newsize, oldsize = (bim->size + 127) & ~127; @@ -714,7 +701,7 @@ bfd_seek (abfd, position, direction) abfd->where = bim->size; bfd_set_error (bfd_error_file_truncated); return -1; - } + } } return 0; } @@ -796,7 +783,7 @@ bfd_seek (abfd, position, direction) /* FIXME: Should these take a count argument? Answer (gnu@cygnus.com): No, but perhaps they should be inline - functions in swap.h #ifdef __GNUC__. + functions in swap.h #ifdef __GNUC__. Gprof them later and find out. */ /* @@ -827,13 +814,13 @@ DESCRIPTION .{* Byte swapping macros for user section data. *} . .#define bfd_put_8(abfd, val, ptr) \ -. ((void) (*((unsigned char *)(ptr)) = (unsigned char)(val))) +. ((void) (*((unsigned char *) (ptr)) = (unsigned char) (val))) .#define bfd_put_signed_8 \ . bfd_put_8 .#define bfd_get_8(abfd, ptr) \ -. (*(unsigned char *)(ptr)) +. (*(unsigned char *) (ptr)) .#define bfd_get_signed_8(abfd, ptr) \ -. ((*(unsigned char *)(ptr) ^ 0x80) - 0x80) +. ((*(unsigned char *) (ptr) ^ 0x80) - 0x80) . .#define bfd_put_16(abfd, val, ptr) \ . BFD_SEND(abfd, bfd_putx16, ((val),(ptr))) @@ -876,7 +863,7 @@ DESCRIPTION . : (bits) == 64 ? bfd_put_64 (abfd, val, ptr) \ . : (abort (), (void) 0)) . -*/ +*/ /* FUNCTION @@ -928,7 +915,7 @@ DESCRIPTION .#define bfd_h_get_signed_64(abfd, ptr) \ . BFD_SEND(abfd, bfd_h_getx_signed_64, (ptr)) . -*/ +*/ /* Sign extension to bfd_signed_vma. */ #define COERCE16(x) (((bfd_signed_vma) (x) ^ 0x8000) - 0x8000) @@ -971,17 +958,17 @@ bfd_putb16 (data, addr) bfd_vma data; register bfd_byte *addr; { - addr[0] = (bfd_byte)(data >> 8); + addr[0] = (bfd_byte) (data >> 8); addr[1] = (bfd_byte )data; } void bfd_putl16 (data, addr) - bfd_vma data; + bfd_vma data; register bfd_byte *addr; { addr[0] = (bfd_byte )data; - addr[1] = (bfd_byte)(data >> 8); + addr[1] = (bfd_byte) (data >> 8); } bfd_vma @@ -1136,9 +1123,9 @@ bfd_putb32 (data, addr) bfd_vma data; register bfd_byte *addr; { - addr[0] = (bfd_byte)(data >> 24); - addr[1] = (bfd_byte)(data >> 16); - addr[2] = (bfd_byte)(data >> 8); + addr[0] = (bfd_byte) (data >> 24); + addr[1] = (bfd_byte) (data >> 16); + addr[2] = (bfd_byte) (data >> 8); addr[3] = (bfd_byte)data; } @@ -1148,9 +1135,9 @@ bfd_putl32 (data, addr) register bfd_byte *addr; { addr[0] = (bfd_byte)data; - addr[1] = (bfd_byte)(data >> 8); - addr[2] = (bfd_byte)(data >> 16); - addr[3] = (bfd_byte)(data >> 24); + addr[1] = (bfd_byte) (data >> 8); + addr[2] = (bfd_byte) (data >> 16); + addr[3] = (bfd_byte) (data >> 24); } void @@ -1159,14 +1146,14 @@ bfd_putb64 (data, addr) register bfd_byte *addr ATTRIBUTE_UNUSED; { #ifdef BFD64 - addr[0] = (bfd_byte)(data >> (7*8)); - addr[1] = (bfd_byte)(data >> (6*8)); - addr[2] = (bfd_byte)(data >> (5*8)); - addr[3] = (bfd_byte)(data >> (4*8)); - addr[4] = (bfd_byte)(data >> (3*8)); - addr[5] = (bfd_byte)(data >> (2*8)); - addr[6] = (bfd_byte)(data >> (1*8)); - addr[7] = (bfd_byte)(data >> (0*8)); + addr[0] = (bfd_byte) (data >> (7*8)); + addr[1] = (bfd_byte) (data >> (6*8)); + addr[2] = (bfd_byte) (data >> (5*8)); + addr[3] = (bfd_byte) (data >> (4*8)); + addr[4] = (bfd_byte) (data >> (3*8)); + addr[5] = (bfd_byte) (data >> (2*8)); + addr[6] = (bfd_byte) (data >> (1*8)); + addr[7] = (bfd_byte) (data >> (0*8)); #else BFD_FAIL(); #endif @@ -1178,14 +1165,14 @@ bfd_putl64 (data, addr) register bfd_byte *addr ATTRIBUTE_UNUSED; { #ifdef BFD64 - addr[7] = (bfd_byte)(data >> (7*8)); - addr[6] = (bfd_byte)(data >> (6*8)); - addr[5] = (bfd_byte)(data >> (5*8)); - addr[4] = (bfd_byte)(data >> (4*8)); - addr[3] = (bfd_byte)(data >> (3*8)); - addr[2] = (bfd_byte)(data >> (2*8)); - addr[1] = (bfd_byte)(data >> (1*8)); - addr[0] = (bfd_byte)(data >> (0*8)); + addr[7] = (bfd_byte) (data >> (7*8)); + addr[6] = (bfd_byte) (data >> (6*8)); + addr[5] = (bfd_byte) (data >> (5*8)); + addr[4] = (bfd_byte) (data >> (4*8)); + addr[3] = (bfd_byte) (data >> (3*8)); + addr[2] = (bfd_byte) (data >> (2*8)); + addr[1] = (bfd_byte) (data >> (1*8)); + addr[0] = (bfd_byte) (data >> (0*8)); #else BFD_FAIL(); #endif @@ -1232,7 +1219,7 @@ bfd_get_bits (addr, bits, big_p) for (i = 0; i < bytes; i++) { int index = big_p ? i : bytes - i - 1; - + data = (data << 8) | addr[index]; } diff --git a/bfd/linker.c b/bfd/linker.c index 6e9ee65..1fb3cc5 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -60,7 +60,7 @@ SECTION a.out (in <<aoutx.h>>) and ECOFF (in <<ecoff.c>>). The a.out routines are used as examples throughout this section. -@menu +@menu @* Creating a Linker Hash Table:: @* Adding Symbols to the Hash Table:: @* Performing the Final Link:: @@ -601,7 +601,7 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow) struct bfd_link_hash_entry * with no explicit cast required on the call. */ -void +void bfd_link_hash_traverse (table, func, info) struct bfd_link_hash_table *table; boolean (*func) PARAMS ((struct bfd_link_hash_entry *, PTR)); @@ -1361,7 +1361,7 @@ enum link_row enum link_action { - FAIL, /* Abort. */ + FAIL, /* Abort. */ UND, /* Mark symbol undefined. */ WEAK, /* Mark symbol weak undefined. */ DEF, /* Mark symbol defined. */ @@ -1464,7 +1464,7 @@ hash_entry_bfd (h) or destructor names as collect2 does. HASHP, if not NULL, is a place to store the created hash table entry; if *HASHP is not NULL, the caller has already looked up - the hash table entry, and stored it in *HASHP. */ + the hash table entry, and stored it in *HASHP. */ boolean _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value, @@ -2054,7 +2054,7 @@ _bfd_generic_final_link (abfd, info) } } } - + return true; } @@ -2452,7 +2452,7 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order) r = (arelent *) bfd_alloc (abfd, sizeof (arelent)); if (r == (arelent *) NULL) return false; - + r->address = link_order->offset; r->howto = bfd_reloc_type_lookup (abfd, link_order->u.reloc.p->reloc); if (r->howto == 0) @@ -2524,7 +2524,7 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order) break; } ok = bfd_set_section_contents (abfd, sec, (PTR) buf, - (file_ptr) + (file_ptr) (link_order->offset * bfd_octets_per_byte (abfd)), size); free (buf); @@ -2594,7 +2594,7 @@ _bfd_default_link_order (abfd, info, sec, link_order) case bfd_data_link_order: return bfd_set_section_contents (abfd, sec, (PTR) link_order->u.data.contents, - (file_ptr) + (file_ptr) (link_order->offset * bfd_octets_per_byte (abfd)), link_order->size); @@ -2603,7 +2603,6 @@ _bfd_default_link_order (abfd, info, sec, link_order) /* Default routine to handle a bfd_fill_link_order. */ -/*ARGSUSED*/ static boolean default_fill_link_order (abfd, info, sec, link_order) bfd *abfd; @@ -2630,8 +2629,8 @@ default_fill_link_order (abfd, info, sec, link_order) for (i = 1; i < size; i += 2) space[i] = fill; result = bfd_set_section_contents (abfd, sec, space, - (file_ptr) - (link_order->offset * + (file_ptr) + (link_order->offset * bfd_octets_per_byte (abfd)), link_order->size); free (space); @@ -2732,7 +2731,7 @@ default_indirect_link_order (output_bfd, info, output_section, link_order, if (h != NULL) set_symbol_from_hash (sym, h); } - } + } } /* Get and relocate the section contents. */ @@ -2750,8 +2749,8 @@ default_indirect_link_order (output_bfd, info, output_section, link_order, if (! bfd_set_section_contents (output_bfd, output_section, (PTR) new_contents, (file_ptr) - (link_order->offset * - bfd_octets_per_byte (output_bfd)), + (link_order->offset * + bfd_octets_per_byte (output_bfd)), link_order->size)) goto error_return; @@ -2803,8 +2802,6 @@ DESCRIPTION */ - - boolean _bfd_generic_link_split_section (abfd, sec) bfd *abfd ATTRIBUTE_UNUSED; diff --git a/bfd/lynx-core.c b/bfd/lynx-core.c index 2358177..b989012 100644 --- a/bfd/lynx-core.c +++ b/bfd/lynx-core.c @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <sys/conf.h> #include <sys/kernel.h> -/* sys/kernel.h should define this, but doesn't always, sigh. */ +/* sys/kernel.h should define this, but doesn't always, sigh. */ #ifndef __LYNXOS #define __LYNXOS #endif @@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* These are stored in the bfd's tdata */ -struct lynx_core_struct +struct lynx_core_struct { int sig; char cmd[PNMLEN + 1]; @@ -83,7 +83,6 @@ make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos) return asect; } -/* ARGSUSED */ const bfd_target * lynx_core_file_p (abfd) bfd *abfd; @@ -146,7 +145,7 @@ lynx_core_file_p (abfd) bfd_set_error (bfd_error_wrong_format); return NULL; } - + core_signal (abfd) = threadp->currsig; newsect = make_bfd_asection (abfd, ".stack", @@ -214,7 +213,6 @@ lynx_core_file_failing_command (abfd) return core_command (abfd); } -/* ARGSUSED */ int lynx_core_file_failing_signal (abfd) bfd *abfd; @@ -222,7 +220,6 @@ lynx_core_file_failing_signal (abfd) return core_signal (abfd); } -/* ARGSUSED */ boolean lynx_core_file_matches_executable_p (core_bfd, exec_bfd) bfd *core_bfd, *exec_bfd; |