From e9e41bd9766f9f38a79f1bf46557780b3a5bef5e Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Thu, 23 Nov 2000 07:33:24 +0000 Subject: [PATCH] 2000-11-23 Kazu Hirata * aix386-core.c: Fix formatting. --- bfd/ChangeLog | 4 ++ bfd/aix386-core.c | 139 ++++++++++++++++++++++++---------------------- 2 files changed, 76 insertions(+), 67 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e3393ed0163..188b62f5daa 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2000-11-23 Kazu Hirata + + * aix386-core.c: Fix formatting. + 2000-11-22 Jim Wilson * coff-ia64.c (howto_table): Use EMPTY_HOWTO. diff --git a/bfd/aix386-core.c b/bfd/aix386-core.c index 2b971176c43..da86b58a1e4 100644 --- a/bfd/aix386-core.c +++ b/bfd/aix386-core.c @@ -1,7 +1,7 @@ /* BFD back-end for AIX on PS/2 core files. This was based on trad-core.c, which was written by John Gilmore of Cygnus Support. - Copyright 1988, 89, 91, 92, 93, 94, 95, 96, 97, 1998 + Copyright 1988, 89, 91, 92, 93, 94, 95, 96, 97, 98, 2000 Free Software Foundation, Inc. Written by Minh Tran-Le . Converted to back end form by Ian Lance Taylor . @@ -32,13 +32,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #if defined (_AIX) && defined (_I386) -#define NOCHECKS /* this is for coredump.h */ -#define _h_USER /* avoid including user.h from coredump.h */ +#define NOCHECKS /* This is for coredump.h. */ +#define _h_USER /* Avoid including user.h from coredump.h. */ #include #include #endif /* _AIX && _I386 */ -/* maybe this could work on some other i386 but I have not tried it +/* Maybe this could work on some other i386 but I have not tried it * mtranle@paris - Tue Sep 24 12:49:35 1991 */ @@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ # define COR_MAGIC "core" #endif -/* need this cast because ptr is really void * */ +/* Need this cast because ptr is really void *. */ #define core_hdr(bfd) \ (((bfd->tdata.trad_core_data))->hdr) #define core_section(bfd,n) \ @@ -56,7 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define core_reg2sec(bfd) \ (((bfd)->tdata.trad_core_data)->reg2_section) -/* These are stored in the bfd's tdata */ +/* These are stored in the bfd's tdata. */ struct trad_core_struct { struct corehdr *hdr; /* core file header */ asection *reg_section; @@ -70,7 +70,7 @@ static const bfd_target * aix386_core_file_p (abfd) bfd *abfd; { - int i,n; + int i, n; unsigned char longbuf[4]; /* Raw bytes of various header fields */ int core_size = sizeof (struct corehdr); struct corehdr *core; @@ -79,18 +79,20 @@ aix386_core_file_p (abfd) struct corehdr internal_core; } *mergem; - if (bfd_read ((PTR)longbuf, 1, sizeof (longbuf), abfd) != sizeof (longbuf)) + if (bfd_read ((PTR) longbuf, 1, sizeof (longbuf), abfd) != sizeof (longbuf)) { if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); return 0; } - if (strncmp(longbuf,COR_MAGIC,4)) return 0; + if (strncmp (longbuf, COR_MAGIC, 4)) + return 0; - if (bfd_seek (abfd, 0L, false) < 0) return 0; + if (bfd_seek (abfd, 0L, false) < 0) + return 0; - mergem = (struct mergem *)bfd_zalloc (abfd, sizeof (struct mergem)); + mergem = (struct mergem *) bfd_zalloc (abfd, sizeof (struct mergem)); if (mergem == NULL) return 0; @@ -100,45 +102,45 @@ aix386_core_file_p (abfd) { if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); - bfd_release (abfd, (char *)mergem); + bfd_release (abfd, (char *) mergem); return 0; } set_tdata (abfd, &mergem->coredata); core_hdr (abfd) = core; - /* create the sections. This is raunchy, but bfd_close wants to reclaim - them */ + /* Create the sections. This is raunchy, but bfd_close wants to + reclaim them. */ core_regsec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection)); if (core_regsec (abfd) == NULL) { loser: - bfd_release (abfd, (char *)mergem); + bfd_release (abfd, (char *) mergem); return 0; } core_reg2sec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection)); if (core_reg2sec (abfd) == NULL) { loser1: - bfd_release (abfd, core_regsec (abfd)); + bfd_release (abfd, core_regsec (abfd)); goto loser; } - for (i=0, n=0 ; (i < MAX_CORE_SEGS) && (core->cd_segs[i].cs_type) ; i++) + for (i = 0, n = 0; (i < MAX_CORE_SEGS) && (core->cd_segs[i].cs_type); i++) { if (core->cd_segs[i].cs_offset == 0) continue; - core_section (abfd,n) = + core_section (abfd, n) = (asection *) bfd_zalloc (abfd, sizeof (asection)); - if (core_section (abfd,n) == NULL) + if (core_section (abfd, n) == NULL) { int j; if (n > 0) { - for (j=0; j < n; j++) - bfd_release (abfd, core_section(abfd, j)); + for (j = 0; j < n; j++) + bfd_release (abfd, core_section (abfd, j)); } - bfd_release (abfd, (char *)mergem); + bfd_release (abfd, (char *) mergem); goto loser1; } @@ -177,7 +179,7 @@ aix386_core_file_p (abfd) core_section (abfd, n)->alignment_power = 2; core_section (abfd, n)->next = NULL; if (n > 0) - core_section (abfd, (n-1))->next = core_section (abfd, n); + core_section (abfd, (n - 1))->next = core_section (abfd, n); abfd->section_count = ++n; } @@ -194,12 +196,13 @@ aix386_core_file_p (abfd) core_regsec (abfd)->vma = -1; core_reg2sec (abfd)->vma = -1; - /* We'll access the regs afresh in the core file, like any section: */ - core_regsec (abfd)->filepos = (file_ptr)offsetof(struct corehdr,cd_regs[0]); - core_reg2sec (abfd)->filepos = (file_ptr)offsetof(struct corehdr, - cd_fpregs); + /* We'll access the regs afresh in the core file, like any section. */ + core_regsec (abfd)->filepos = + (file_ptr) offsetof (struct corehdr, cd_regs[0]); + core_reg2sec (abfd)->filepos = + (file_ptr) offsetof (struct corehdr, cd_fpregs); - /* add the 2 reg fake sections to abfd */ + /* Add the 2 reg fake sections to abfd. */ abfd->section_count += 2; abfd->sections = core_regsec (abfd); core_regsec (abfd)->next = core_reg2sec (abfd); @@ -227,59 +230,61 @@ aix386_core_file_matches_executable_p (core_bfd, exec_bfd) bfd *core_bfd; bfd *exec_bfd; { - return true; /* FIXME, We have no way of telling at this - point */ + /* FIXME: We have no way of telling at this point. */ + return true; } /* If somebody calls any byte-swapping routines, shoot them. */ + static void swap_abort () { - abort (); /* This way doesn't require any declaration for ANSI to fuck up */ + /* This way doesn't require any declaration for ANSI to fuck up. */ + abort (); } + #define NO_GET ((PROTO(bfd_vma, (*), ( const bfd_byte *))) swap_abort ) #define NO_GETS ((PROTO(bfd_signed_vma, (*), (const bfd_byte *))) swap_abort ) #define NO_PUT ((PROTO(void, (*), (bfd_vma, bfd_byte *))) swap_abort ) -const bfd_target aix386_core_vec = - { - "aix386-core", - bfd_target_unknown_flavour, - BFD_ENDIAN_BIG, /* target byte order */ - BFD_ENDIANG_BIG, /* target headers byte order */ +const bfd_target aix386_core_vec = { + "aix386-core", + bfd_target_unknown_flavour, + BFD_ENDIAN_BIG, /* target byte order */ + BFD_ENDIANG_BIG, /* target headers byte order */ (HAS_RELOC | EXEC_P | /* object flags */ HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | WP_TEXT), (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - 0, /* leading underscore */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ - NO_GET, NO_GETS, NO_PUT, - NO_GET, NO_GETS, NO_PUT, - NO_GET, NO_GETS, NO_PUT, /* data */ - NO_GET, NO_GETS, NO_PUT, - NO_GET, NO_GETS, NO_PUT, - NO_GET, NO_GETS, NO_PUT, /* hdrs */ - - {_bfd_dummy_target, _bfd_dummy_target, - _bfd_dummy_target, aix386_core_file_p}, - {bfd_false, bfd_false, /* bfd_create_object */ - bfd_false, bfd_false}, - {bfd_false, bfd_false, /* bfd_write_contents */ - bfd_false, bfd_false}, - - BFD_JUMP_TABLE_GENERIC (_bfd_generic), - BFD_JUMP_TABLE_COPY (_bfd_generic), - BFD_JUMP_TABLE_CORE (aix386), - BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive), - BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols), - BFD_JUMP_TABLE_RELOCS (_bfd_norelocs), - BFD_JUMP_TABLE_WRITE (_bfd_generic), - BFD_JUMP_TABLE_LINK (_bfd_nolink), - BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), - - NULL, - - (PTR) 0 + 0, /* leading underscore */ + ' ', /* ar_pad_char */ + 16, /* ar_max_namelen */ + NO_GET, NO_GETS, NO_PUT, + NO_GET, NO_GETS, NO_PUT, + NO_GET, NO_GETS, NO_PUT, /* data */ + NO_GET, NO_GETS, NO_PUT, + NO_GET, NO_GETS, NO_PUT, + NO_GET, NO_GETS, NO_PUT, /* hdrs */ + + {_bfd_dummy_target, _bfd_dummy_target, + _bfd_dummy_target, aix386_core_file_p}, + {bfd_false, bfd_false, /* bfd_create_object */ + bfd_false, bfd_false}, + {bfd_false, bfd_false, /* bfd_write_contents */ + bfd_false, bfd_false}, + + BFD_JUMP_TABLE_GENERIC (_bfd_generic), + BFD_JUMP_TABLE_COPY (_bfd_generic), + BFD_JUMP_TABLE_CORE (aix386), + BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive), + BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols), + BFD_JUMP_TABLE_RELOCS (_bfd_norelocs), + BFD_JUMP_TABLE_WRITE (_bfd_generic), + BFD_JUMP_TABLE_LINK (_bfd_nolink), + BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + + NULL, + + (PTR) 0 }; -- 2.30.2