X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fcoffgrok.c;h=97574e7d0ca475ec856ef0ea4c6b23fe180dd098;hb=8729a6f6a5148fb4dcb280a95dc0bdc35f02b96e;hp=8c4e6c9c98e50c8b639022ff481fc8a349f5cd26;hpb=5b64ad42d36e6d487e1f7287d37fbc243a178e72;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/coffgrok.c b/binutils/coffgrok.c index 8c4e6c9c98..97574e7d0c 100644 --- a/binutils/coffgrok.c +++ b/binutils/coffgrok.c @@ -1,46 +1,50 @@ /* coffgrok.c - Copyright (C) 1994, 95, 97, 1998 Free Software Foundation, Inc. + Copyright 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, + 2007, 2009 Free Software Foundation, Inc. -This file is part of GNU Binutils. + This file is part of GNU Binutils. -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 3 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., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, 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. */ /* Written by Steve Chamberlain (sac@cygnus.com) This module reads a coff file and builds a really simple type tree which can be read by other programs. The first application is a - coff->sysroff converter. It can be tested with coffdump.c. - -*/ + coff->sysroff converter. It can be tested with coffdump.c. */ -#include -#include "bucomm.h" +#include "sysdep.h" +#include "bfd.h" +#include "libiberty.h" #include "coff/internal.h" #include "../bfd/libcoff.h" +#include "bucomm.h" #include "coffgrok.h" -int lofile = 1; + +static int lofile = 1; static struct coff_scope *top_scope; static struct coff_scope *file_scope; static struct coff_ofile *ofile; -struct coff_symbol *last_function_symbol; -struct coff_type *last_function_type; -struct coff_type *last_struct; -struct coff_type *last_enum; -struct coff_sfile *cur_sfile; +static struct coff_symbol *last_function_symbol; +static struct coff_type *last_function_type; +static struct coff_type *last_struct; +static struct coff_type *last_enum; +static struct coff_sfile *cur_sfile; static struct coff_symbol **tindex; @@ -53,18 +57,31 @@ static long symcount; static struct coff_ptr_struct *rawsyms; static int rawcount; static bfd *abfd; -extern char *xcalloc (); -#define PTR_SIZE 4 -#define SHORT_SIZE 2 -#define INT_SIZE 4 -#define LONG_SIZE 4 -#define FLOAT_SIZE 4 -#define DOUBLE_SIZE 8 + +#define PTR_SIZE 4 +#define SHORT_SIZE 2 +#define INT_SIZE 4 +#define LONG_SIZE 4 +#define FLOAT_SIZE 4 +#define DOUBLE_SIZE 8 #define INDEXOF(p) ((struct coff_ptr_struct *)(p)-(rawsyms)) +static struct coff_scope *empty_scope (void); +static struct coff_symbol *empty_symbol (void); +static void push_scope (int); +static void pop_scope (void); +static void do_sections_p1 (struct coff_ofile *); +static void do_sections_p2 (struct coff_ofile *); +static struct coff_where *do_where (int); +static struct coff_line *do_lines (int, char *); +static struct coff_type *do_type (int); +static struct coff_visible *do_visible (int); +static int do_define (int, struct coff_scope *); +static struct coff_ofile *doit (void); + static struct coff_scope * -empty_scope () +empty_scope (void) { struct coff_scope *l; l = (struct coff_scope *) (xcalloc (sizeof (struct coff_scope), 1)); @@ -72,18 +89,18 @@ empty_scope () } static struct coff_symbol * -empty_symbol () +empty_symbol (void) { return (struct coff_symbol *) (xcalloc (sizeof (struct coff_symbol), 1)); } /*int l;*/ static void -push_scope (link) - int link; +push_scope (int slink) { struct coff_scope *n = empty_scope (); - if (link) + + if (slink) { if (top_scope) { @@ -104,14 +121,13 @@ push_scope (link) } static void -pop_scope () +pop_scope (void) { top_scope = top_scope->parent; } static void -do_sections_p1 (head) - struct coff_ofile *head; +do_sections_p1 (struct coff_ofile *head) { asection *section; int idx; @@ -131,7 +147,7 @@ do_sections_p1 (head) if (relsize < 0) bfd_fatal (bfd_get_filename (abfd)); if (relsize == 0) - continue; + continue; relpp = (arelent **) xmalloc (relsize); relcount = bfd_canonicalize_reloc (abfd, section, relpp, syms); if (relcount < 0) @@ -143,7 +159,7 @@ do_sections_p1 (head) if (strcmp (section->name, ".bss") == 0) head->sections[i].data = 1; head->sections[i].address = section->lma; - head->sections[i].size = section->_raw_size; + head->sections[i].size = bfd_get_section_size (section); head->sections[i].number = idx; head->sections[i].nrelocs = section->reloc_count; head->sections[i].relocs = @@ -160,8 +176,7 @@ do_sections_p1 (head) } static void -do_sections_p2 (head) - struct coff_ofile *head; +do_sections_p2 (struct coff_ofile *head) { asection *section; for (section = abfd->sections; section; section = section->next) @@ -183,8 +198,7 @@ do_sections_p2 (head) } static struct coff_where * -do_where (i) - int i; +do_where (int i) { struct internal_syment *sym = &rawsyms[i].u.syment; struct coff_where *where = @@ -243,9 +257,7 @@ do_where (i) static struct coff_line * -do_lines (i, name) - int i; - char *name; +do_lines (int i, char *name ATTRIBUTE_UNUSED) { struct coff_line *res = (struct coff_line *) xcalloc (sizeof (struct coff_line), 1); asection *s; @@ -263,7 +275,7 @@ do_lines (i, name) /* These lines are for this function - so count them and stick them on */ int c = 0; /* Find the linenumber of the top of the function, since coff linenumbers - are relative to the start of the function. */ + are relative to the start of the function. */ int start_line = rawsyms[i + 3].u.auxent.x_sym.x_misc.x_lnsz.x_lnno; l++; @@ -292,8 +304,7 @@ do_lines (i, name) static struct coff_type * -do_type (i) - int i; +do_type (int i) { struct internal_syment *sym = &rawsyms[i].u.syment; union internal_auxent *aux = &rawsyms[i + 1].u.auxent; @@ -362,7 +373,7 @@ do_type (i) { if (aux->x_sym.x_tagndx.p) { - /* Refering to a struct defined elsewhere */ + /* Referring to a struct defined elsewhere */ res->type = coff_structref_type; res->u.astructref.ref = tindex[INDEXOF (aux->x_sym.x_tagndx.p)]; res->size = res->u.astructref.ref ? @@ -381,7 +392,7 @@ do_type (i) } else { - /* No auxents - it's anonynmous */ + /* No auxents - it's anonymous */ res->type = coff_structref_type; res->u.astructref.ref = 0; res->size = 0; @@ -390,7 +401,7 @@ do_type (i) case T_ENUM: if (aux->x_sym.x_tagndx.p) { - /* Refering to a enum defined elsewhere */ + /* Referring to a enum defined elsewhere */ res->type = coff_enumref_type; res->u.aenumref.ref = tindex[INDEXOF (aux->x_sym.x_tagndx.p)]; res->size = res->u.aenumref.ref->type->size; @@ -459,8 +470,7 @@ do_type (i) } static struct coff_visible * -do_visible (i) - int i; +do_visible (int i) { struct internal_syment *sym = &rawsyms[i].u.syment; struct coff_visible *visible = @@ -524,9 +534,7 @@ do_visible (i) } static int -do_define (i, b) - int i; - struct coff_scope *b; +do_define (int i, struct coff_scope *b) { static int symbol_index; struct internal_syment *sym = &rawsyms[i].u.syment; @@ -586,12 +594,12 @@ do_define (i, b) static struct coff_ofile * -doit () +doit (void) { int i; int infile = 0; struct coff_ofile *head = - (struct coff_ofile *) xmalloc (sizeof (struct coff_ofile)); + (struct coff_ofile *) xmalloc (sizeof (struct coff_ofile)); ofile = head; head->source_head = 0; head->source_tail = 0; @@ -713,8 +721,7 @@ doit () } struct coff_ofile * -coff_grok (inabfd) - bfd *inabfd; +coff_grok (bfd *inabfd) { long storage; struct coff_ofile *p;