/* Generic symbol-table support for the BFD library.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001
+ 2000, 2001, 2002, 2003
Free Software Foundation, Inc.
Written by Cygnus Support.
-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. */
/*
SECTION
| if (storage_needed < 0)
| FAIL
|
-| if (storage_needed == 0) {
-| return ;
-| }
+| if (storage_needed == 0)
+| return;
+|
| symbol_table = (asymbol **) xmalloc (storage_needed);
| ...
| number_of_symbols =
| if (number_of_symbols < 0)
| FAIL
|
-| for (i = 0; i < number_of_symbols; i++) {
-| process_symbol (symbol_table[i]);
-| }
+| for (i = 0; i < number_of_symbols; i++)
+| process_symbol (symbol_table[i]);
All storage for the symbols themselves is in an objalloc
connected to the BFD; it is freed when the BFD is closed.
example showing the creation of a symbol table with only one element:
| #include "bfd.h"
-| main()
+| int main (void)
| {
| bfd *abfd;
| asymbol *ptrs[2];
| asymbol *new;
|
-| abfd = bfd_openw("foo","a.out-sunos-big");
-| bfd_set_format(abfd, bfd_object);
-| new = bfd_make_empty_symbol(abfd);
+| abfd = bfd_openw ("foo","a.out-sunos-big");
+| bfd_set_format (abfd, bfd_object);
+| new = bfd_make_empty_symbol (abfd);
| new->name = "dummy_symbol";
-| new->section = bfd_make_section_old_way(abfd, ".text");
+| new->section = bfd_make_section_old_way (abfd, ".text");
| new->flags = BSF_GLOBAL;
| new->value = 0x12345;
|
| ptrs[0] = new;
| ptrs[1] = (asymbol *)0;
|
-| bfd_set_symtab(abfd, ptrs, 1);
-| bfd_close(abfd);
+| bfd_set_symtab (abfd, ptrs, 1);
+| bfd_close (abfd);
+| return 0;
| }
|
| ./makesym
.
.typedef struct symbol_cache_entry
.{
-. {* A pointer to the BFD which owns the symbol. This information
-. is necessary so that a back end can work out what additional
-. information (invisible to the application writer) is carried
-. with the symbol.
+. {* A pointer to the BFD which owns the symbol. This information
+. is necessary so that a back end can work out what additional
+. information (invisible to the application writer) is carried
+. with the symbol.
.
-. This field is *almost* redundant, since you can use section->owner
-. instead, except that some symbols point to the global sections
-. bfd_{abs,com,und}_section. This could be fixed by making
-. these globals be per-bfd (or per-target-flavor). FIXME. *}
+. This field is *almost* redundant, since you can use section->owner
+. instead, except that some symbols point to the global sections
+. bfd_{abs,com,und}_section. This could be fixed by making
+. these globals be per-bfd (or per-target-flavor). FIXME. *}
+. struct bfd *the_bfd; {* Use bfd_asymbol_bfd(sym) to access this field. *}
.
-. struct _bfd *the_bfd; {* Use bfd_asymbol_bfd(sym) to access this field. *}
-.
-. {* The text of the symbol. The name is left alone, and not copied; the
-. application may not alter it. *}
+. {* The text of the symbol. The name is left alone, and not copied; the
+. application may not alter it. *}
. const char *name;
.
-. {* The value of the symbol. This really should be a union of a
-. numeric value with a pointer, since some flags indicate that
-. a pointer to another symbol is stored here. *}
+. {* The value of the symbol. This really should be a union of a
+. numeric value with a pointer, since some flags indicate that
+. a pointer to another symbol is stored here. *}
. symvalue value;
.
-. {* Attributes of a symbol: *}
-.
+. {* Attributes of a symbol. *}
.#define BSF_NO_FLAGS 0x00
.
-. {* The symbol has local scope; <<static>> in <<C>>. The value
-. is the offset into the section of the data. *}
+. {* The symbol has local scope; <<static>> in <<C>>. The value
+. is the offset into the section of the data. *}
.#define BSF_LOCAL 0x01
.
-. {* The symbol has global scope; initialized data in <<C>>. The
-. value is the offset into the section of the data. *}
+. {* The symbol has global scope; initialized data in <<C>>. The
+. value is the offset into the section of the data. *}
.#define BSF_GLOBAL 0x02
.
-. {* The symbol has global scope and is exported. The value is
-. the offset into the section of the data. *}
-.#define BSF_EXPORT BSF_GLOBAL {* no real difference *}
+. {* The symbol has global scope and is exported. The value is
+. the offset into the section of the data. *}
+.#define BSF_EXPORT BSF_GLOBAL {* No real difference. *}
.
-. {* A normal C symbol would be one of:
-. <<BSF_LOCAL>>, <<BSF_FORT_COMM>>, <<BSF_UNDEFINED>> or
-. <<BSF_GLOBAL>> *}
+. {* A normal C symbol would be one of:
+. <<BSF_LOCAL>>, <<BSF_FORT_COMM>>, <<BSF_UNDEFINED>> or
+. <<BSF_GLOBAL>>. *}
.
-. {* The symbol is a debugging record. The value has an arbitary
-. meaning, unless BSF_DEBUGGING_RELOC is also set. *}
+. {* The symbol is a debugging record. The value has an arbitary
+. meaning, unless BSF_DEBUGGING_RELOC is also set. *}
.#define BSF_DEBUGGING 0x08
.
-. {* The symbol denotes a function entry point. Used in ELF,
-. perhaps others someday. *}
+. {* The symbol denotes a function entry point. Used in ELF,
+. perhaps others someday. *}
.#define BSF_FUNCTION 0x10
.
-. {* Used by the linker. *}
+. {* Used by the linker. *}
.#define BSF_KEEP 0x20
.#define BSF_KEEP_G 0x40
.
-. {* A weak global symbol, overridable without warnings by
-. a regular global symbol of the same name. *}
+. {* A weak global symbol, overridable without warnings by
+. a regular global symbol of the same name. *}
.#define BSF_WEAK 0x80
.
-. {* This symbol was created to point to a section, e.g. ELF's
-. STT_SECTION symbols. *}
+. {* This symbol was created to point to a section, e.g. ELF's
+. STT_SECTION symbols. *}
.#define BSF_SECTION_SYM 0x100
.
-. {* The symbol used to be a common symbol, but now it is
-. allocated. *}
+. {* The symbol used to be a common symbol, but now it is
+. allocated. *}
.#define BSF_OLD_COMMON 0x200
.
-. {* The default value for common data. *}
+. {* The default value for common data. *}
.#define BFD_FORT_COMM_DEFAULT_VALUE 0
.
-. {* In some files the type of a symbol sometimes alters its
-. location in an output file - ie in coff a <<ISFCN>> symbol
-. which is also <<C_EXT>> symbol appears where it was
-. declared and not at the end of a section. This bit is set
-. by the target BFD part to convey this information. *}
-.
+. {* In some files the type of a symbol sometimes alters its
+. location in an output file - ie in coff a <<ISFCN>> symbol
+. which is also <<C_EXT>> symbol appears where it was
+. declared and not at the end of a section. This bit is set
+. by the target BFD part to convey this information. *}
.#define BSF_NOT_AT_END 0x400
.
-. {* Signal that the symbol is the label of constructor section. *}
+. {* Signal that the symbol is the label of constructor section. *}
.#define BSF_CONSTRUCTOR 0x800
.
-. {* Signal that the symbol is a warning symbol. The name is a
-. warning. The name of the next symbol is the one to warn about;
-. if a reference is made to a symbol with the same name as the next
-. symbol, a warning is issued by the linker. *}
+. {* Signal that the symbol is a warning symbol. The name is a
+. warning. The name of the next symbol is the one to warn about;
+. if a reference is made to a symbol with the same name as the next
+. symbol, a warning is issued by the linker. *}
.#define BSF_WARNING 0x1000
.
-. {* Signal that the symbol is indirect. This symbol is an indirect
-. pointer to the symbol with the same name as the next symbol. *}
+. {* Signal that the symbol is indirect. This symbol is an indirect
+. pointer to the symbol with the same name as the next symbol. *}
.#define BSF_INDIRECT 0x2000
.
-. {* BSF_FILE marks symbols that contain a file name. This is used
-. for ELF STT_FILE symbols. *}
+. {* BSF_FILE marks symbols that contain a file name. This is used
+. for ELF STT_FILE symbols. *}
.#define BSF_FILE 0x4000
.
-. {* Symbol is from dynamic linking information. *}
+. {* Symbol is from dynamic linking information. *}
.#define BSF_DYNAMIC 0x8000
.
-. {* The symbol denotes a data object. Used in ELF, and perhaps
-. others someday. *}
+. {* The symbol denotes a data object. Used in ELF, and perhaps
+. others someday. *}
.#define BSF_OBJECT 0x10000
.
-. {* This symbol is a debugging symbol. The value is the offset
-. into the section of the data. BSF_DEBUGGING should be set
-. as well. *}
+. {* This symbol is a debugging symbol. The value is the offset
+. into the section of the data. BSF_DEBUGGING should be set
+. as well. *}
.#define BSF_DEBUGGING_RELOC 0x20000
.
+. {* This symbol is thread local. Used in ELF. *}
+.#define BSF_THREAD_LOCAL 0x40000
+.
. flagword flags;
.
-. {* A pointer to the section to which this symbol is
-. relative. This will always be non NULL, there are special
-. sections for undefined and absolute symbols. *}
+. {* A pointer to the section to which this symbol is
+. relative. This will always be non NULL, there are special
+. sections for undefined and absolute symbols. *}
. struct sec *section;
.
-. {* Back end special data. *}
+. {* Back end special data. *}
. union
. {
. PTR p;
. bfd_vma i;
-. } udata;
+. }
+. udata;
+.}
+.asymbol;
.
-.} asymbol;
*/
#include "bfd.h"
#include "aout/stab_gnu.h"
static char coff_section_type PARAMS ((const char *));
+static char decode_section_type PARAMS ((const struct sec *));
static int cmpindexentry PARAMS ((const PTR, const PTR));
/*
.#define bfd_get_symtab_upper_bound(abfd) \
. BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
-
+.
*/
/*
bfd_is_local_label
SYNOPSIS
- boolean bfd_is_local_label(bfd *abfd, asymbol *sym);
+ bfd_boolean bfd_is_local_label (bfd *abfd, asymbol *sym);
DESCRIPTION
- Return true if the given symbol @var{sym} in the BFD @var{abfd} is
- a compiler generated local label, else return false.
+ Return TRUE if the given symbol @var{sym} in the BFD @var{abfd} is
+ a compiler generated local label, else return FALSE.
*/
-boolean
+bfd_boolean
bfd_is_local_label (abfd, sym)
bfd *abfd;
asymbol *sym;
starts with '.' is local. This would accidentally catch section names
if we didn't reject them here. */
if ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_SECTION_SYM)) != 0)
- return false;
+ return FALSE;
if (sym->name == NULL)
- return false;
+ return FALSE;
return bfd_is_local_label_name (abfd, sym->name);
}
bfd_is_local_label_name
SYNOPSIS
- boolean bfd_is_local_label_name(bfd *abfd, const char *name);
+ bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name);
DESCRIPTION
- Return true if a symbol with the name @var{name} in the BFD
+ Return TRUE if a symbol with the name @var{name} in the BFD
@var{abfd} is a compiler generated local label, else return
- false. This just checks whether the name has the form of a
+ FALSE. This just checks whether the name has the form of a
local label.
.#define bfd_is_local_label_name(abfd, name) \
. BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
+.
*/
/*
.#define bfd_canonicalize_symtab(abfd, location) \
. BFD_SEND (abfd, _bfd_canonicalize_symtab,\
. (abfd, location))
-
+.
*/
/*
bfd_set_symtab
SYNOPSIS
- boolean bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int count);
+ bfd_boolean bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int count);
DESCRIPTION
Arrange that when the output BFD @var{abfd} is closed,
will be written.
*/
-boolean
+bfd_boolean
bfd_set_symtab (abfd, location, symcount)
bfd *abfd;
asymbol **location;
if ((abfd->format != bfd_object) || (bfd_read_p (abfd)))
{
bfd_set_error (bfd_error_invalid_operation);
- return false;
+ return FALSE;
}
bfd_get_outsymbols (abfd) = location;
bfd_get_symcount (abfd) = symcount;
- return true;
+ return TRUE;
}
/*
bfd_print_symbol_vandf
SYNOPSIS
- void bfd_print_symbol_vandf(bfd *abfd, PTR file, asymbol *symbol);
+ void bfd_print_symbol_vandf (bfd *abfd, PTR file, asymbol *symbol);
DESCRIPTION
Print the value and flags of the @var{symbol} supplied to the
asymbol *symbol;
{
FILE *file = (FILE *) arg;
+
flagword type = symbol->flags;
+
if (symbol->section != (asection *) NULL)
- {
- bfd_fprintf_vma (abfd, file,
- symbol->value + symbol->section->vma);
- }
+ bfd_fprintf_vma (abfd, file,
+ symbol->value + symbol->section->vma);
else
- {
- bfd_fprintf_vma (abfd, file, symbol->value);
- }
+ bfd_fprintf_vma (abfd, file, symbol->value);
/* This presumes that a symbol can not be both BSF_DEBUGGING and
BSF_DYNAMIC, nor more than one of BSF_FUNCTION, BSF_FILE, and
.#define bfd_make_empty_symbol(abfd) \
. BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
+.
+*/
+
+/*
+FUNCTION
+ _bfd_generic_make_empty_symbol
+
+SYNOPSIS
+ asymbol * _bfd_generic_make_empty_symbol (bfd *);
+
+DESCRIPTION
+ Create a new <<asymbol>> structure for the BFD @var{abfd}
+ and return a pointer to it. Used by core file routines,
+ binary back-end and anywhere else where no private info
+ is needed.
*/
+asymbol *
+_bfd_generic_make_empty_symbol (abfd)
+ bfd *abfd;
+{
+ bfd_size_type amt = sizeof (asymbol);
+ asymbol *new = (asymbol *) bfd_zalloc (abfd, amt);
+ if (new)
+ new->the_bfd = abfd;
+ return new;
+}
+
/*
FUNCTION
bfd_make_debug_symbol
.#define bfd_make_debug_symbol(abfd,ptr,size) \
. BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
+.
*/
struct section_to_type
adding entries. Since it is so short, a linear search is used. */
static const struct section_to_type stt[] =
{
- {"*DEBUG*", 'N'},
{".bss", 'b'},
- {"zerovars", 'b'}, /* MRI .bss */
+ {"code", 't'}, /* MRI .text */
{".data", 'd'},
- {"vars", 'd'}, /* MRI .data */
+ {"*DEBUG*", 'N'},
+ {".debug", 'N'}, /* MSVC's .debug (non-standard debug syms) */
+ {".drectve", 'i'}, /* MSVC's .drective section */
+ {".edata", 'e'}, /* MSVC's .edata (export) section */
+ {".fini", 't'}, /* ELF fini section */
+ {".idata", 'i'}, /* MSVC's .idata (import) section */
+ {".init", 't'}, /* ELF init section */
+ {".pdata", 'p'}, /* MSVC's .pdata (stack unwind) section */
{".rdata", 'r'}, /* Read only data. */
{".rodata", 'r'}, /* Read only data. */
{".sbss", 's'}, /* Small BSS (uninitialized data). */
{".scommon", 'c'}, /* Small common. */
{".sdata", 'g'}, /* Small initialized data. */
{".text", 't'},
- {"code", 't'}, /* MRI .text */
- {".drectve", 'i'}, /* MSVC's .drective section */
- {".idata", 'i'}, /* MSVC's .idata (import) section */
- {".edata", 'e'}, /* MSVC's .edata (export) section */
- {".pdata", 'p'}, /* MSVC's .pdata (stack unwind) section */
- {".debug", 'N'}, /* MSVC's .debug (non-standard debug syms) */
+ {"vars", 'd'}, /* MRI .data */
+ {"zerovars", 'b'}, /* MRI .bss */
{0, 0}
};
return '?';
}
+/* Return the single-character symbol type corresponding to section
+ SECTION, or '?' for an unknown section. This uses section flags to
+ identify sections.
+
+ FIXME These types are unhandled: c, i, e, p. If we handled these also,
+ we could perhaps obsolete coff_section_type. */
+
+static char
+decode_section_type (section)
+ const struct sec *section;
+{
+ if (section->flags & SEC_CODE)
+ return 't';
+ if (section->flags & SEC_DATA)
+ {
+ if (section->flags & SEC_READONLY)
+ return 'r';
+ else if (section->flags & SEC_SMALL_DATA)
+ return 'g';
+ else
+ return 'd';
+ }
+ if ((section->flags & SEC_HAS_CONTENTS) == 0)
+ {
+ if (section->flags & SEC_SMALL_DATA)
+ return 's';
+ else
+ return 'b';
+ }
+ if (section->flags & SEC_DEBUGGING)
+ return 'N';
+
+ return '?';
+}
+
/*
FUNCTION
bfd_decode_symclass
class of @var{symbol}, or '?' for an unknown class.
SYNOPSIS
- int bfd_decode_symclass(asymbol *symbol);
+ int bfd_decode_symclass (asymbol *symbol);
*/
int
bfd_decode_symclass (symbol)
if (bfd_is_abs_section (symbol->section))
c = 'a';
else if (symbol->section)
- c = coff_section_type (symbol->section->name);
+ {
+ c = coff_section_type (symbol->section->name);
+ if (c == '?')
+ c = decode_section_type (symbol->section);
+ }
else
return '?';
if (symbol->flags & BSF_GLOBAL)
Returns zero otherwise.
SYNOPSIS
- boolean bfd_is_undefined_symclass (int symclass);
+ bfd_boolean bfd_is_undefined_symclass (int symclass);
*/
-boolean
+bfd_boolean
bfd_is_undefined_symclass (symclass)
int symclass;
{
calling this function.
SYNOPSIS
- void bfd_symbol_info(asymbol *symbol, symbol_info *ret);
+ void bfd_symbol_info (asymbol *symbol, symbol_info *ret);
*/
void
bfd_copy_private_symbol_data
SYNOPSIS
- boolean bfd_copy_private_symbol_data(bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
+ bfd_boolean bfd_copy_private_symbol_data (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
DESCRIPTION
Copy private symbol information from @var{isym} in the BFD
@var{ibfd} to the symbol @var{osym} in the BFD @var{obfd}.
- Return <<true>> on success, <<false>> on error. Possible error
+ Return <<TRUE>> on success, <<FALSE>> on error. Possible error
returns are:
o <<bfd_error_no_memory>> -
.#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
. BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
. (ibfd, isymbol, obfd, osymbol))
-
+.
*/
/* The generic version of the function which returns mini symbols.
long
_bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
PTR *minisymsp;
unsigned int *sizep;
{
return symcount;
error_return:
+ bfd_set_error (bfd_error_no_symbols);
if (syms != NULL)
free (syms);
return -1;
an asymbol. We don't worry about the sym argument we are passed;
we just return the asymbol the minisymbol points to. */
-/*ARGSUSED*/
asymbol *
_bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym)
bfd *abfd ATTRIBUTE_UNUSED;
- boolean dynamic ATTRIBUTE_UNUSED;
+ bfd_boolean dynamic ATTRIBUTE_UNUSED;
const PTR minisym;
asymbol *sym ATTRIBUTE_UNUSED;
{
/* Look through stabs debugging information in .stab and .stabstr
sections to find the source file and line closest to a desired
location. This is used by COFF and ELF targets. It sets *pfound
- to true if it finds some information. The *pinfo field is used to
+ to TRUE if it finds some information. The *pinfo field is used to
pass cached information in and out of this routine; this first time
the routine is called for a BFD, *pinfo should be NULL. The value
placed in *pinfo should be saved with the BFD, and passed back each
char *filename;
};
-boolean
+bfd_boolean
_bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
pfilename, pfnname, pline, pinfo)
bfd *abfd;
asymbol **symbols;
asection *section;
bfd_vma offset;
- boolean *pfound;
+ bfd_boolean *pfound;
const char **pfilename;
const char **pfnname;
unsigned int *pline;
char *file_name;
char *directory_name;
int saw_fun;
+ bfd_boolean saw_line, saw_func;
- *pfound = false;
+ *pfound = FALSE;
*pfilename = bfd_get_filename (abfd);
*pfnname = NULL;
*pline = 0;
if (info->stabsec == NULL || info->strsec == NULL)
{
/* No stabs debugging information. */
- return true;
+ return TRUE;
}
stabsize = info->stabsec->_raw_size;
info = (struct stab_find_info *) bfd_zalloc (abfd, amt);
if (info == NULL)
- return false;
+ return FALSE;
/* FIXME: When using the linker --split-by-file or
--split-by-reloc options, it is possible for the .stab and
/* No stabs debugging information. Set *pinfo so that we
can return quickly in the info != NULL case above. */
*pinfo = (PTR) info;
- return true;
+ return TRUE;
}
stabsize = info->stabsec->_raw_size;
info->stabs = (bfd_byte *) bfd_alloc (abfd, stabsize);
info->strs = (bfd_byte *) bfd_alloc (abfd, strsize);
if (info->stabs == NULL || info->strs == NULL)
- return false;
+ return FALSE;
if (! bfd_get_section_contents (abfd, info->stabsec, info->stabs,
(bfd_vma) 0, stabsize)
|| ! bfd_get_section_contents (abfd, info->strsec, info->strs,
(bfd_vma) 0, strsize))
- return false;
+ return FALSE;
/* If this is a relocateable object file, we have to relocate
the entries in .stab. This should always be simple 32 bit
this should be no big deal. */
reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec);
if (reloc_size < 0)
- return false;
+ return FALSE;
reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
if (reloc_vector == NULL && reloc_size != 0)
- return false;
+ return FALSE;
reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector,
symbols);
if (reloc_count < 0)
{
if (reloc_vector != NULL)
free (reloc_vector);
- return false;
+ return FALSE;
}
if (reloc_count > 0)
{
bfd_set_error (bfd_error_invalid_operation);
if (reloc_vector != NULL)
free (reloc_vector);
- return false;
+ return FALSE;
}
val = bfd_get_32 (abfd, info->stabs + r->address);
saw_fun = 1;
for (stab = info->stabs; stab < info->stabs + stabsize; stab += STABSIZE)
{
- if (stab[TYPEOFF] == N_SO)
+ if (stab[TYPEOFF] == (bfd_byte) N_SO)
{
/* N_SO with null name indicates EOF */
if (bfd_get_32 (abfd, stab + STRDXOFF) == 0)
/* two N_SO's in a row is a filename and directory. Skip */
if (stab + STABSIZE < info->stabs + stabsize
- && *(stab + STABSIZE + TYPEOFF) == N_SO)
+ && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO)
{
stab += STABSIZE;
}
}
- else if (stab[TYPEOFF] == N_FUN)
+ else if (stab[TYPEOFF] == (bfd_byte) N_FUN)
{
saw_fun = 1;
++info->indextablesize;
++info->indextablesize;
if (info->indextablesize == 0)
- return true;
+ return TRUE;
++info->indextablesize;
amt = info->indextablesize;
amt *= sizeof (struct indexentry);
info->indextable = (struct indexentry *) bfd_alloc (abfd, amt);
if (info->indextable == NULL)
- return false;
+ return FALSE;
file_name = NULL;
directory_name = NULL;
{
last_stab = stab;
if (stab + STABSIZE >= info->stabs + stabsize
- || *(stab + STABSIZE + TYPEOFF) != N_SO)
+ || *(stab + STABSIZE + TYPEOFF) != (bfd_byte) N_SO)
{
directory_name = NULL;
}
else
#endif
{
- /* Cache non-existant or invalid. Do binary search on
- indextable. */
-
long low, high;
long mid = -1;
+ /* Cache non-existant or invalid. Do binary search on
+ indextable. */
indexentry = NULL;
low = 0;
}
if (indexentry == NULL)
- return true;
+ return TRUE;
stab = indexentry->stab + STABSIZE;
file_name = indexentry->file_name;
directory_name = indexentry->directory_name;
str = indexentry->str;
+ saw_line = FALSE;
+ saw_func = FALSE;
for (; stab < (indexentry+1)->stab; stab += STABSIZE)
{
- boolean done;
+ bfd_boolean done;
bfd_vma val;
- done = false;
+ done = FALSE;
switch (stab[TYPEOFF])
{
case N_SLINE:
case N_DSLINE:
case N_BSLINE:
- /* A line number. The value is relative to the start of the
- current function. */
- val = indexentry->val + bfd_get_32 (abfd, stab + VALOFF);
- if (val <= offset)
+ /* A line number. If the function was specified, then the value
+ is relative to the start of the function. Otherwise, the
+ value is an absolute address. */
+ val = ((indexentry->function_name ? indexentry->val : 0)
+ + bfd_get_32 (abfd, stab + VALOFF));
+ /* If this line starts before our desired offset, or if it's
+ the first line we've been able to find, use it. The
+ !saw_line check works around a bug in GCC 2.95.3, which emits
+ the first N_SLINE late. */
+ if (!saw_line || val <= offset)
{
*pline = bfd_get_16 (abfd, stab + DESCOFF);
#endif
}
if (val > offset)
- done = true;
+ done = TRUE;
+ saw_line = TRUE;
break;
case N_FUN:
case N_SO:
- done = true;
+ if (saw_func || saw_line)
+ done = TRUE;
+ saw_func = TRUE;
break;
}
break;
}
- *pfound = true;
+ *pfound = TRUE;
- if (IS_ABSOLUTE_PATH(file_name) || directory_name == NULL)
+ if (file_name == NULL || IS_ABSOLUTE_PATH (file_name)
+ || directory_name == NULL)
*pfilename = file_name;
else
{
|| strncmp (info->filename, directory_name, dirlen) != 0
|| strcmp (info->filename + dirlen, file_name) != 0)
{
+ size_t len;
+
if (info->filename != NULL)
free (info->filename);
- info->filename = (char *) bfd_malloc ((bfd_size_type) dirlen
- + strlen (file_name) + 1);
+ len = strlen (file_name) + 1;
+ info->filename = (char *) bfd_malloc ((bfd_size_type) dirlen + len);
if (info->filename == NULL)
- return false;
- strcpy (info->filename, directory_name);
- strcpy (info->filename + dirlen, file_name);
+ return FALSE;
+ memcpy (info->filename, directory_name, dirlen);
+ memcpy (info->filename + dirlen, file_name, len);
}
*pfilename = info->filename;
/* This will typically be something like main:F(0,1), so we want
to clobber the colon. It's OK to change the name, since the
string is in our own local storage anyhow. */
-
s = strchr (indexentry->function_name, ':');
if (s != NULL)
*s = '\0';
*pfnname = indexentry->function_name;
}
- return true;
+ return TRUE;
}
projects / deliverable / binutils-gdb.git / blobdiff