1999-05-03 09:29:11 +02:00
|
|
|
/* DWARF 2 support.
|
2018-01-03 06:17:27 +01:00
|
|
|
Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
Adapted from gdb/dwarf2read.c by Gavin Koch of Cygnus Solutions
|
|
|
|
(gavin@cygnus.com).
|
|
|
|
|
|
|
|
From the dwarf2read.c header:
|
|
|
|
Adapted by Gary Funck (gary@intrepid.com), Intrepid Technology,
|
|
|
|
Inc. with support from Florida State University (under contract
|
|
|
|
with the Ada Joint Program Office), and Silicon Graphics, Inc.
|
|
|
|
Initial contribution by Brent Benson, Harris Computer Systems, Inc.,
|
|
|
|
based on Fred Fish's (Cygnus Support) implementation of DWARF 1
|
|
|
|
support in dwarfread.c
|
|
|
|
|
2002-09-23 18:13:52 +02:00
|
|
|
This file is part of BFD.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-09-23 18:13:52 +02:00
|
|
|
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
|
2007-07-03 16:26:43 +02:00
|
|
|
the Free Software Foundation; either version 3 of the License, or (at
|
2002-09-23 18:13:52 +02:00
|
|
|
your option) any later version.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-09-23 18:13:52 +02:00
|
|
|
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.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-09-23 18:13:52 +02:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
2007-07-03 16:26:43 +02:00
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
MA 02110-1301, USA. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
#include "sysdep.h"
|
2007-04-26 16:47:00 +02:00
|
|
|
#include "bfd.h"
|
1999-05-03 09:29:11 +02:00
|
|
|
#include "libiberty.h"
|
|
|
|
#include "libbfd.h"
|
|
|
|
#include "elf-bfd.h"
|
2009-07-10 17:27:04 +02:00
|
|
|
#include "dwarf2.h"
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* The data in the .debug_line statement prologue looks like this. */
|
2000-09-02 22:21:40 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
struct line_head
|
2000-09-02 22:21:40 +02:00
|
|
|
{
|
2001-11-14 12:16:47 +01:00
|
|
|
bfd_vma total_length;
|
2000-09-02 22:21:40 +02:00
|
|
|
unsigned short version;
|
2002-05-04 14:01:02 +02:00
|
|
|
bfd_vma prologue_length;
|
2000-09-02 22:21:40 +02:00
|
|
|
unsigned char minimum_instruction_length;
|
2010-04-05 21:30:00 +02:00
|
|
|
unsigned char maximum_ops_per_insn;
|
2000-09-02 22:21:40 +02:00
|
|
|
unsigned char default_is_stmt;
|
|
|
|
int line_base;
|
|
|
|
unsigned char line_range;
|
|
|
|
unsigned char opcode_base;
|
|
|
|
unsigned char *standard_opcode_lengths;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Attributes have a name and a value. */
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
struct attribute
|
2000-09-02 22:21:40 +02:00
|
|
|
{
|
|
|
|
enum dwarf_attribute name;
|
|
|
|
enum dwarf_form form;
|
|
|
|
union
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2000-09-02 22:21:40 +02:00
|
|
|
char *str;
|
|
|
|
struct dwarf_block *blk;
|
* bfd-in.h (bfd_int64_t, bfd_uint64_t): New types.
(BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Don't define here.
(bfd_getb64, bfd_getl64, bfd_get_bits): Return bfd_uint64_t.
(bfd_getb_signed_64, bfd_getl_signed_64): Return bfd_int64_t.
(bfd_putb64, bfd_putl64, bfd_put_bits): Accept bfd_uint64_t.
* configure.in (HOST_U_64BIT_TYPE): Set when sizeof long is 8.
(BFD_HOST_64_BIT_DEFINED, BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Set
when using long.
* libbfd.c (EIGHT_GAZILLION, COERCE64): Use bfd_int64_t.
(bfd_getb64): Return bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_getl64, bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
(bfd_putb64): Accept bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_putl64, bfd_put_bits, bfd_get_bits): Likewise.
* dwarf2.c (struct attribute): Use bfd_int64_t and bfd_uint64_t.
(read_8_bytes, read_indirect_string, read_address): Likewise.
(read_abbrevs, parse_comp_unit): Likewise.
* targets.c (struct bfd_target): Likewise.
* aix386-core.c (NO_GET64, NO_PUT64, NO_GETS64): Define and use.
* hppabsd-core.c: Likewise. Formatting.
* hpux-core.c: Likewise.
* irix-core.c: Likewise.
* netbsd-core.c: Likewise.
* osf-core.c: Likewise.
* ptrace-core.c: Likewise.
* sco5-core.c: Likewise.
* trad-core.c: Likewise.
* configure: Regenerate.
* bfd-in2.h: Regenerate.
2004-03-15 15:21:43 +01:00
|
|
|
bfd_uint64_t val;
|
|
|
|
bfd_int64_t sval;
|
2000-09-02 22:21:40 +02:00
|
|
|
}
|
|
|
|
u;
|
|
|
|
};
|
|
|
|
|
2000-11-16 20:29:48 +01:00
|
|
|
/* Blocks are a bunch of untyped bytes. */
|
1999-05-03 09:29:11 +02:00
|
|
|
struct dwarf_block
|
2000-09-02 22:21:40 +02:00
|
|
|
{
|
|
|
|
unsigned int size;
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *data;
|
2000-09-02 22:21:40 +02:00
|
|
|
};
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
struct adjusted_section
|
2006-03-06 02:36:52 +01:00
|
|
|
{
|
|
|
|
asection *section;
|
|
|
|
bfd_vma adj_vma;
|
|
|
|
};
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
struct dwarf2_debug
|
|
|
|
{
|
|
|
|
/* A list of all previously read comp_units. */
|
2005-02-20 15:59:07 +01:00
|
|
|
struct comp_unit *all_comp_units;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
/* Last comp unit in list above. */
|
|
|
|
struct comp_unit *last_comp_unit;
|
|
|
|
|
2011-09-30 12:39:45 +02:00
|
|
|
/* Names of the debug sections. */
|
|
|
|
const struct dwarf_debug_section *debug_sections;
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
/* The next unread compilation unit within the .debug_info section.
|
|
|
|
Zero indicates that the .debug_info section has not been loaded
|
2000-09-02 22:21:40 +02:00
|
|
|
into a buffer yet. */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *info_ptr;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Pointer to the end of the .debug_info section memory buffer. */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *info_ptr_end;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd/dwarf: Improve use of previously loaded dwarf information
When parsing DWARF data in order to report file/line type error messages
we perform section placement to make section addresses unique within
relocatable object files.
Currently, if we reuse previously loaded (and cached) dwarf data then we
neglect to perform section placement, the result is that the section
addresses will not be unique, and we might, incorrectly associate an
address with the wrong debug information, and so report an incorrect
file and line number.
Further we neglect to check that that bfd for which we are looking up
debug information is actually the bfd for which the previous debug
information was loaded, it is possible that we will reuse previously
loaded debug information for a different bfd.
And finally, due to following of gnu_debuglink links in one bfd to
another, the process of checking that the cached debug information is
valid requires us to track the original bfd in the cached debug
information. The original debug information here is either the bfd that
we're interested in, not the bfd we finally load the debug information
from.
bfd/ChangeLog:
* dwarf2.c (struct dwarf2_debug): Add orig_bfd member.
(_bfd_dwarf2_slurp_debug_info): If stashed debug information does
not match current bfd, then reload debug information. Record bfd
we're loading debug info for in the stash. If we have debug
informatin in the cache then perform section placement before
returning.
ld/ChangeLog:
* testsuite/ld-elf/dwarf.exp (build_tests): Add new tests.
* testsuite/ld-elf/dwarf2.err: New file.
* testsuite/ld-elf/dwarf2a.c: New file.
* testsuite/ld-elf/dwarf2b.c: New file.
* testsuite/ld-elf/dwarf3.c: New file.
* testsuite/ld-elf/dwarf3.err: New file.
2016-12-15 16:22:49 +01:00
|
|
|
/* Pointer to the original bfd for which debug was loaded. This is what
|
|
|
|
we use to compare and so check that the cached debug data is still
|
|
|
|
valid - it saves having to possibly dereference the gnu_debuglink each
|
|
|
|
time. */
|
|
|
|
bfd *orig_bfd;
|
|
|
|
|
2007-06-22 10:13:12 +02:00
|
|
|
/* Pointer to the bfd, section and address of the beginning of the
|
|
|
|
section. The bfd might be different than expected because of
|
|
|
|
gnu_debuglink sections. */
|
2009-09-09 23:38:59 +02:00
|
|
|
bfd *bfd_ptr;
|
2005-02-20 15:59:07 +01:00
|
|
|
asection *sec;
|
|
|
|
bfd_byte *sec_info_ptr;
|
2001-08-08 13:17:34 +02:00
|
|
|
|
2013-05-29 16:58:35 +02:00
|
|
|
/* Support for alternate debug info sections created by the DWZ utility:
|
|
|
|
This includes a pointer to an alternate bfd which contains *extra*,
|
|
|
|
possibly duplicate debug sections, and pointers to the loaded
|
|
|
|
.debug_str and .debug_info sections from this bfd. */
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd * alt_bfd_ptr;
|
|
|
|
bfd_byte * alt_dwarf_str_buffer;
|
|
|
|
bfd_size_type alt_dwarf_str_size;
|
|
|
|
bfd_byte * alt_dwarf_info_buffer;
|
|
|
|
bfd_size_type alt_dwarf_info_size;
|
2013-05-29 16:58:35 +02:00
|
|
|
|
2008-07-14 02:10:09 +02:00
|
|
|
/* A pointer to the memory block allocated for info_ptr. Neither
|
|
|
|
info_ptr nor sec_info_ptr are guaranteed to stay pointing to the
|
2017-09-26 14:17:24 +02:00
|
|
|
beginning of the malloc block. */
|
2008-07-14 02:10:09 +02:00
|
|
|
bfd_byte *info_ptr_memory;
|
|
|
|
|
2001-08-08 13:17:34 +02:00
|
|
|
/* Pointer to the symbol table. */
|
2005-02-20 15:59:07 +01:00
|
|
|
asymbol **syms;
|
2001-08-08 13:17:34 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Pointer to the .debug_abbrev section loaded into memory. */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *dwarf_abbrev_buffer;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Length of the loaded .debug_abbrev section. */
|
2008-07-11 11:18:19 +02:00
|
|
|
bfd_size_type dwarf_abbrev_size;
|
1999-06-26 17:48:47 +02:00
|
|
|
|
|
|
|
/* Buffer for decode_line_info. */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *dwarf_line_buffer;
|
2000-04-07 20:36:04 +02:00
|
|
|
|
|
|
|
/* Length of the loaded .debug_line section. */
|
2008-07-11 11:18:19 +02:00
|
|
|
bfd_size_type dwarf_line_size;
|
2001-11-14 12:16:47 +01:00
|
|
|
|
|
|
|
/* Pointer to the .debug_str section loaded into memory. */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *dwarf_str_buffer;
|
2001-11-14 12:16:47 +01:00
|
|
|
|
|
|
|
/* Length of the loaded .debug_str section. */
|
2008-07-11 11:18:19 +02:00
|
|
|
bfd_size_type dwarf_str_size;
|
2005-04-03 22:36:37 +02:00
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
/* Pointer to the .debug_line_str section loaded into memory. */
|
|
|
|
bfd_byte *dwarf_line_str_buffer;
|
|
|
|
|
|
|
|
/* Length of the loaded .debug_line_str section. */
|
|
|
|
bfd_size_type dwarf_line_str_size;
|
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Pointer to the .debug_ranges section loaded into memory. */
|
2005-04-03 22:36:37 +02:00
|
|
|
bfd_byte *dwarf_ranges_buffer;
|
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Length of the loaded .debug_ranges section. */
|
2008-07-11 11:18:19 +02:00
|
|
|
bfd_size_type dwarf_ranges_size;
|
2005-05-23 19:44:55 +02:00
|
|
|
|
|
|
|
/* If the most recent call to bfd_find_nearest_line was given an
|
|
|
|
address in an inlined function, preserve a pointer into the
|
|
|
|
calling chain for subsequent calls to bfd_find_inliner_info to
|
2016-11-08 13:01:58 +01:00
|
|
|
use. */
|
2005-05-23 19:44:55 +02:00
|
|
|
struct funcinfo *inliner_chain;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
PR ld/16787, stale dwarf2 stash
Throw away the dwarf2 stash if it becomes invalid due to section
VMAs changing. It would be nice to reclaim all the bfd_alloc
memory here when we throw away the stash, perhaps by putting
everything we alloc on a private dwarf2 objalloc, but I haven't done
that with this patch.
I've also fixed a problem with bfd_perform_relocation losing reloc
addends, which meant a second or subsequent look at debug info
sections did not properly relocate the sections. I can't see why
bfd_perform_relocation should need to change addends except for ld -r,
and the history (985fca12, e98e6ec1) doesn't help much.
Finally, the patch tweaks place_sections to avoid unnecessary work.
If we've mapped input to output sections, then input section VMA
isn't used so there's not much point in adjusting it. Incidentally,
this also means place_sections isn't effective in all cases.
PR ld/16787
* dwarf2.c (struct dwarf2_debug): Add sec_vma field.
(place_sections): Do not modify VMA of sections when called from
linker after sections have been placed in output sections. Short
circuit single section case.
(save_section_vma, section_vma_same): New functions.
(_bfd_dwarf2_slurp_debug_info): Throw away stash if section VMAs
change.
* reloc.c (bfd_perform_relocation): Do not modify reloc addend
when non-relocatable.
2014-04-23 06:56:19 +02:00
|
|
|
/* Section VMAs at the time the stash was built. */
|
|
|
|
bfd_vma *sec_vma;
|
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
/* Number of sections whose VMA we must adjust. */
|
2014-04-24 14:29:56 +02:00
|
|
|
int adjusted_section_count;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
/* Array of sections with adjusted VMA. */
|
|
|
|
struct adjusted_section *adjusted_sections;
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
|
|
|
|
/* Number of times find_line is called. This is used in
|
|
|
|
the heuristic for enabling the info hash tables. */
|
|
|
|
int info_hash_count;
|
|
|
|
|
|
|
|
#define STASH_INFO_HASH_TRIGGER 100
|
|
|
|
|
|
|
|
/* Hash table mapping symbol names to function infos. */
|
|
|
|
struct info_hash_table *funcinfo_hash_table;
|
|
|
|
|
|
|
|
/* Hash table mapping symbol names to variable infos. */
|
|
|
|
struct info_hash_table *varinfo_hash_table;
|
|
|
|
|
|
|
|
/* Head of comp_unit list in the last hash table update. */
|
|
|
|
struct comp_unit *hash_units_head;
|
|
|
|
|
|
|
|
/* Status of info hash. */
|
|
|
|
int info_hash_status;
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
#define STASH_INFO_HASH_OFF 0
|
|
|
|
#define STASH_INFO_HASH_ON 1
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
#define STASH_INFO_HASH_DISABLED 2
|
2012-08-01 03:29:12 +02:00
|
|
|
|
|
|
|
/* True if we opened bfd_ptr. */
|
|
|
|
bfd_boolean close_on_cleanup;
|
1999-05-03 09:29:11 +02:00
|
|
|
};
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
struct arange
|
|
|
|
{
|
1999-06-26 18:05:58 +02:00
|
|
|
struct arange *next;
|
|
|
|
bfd_vma low;
|
|
|
|
bfd_vma high;
|
|
|
|
};
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* A minimal decoding of DWARF2 compilation units. We only decode
|
2000-09-02 22:21:40 +02:00
|
|
|
what's needed to get to the line number information. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
struct comp_unit
|
|
|
|
{
|
|
|
|
/* Chain the previously read compilation units. */
|
2005-02-20 15:59:07 +01:00
|
|
|
struct comp_unit *next_unit;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
/* Likewise, chain the compilation unit read after this one.
|
|
|
|
The comp units are stored in reversed reading order. */
|
|
|
|
struct comp_unit *prev_unit;
|
|
|
|
|
2005-06-04 18:33:09 +02:00
|
|
|
/* Keep the bfd convenient (for memory allocation). */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd *abfd;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2008-02-12 01:26:00 +01:00
|
|
|
/* The lowest and highest addresses contained in this compilation
|
|
|
|
unit as specified in the compilation unit header. */
|
|
|
|
struct arange arange;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* The DW_AT_name attribute (for error messages). */
|
2005-02-20 15:59:07 +01:00
|
|
|
char *name;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* The abbrev hash table. */
|
2005-02-20 15:59:07 +01:00
|
|
|
struct abbrev_info **abbrevs;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2014-12-10 00:21:56 +01:00
|
|
|
/* DW_AT_language. */
|
|
|
|
int lang;
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Note that an error was found by comp_unit_find_nearest_line. */
|
1999-05-03 09:29:11 +02:00
|
|
|
int error;
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* The DW_AT_comp_dir attribute. */
|
2005-02-20 15:59:07 +01:00
|
|
|
char *comp_dir;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
/* TRUE if there is a line number table associated with this comp. unit. */
|
1999-05-03 09:29:11 +02:00
|
|
|
int stmtlist;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2005-01-17 18:12:00 +01:00
|
|
|
/* Pointer to the current comp_unit so that we can find a given entry
|
|
|
|
by its reference. */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *info_ptr_unit;
|
2005-01-17 18:12:00 +01:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* The offset into .debug_line of the line number table. */
|
1999-05-03 09:29:11 +02:00
|
|
|
unsigned long line_offset;
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Pointer to the first child die for the comp unit. */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *first_child_die_ptr;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* The end of the comp unit. */
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *end_ptr;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* The decoded line number, NULL if not yet decoded. */
|
2005-02-20 15:59:07 +01:00
|
|
|
struct line_info_table *line_table;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* A list of the functions found in this comp. unit. */
|
2005-02-20 15:59:07 +01:00
|
|
|
struct funcinfo *function_table;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* A table of function information references searchable by address. */
|
|
|
|
struct lookup_funcinfo *lookup_funcinfo_table;
|
|
|
|
|
|
|
|
/* Number of functions in the function_table and sorted_function_table. */
|
|
|
|
bfd_size_type number_of_functions;
|
|
|
|
|
2005-06-06 16:28:31 +02:00
|
|
|
/* A list of the variables found in this comp. unit. */
|
|
|
|
struct varinfo *variable_table;
|
|
|
|
|
2001-11-14 12:16:47 +01:00
|
|
|
/* Pointer to dwarf2_debug structure. */
|
|
|
|
struct dwarf2_debug *stash;
|
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
/* DWARF format version for this unit - from unit header. */
|
|
|
|
int version;
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Address size for this unit - from unit header. */
|
1999-05-03 09:29:11 +02:00
|
|
|
unsigned char addr_size;
|
2001-11-14 12:16:47 +01:00
|
|
|
|
|
|
|
/* Offset size for this unit - from unit header. */
|
|
|
|
unsigned char offset_size;
|
2005-04-03 22:36:37 +02:00
|
|
|
|
|
|
|
/* Base address for this unit - from DW_AT_low_pc attribute of
|
|
|
|
DW_TAG_compile_unit DIE */
|
|
|
|
bfd_vma base_address;
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
|
|
|
|
/* TRUE if symbols are cached in hash table for faster lookup by name. */
|
|
|
|
bfd_boolean cached;
|
1999-05-03 09:29:11 +02:00
|
|
|
};
|
|
|
|
|
2001-08-09 16:38:04 +02:00
|
|
|
/* This data structure holds the information of an abbrev. */
|
|
|
|
struct abbrev_info
|
|
|
|
{
|
|
|
|
unsigned int number; /* Number identifying abbrev. */
|
|
|
|
enum dwarf_tag tag; /* DWARF tag. */
|
|
|
|
int has_children; /* Boolean. */
|
|
|
|
unsigned int num_attrs; /* Number of attributes. */
|
|
|
|
struct attr_abbrev *attrs; /* An array of attribute descriptions. */
|
|
|
|
struct abbrev_info *next; /* Next in chain. */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct attr_abbrev
|
|
|
|
{
|
|
|
|
enum dwarf_attribute name;
|
|
|
|
enum dwarf_form form;
|
2017-07-04 10:09:27 +02:00
|
|
|
bfd_vma implicit_const;
|
2001-08-09 16:38:04 +02:00
|
|
|
};
|
|
|
|
|
2010-10-29 14:10:39 +02:00
|
|
|
/* Map of uncompressed DWARF debug section name to compressed one. It
|
|
|
|
is terminated by NULL uncompressed_name. */
|
|
|
|
|
2011-04-28 14:50:32 +02:00
|
|
|
const struct dwarf_debug_section dwarf_debug_sections[] =
|
2010-10-29 14:10:39 +02:00
|
|
|
{
|
|
|
|
{ ".debug_abbrev", ".zdebug_abbrev" },
|
|
|
|
{ ".debug_aranges", ".zdebug_aranges" },
|
|
|
|
{ ".debug_frame", ".zdebug_frame" },
|
|
|
|
{ ".debug_info", ".zdebug_info" },
|
2013-05-29 16:58:35 +02:00
|
|
|
{ ".debug_info", ".zdebug_info" },
|
2010-10-29 14:10:39 +02:00
|
|
|
{ ".debug_line", ".zdebug_line" },
|
|
|
|
{ ".debug_loc", ".zdebug_loc" },
|
|
|
|
{ ".debug_macinfo", ".zdebug_macinfo" },
|
2011-07-26 23:31:37 +02:00
|
|
|
{ ".debug_macro", ".zdebug_macro" },
|
2010-10-29 14:10:39 +02:00
|
|
|
{ ".debug_pubnames", ".zdebug_pubnames" },
|
|
|
|
{ ".debug_pubtypes", ".zdebug_pubtypes" },
|
|
|
|
{ ".debug_ranges", ".zdebug_ranges" },
|
|
|
|
{ ".debug_static_func", ".zdebug_static_func" },
|
|
|
|
{ ".debug_static_vars", ".zdebug_static_vars" },
|
|
|
|
{ ".debug_str", ".zdebug_str", },
|
2013-05-29 16:58:35 +02:00
|
|
|
{ ".debug_str", ".zdebug_str", },
|
2017-07-04 10:09:27 +02:00
|
|
|
{ ".debug_line_str", ".zdebug_line_str", },
|
2010-10-29 14:10:39 +02:00
|
|
|
{ ".debug_types", ".zdebug_types" },
|
|
|
|
/* GNU DWARF 1 extensions */
|
|
|
|
{ ".debug_sfnames", ".zdebug_sfnames" },
|
|
|
|
{ ".debug_srcinfo", ".zebug_srcinfo" },
|
|
|
|
/* SGI/MIPS DWARF 2 extensions */
|
|
|
|
{ ".debug_funcnames", ".zdebug_funcnames" },
|
|
|
|
{ ".debug_typenames", ".zdebug_typenames" },
|
|
|
|
{ ".debug_varnames", ".zdebug_varnames" },
|
|
|
|
{ ".debug_weaknames", ".zdebug_weaknames" },
|
|
|
|
{ NULL, NULL },
|
|
|
|
};
|
|
|
|
|
2013-05-29 16:58:35 +02:00
|
|
|
/* NB/ Numbers in this enum must match up with indicies
|
|
|
|
into the dwarf_debug_sections[] array above. */
|
2010-10-29 14:10:39 +02:00
|
|
|
enum dwarf_debug_section_enum
|
|
|
|
{
|
|
|
|
debug_abbrev = 0,
|
|
|
|
debug_aranges,
|
|
|
|
debug_frame,
|
|
|
|
debug_info,
|
2013-05-29 16:58:35 +02:00
|
|
|
debug_info_alt,
|
2010-10-29 14:10:39 +02:00
|
|
|
debug_line,
|
|
|
|
debug_loc,
|
|
|
|
debug_macinfo,
|
2011-07-26 23:31:37 +02:00
|
|
|
debug_macro,
|
2010-10-29 14:10:39 +02:00
|
|
|
debug_pubnames,
|
|
|
|
debug_pubtypes,
|
|
|
|
debug_ranges,
|
|
|
|
debug_static_func,
|
|
|
|
debug_static_vars,
|
|
|
|
debug_str,
|
2013-05-29 16:58:35 +02:00
|
|
|
debug_str_alt,
|
2017-07-04 10:09:27 +02:00
|
|
|
debug_line_str,
|
2010-10-29 14:10:39 +02:00
|
|
|
debug_types,
|
|
|
|
debug_sfnames,
|
|
|
|
debug_srcinfo,
|
|
|
|
debug_funcnames,
|
|
|
|
debug_typenames,
|
|
|
|
debug_varnames,
|
2017-07-04 10:09:27 +02:00
|
|
|
debug_weaknames,
|
|
|
|
debug_max
|
2010-10-29 14:10:39 +02:00
|
|
|
};
|
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
/* A static assertion. */
|
|
|
|
extern int dwarf_debug_section_assert[ARRAY_SIZE (dwarf_debug_sections)
|
|
|
|
== debug_max + 1 ? 1 : -1];
|
|
|
|
|
2001-08-09 16:38:04 +02:00
|
|
|
#ifndef ABBREV_HASH_SIZE
|
|
|
|
#define ABBREV_HASH_SIZE 121
|
|
|
|
#endif
|
|
|
|
#ifndef ATTR_ALLOC_CHUNK
|
|
|
|
#define ATTR_ALLOC_CHUNK 4
|
|
|
|
#endif
|
|
|
|
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
/* Variable and function hash tables. This is used to speed up look-up
|
|
|
|
in lookup_symbol_in_var_table() and lookup_symbol_in_function_table().
|
|
|
|
In order to share code between variable and function infos, we use
|
|
|
|
a list of untyped pointer for all variable/function info associated with
|
|
|
|
a symbol. We waste a bit of memory for list with one node but that
|
|
|
|
simplifies the code. */
|
|
|
|
|
|
|
|
struct info_list_node
|
|
|
|
{
|
|
|
|
struct info_list_node *next;
|
|
|
|
void *info;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Info hash entry. */
|
|
|
|
struct info_hash_entry
|
|
|
|
{
|
|
|
|
struct bfd_hash_entry root;
|
|
|
|
struct info_list_node *head;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct info_hash_table
|
|
|
|
{
|
|
|
|
struct bfd_hash_table base;
|
|
|
|
};
|
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Function to create a new entry in info hash table. */
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
|
|
|
|
static struct bfd_hash_entry *
|
|
|
|
info_hash_table_newfunc (struct bfd_hash_entry *entry,
|
|
|
|
struct bfd_hash_table *table,
|
|
|
|
const char *string)
|
|
|
|
{
|
|
|
|
struct info_hash_entry *ret = (struct info_hash_entry *) entry;
|
|
|
|
|
|
|
|
/* Allocate the structure if it has not already been allocated by a
|
|
|
|
derived class. */
|
|
|
|
if (ret == NULL)
|
|
|
|
{
|
2009-09-09 23:38:59 +02:00
|
|
|
ret = (struct info_hash_entry *) bfd_hash_allocate (table,
|
2014-04-24 14:29:56 +02:00
|
|
|
sizeof (* ret));
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
if (ret == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Call the allocation method of the base class. */
|
|
|
|
ret = ((struct info_hash_entry *)
|
2008-09-05 19:48:08 +02:00
|
|
|
bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
|
|
|
|
/* Initialize the local fields here. */
|
|
|
|
if (ret)
|
|
|
|
ret->head = NULL;
|
|
|
|
|
|
|
|
return (struct bfd_hash_entry *) ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Function to create a new info hash table. It returns a pointer to the
|
|
|
|
newly created table or NULL if there is any error. We need abfd
|
|
|
|
solely for memory allocation. */
|
|
|
|
|
|
|
|
static struct info_hash_table *
|
|
|
|
create_info_hash_table (bfd *abfd)
|
|
|
|
{
|
|
|
|
struct info_hash_table *hash_table;
|
|
|
|
|
2012-05-16 15:57:11 +02:00
|
|
|
hash_table = ((struct info_hash_table *)
|
|
|
|
bfd_alloc (abfd, sizeof (struct info_hash_table)));
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
if (!hash_table)
|
|
|
|
return hash_table;
|
|
|
|
|
|
|
|
if (!bfd_hash_table_init (&hash_table->base, info_hash_table_newfunc,
|
|
|
|
sizeof (struct info_hash_entry)))
|
|
|
|
{
|
|
|
|
bfd_release (abfd, hash_table);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return hash_table;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Insert an info entry into an info hash table. We do not check of
|
|
|
|
duplicate entries. Also, the caller need to guarantee that the
|
|
|
|
right type of info in inserted as info is passed as a void* pointer.
|
|
|
|
This function returns true if there is no error. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
insert_info_hash_table (struct info_hash_table *hash_table,
|
|
|
|
const char *key,
|
|
|
|
void *info,
|
|
|
|
bfd_boolean copy_p)
|
|
|
|
{
|
|
|
|
struct info_hash_entry *entry;
|
|
|
|
struct info_list_node *node;
|
|
|
|
|
|
|
|
entry = (struct info_hash_entry*) bfd_hash_lookup (&hash_table->base,
|
|
|
|
key, TRUE, copy_p);
|
|
|
|
if (!entry)
|
|
|
|
return FALSE;
|
|
|
|
|
2009-09-09 23:38:59 +02:00
|
|
|
node = (struct info_list_node *) bfd_hash_allocate (&hash_table->base,
|
2014-04-24 14:29:56 +02:00
|
|
|
sizeof (*node));
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
if (!node)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
node->info = info;
|
|
|
|
node->next = entry->head;
|
|
|
|
entry->head = node;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look up an info entry list from an info hash table. Return NULL
|
2016-11-08 13:01:58 +01:00
|
|
|
if there is none. */
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
|
|
|
|
static struct info_list_node *
|
|
|
|
lookup_info_hash_table (struct info_hash_table *hash_table, const char *key)
|
|
|
|
{
|
|
|
|
struct info_hash_entry *entry;
|
|
|
|
|
|
|
|
entry = (struct info_hash_entry*) bfd_hash_lookup (&hash_table->base, key,
|
|
|
|
FALSE, FALSE);
|
|
|
|
return entry ? entry->head : NULL;
|
|
|
|
}
|
|
|
|
|
2008-07-10 03:32:23 +02:00
|
|
|
/* Read a section into its appropriate place in the dwarf2_debug
|
2008-11-18 15:05:00 +01:00
|
|
|
struct (indicated by SECTION_BUFFER and SECTION_SIZE). If SYMS is
|
2008-07-10 03:32:23 +02:00
|
|
|
not NULL, use bfd_simple_get_relocated_section_contents to read the
|
2008-11-18 15:05:00 +01:00
|
|
|
section contents, otherwise use bfd_get_section_contents. Fail if
|
|
|
|
the located section does not contain at least OFFSET bytes. */
|
2008-07-10 03:32:23 +02:00
|
|
|
|
|
|
|
static bfd_boolean
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
read_section (bfd * abfd,
|
2011-09-30 12:39:45 +02:00
|
|
|
const struct dwarf_debug_section *sec,
|
2008-11-18 15:05:00 +01:00
|
|
|
asymbol ** syms,
|
|
|
|
bfd_uint64_t offset,
|
|
|
|
bfd_byte ** section_buffer,
|
|
|
|
bfd_size_type * section_size)
|
2008-07-10 03:32:23 +02:00
|
|
|
{
|
|
|
|
asection *msec;
|
2011-09-30 12:39:45 +02:00
|
|
|
const char *section_name = sec->uncompressed_name;
|
2017-10-01 03:37:59 +02:00
|
|
|
bfd_byte *contents = *section_buffer;
|
2008-07-10 03:32:23 +02:00
|
|
|
|
2013-05-29 16:58:35 +02:00
|
|
|
/* The section may have already been read. */
|
2017-10-01 03:37:59 +02:00
|
|
|
if (contents == NULL)
|
2008-07-10 03:32:23 +02:00
|
|
|
{
|
2009-03-12 11:57:18 +01:00
|
|
|
msec = bfd_get_section_by_name (abfd, section_name);
|
2010-10-29 14:10:39 +02:00
|
|
|
if (! msec)
|
2009-03-12 11:57:18 +01:00
|
|
|
{
|
2011-09-30 12:39:45 +02:00
|
|
|
section_name = sec->compressed_name;
|
2014-04-24 14:29:56 +02:00
|
|
|
if (section_name != NULL)
|
|
|
|
msec = bfd_get_section_by_name (abfd, section_name);
|
2009-03-12 11:57:18 +01:00
|
|
|
}
|
|
|
|
if (! msec)
|
2008-09-05 19:48:08 +02:00
|
|
|
{
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
_bfd_error_handler (_("DWARF error: can't find %s section."),
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
sec->uncompressed_name);
|
2008-09-05 19:48:08 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2009-03-12 11:57:18 +01:00
|
|
|
|
2009-03-16 13:41:26 +01:00
|
|
|
*section_size = msec->rawsize ? msec->rawsize : msec->size;
|
2017-10-01 03:37:59 +02:00
|
|
|
/* Paranoia - alloc one extra so that we can make sure a string
|
|
|
|
section is NUL terminated. */
|
|
|
|
contents = (bfd_byte *) bfd_malloc (*section_size + 1);
|
|
|
|
if (contents == NULL)
|
|
|
|
return FALSE;
|
|
|
|
if (syms
|
|
|
|
? !bfd_simple_get_relocated_section_contents (abfd, msec, contents,
|
|
|
|
syms)
|
|
|
|
: !bfd_get_section_contents (abfd, msec, contents, 0, *section_size))
|
2010-07-15 00:18:07 +02:00
|
|
|
{
|
2017-10-01 03:37:59 +02:00
|
|
|
free (contents);
|
|
|
|
return FALSE;
|
2017-08-31 18:03:23 +02:00
|
|
|
}
|
2017-10-01 03:37:59 +02:00
|
|
|
contents[*section_size] = 0;
|
|
|
|
*section_buffer = contents;
|
2008-07-10 03:32:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* It is possible to get a bad value for the offset into the section
|
2008-11-18 15:05:00 +01:00
|
|
|
that the client wants. Validate it here to avoid trouble later. */
|
2008-07-10 03:32:23 +02:00
|
|
|
if (offset != 0 && offset >= *section_size)
|
|
|
|
{
|
2016-10-19 15:04:34 +02:00
|
|
|
/* xgettext: c-format */
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
_bfd_error_handler (_("DWARF error: offset (%" PRIu64 ")"
|
|
|
|
" greater than or equal to %s size (%" PRIu64 ")"),
|
2018-02-19 09:18:15 +01:00
|
|
|
(uint64_t) offset, section_name,
|
%L conversions
* bfd-in.h: Include inttypes.h or if not available define
PRId64, PRIu64 and PRIx64.
* bfd.c (_bfd_doprnt, _bfd_doprnt_scan): Remove support for L
modifier to print bfd_vma.
* coff-arm.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic80.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * dwarf2.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-bfin.c, * elf32-cris.c, * elf32-hppa.c,
* elf32-i386.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32r.c,
* elf32-m68k.c, * elf32-metag.c, * elf32-nds32.c, * elf32-nios2.c,
* elf32-ppc.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-sh64.c, * elf32-spu.c,
* elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c,
* elf32-xtensa.c, * elf64-alpha.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mmix.c, * elf64-s390.c, * elf64-sh64.c, * elf64-x86-64.c,
* elfcode.h, * elfcore.h, * elflink.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * ieee.c, * ihex.c, * mach-o.c, * merge.c, * mmo.c,
* peXXigen.c, * xcofflink.c: Replace use of Lx modifier with PRIx64,
and cast input to uint64_t, and similarly for Ld and Lu.
* bfd-in2.h: Regenerate.
2018-02-19 09:04:15 +01:00
|
|
|
(uint64_t) *section_size);
|
2008-07-10 03:32:23 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Read dwarf information from a buffer. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
static unsigned int
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
read_1_byte (bfd *abfd ATTRIBUTE_UNUSED, bfd_byte *buf, bfd_byte *end)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (buf + 1 > end)
|
|
|
|
return 0;
|
2004-01-12 06:34:16 +01:00
|
|
|
return bfd_get_8 (abfd, buf);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
read_1_signed_byte (bfd *abfd ATTRIBUTE_UNUSED, bfd_byte *buf, bfd_byte *end)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (buf + 1 > end)
|
|
|
|
return 0;
|
2004-01-12 06:34:16 +01:00
|
|
|
return bfd_get_signed_8 (abfd, buf);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
read_2_bytes (bfd *abfd, bfd_byte *buf, bfd_byte *end)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (buf + 2 > end)
|
|
|
|
return 0;
|
2004-01-12 06:34:16 +01:00
|
|
|
return bfd_get_16 (abfd, buf);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
read_4_bytes (bfd *abfd, bfd_byte *buf, bfd_byte *end)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (buf + 4 > end)
|
|
|
|
return 0;
|
2004-01-12 06:34:16 +01:00
|
|
|
return bfd_get_32 (abfd, buf);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
* bfd-in.h (bfd_int64_t, bfd_uint64_t): New types.
(BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Don't define here.
(bfd_getb64, bfd_getl64, bfd_get_bits): Return bfd_uint64_t.
(bfd_getb_signed_64, bfd_getl_signed_64): Return bfd_int64_t.
(bfd_putb64, bfd_putl64, bfd_put_bits): Accept bfd_uint64_t.
* configure.in (HOST_U_64BIT_TYPE): Set when sizeof long is 8.
(BFD_HOST_64_BIT_DEFINED, BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Set
when using long.
* libbfd.c (EIGHT_GAZILLION, COERCE64): Use bfd_int64_t.
(bfd_getb64): Return bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_getl64, bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
(bfd_putb64): Accept bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_putl64, bfd_put_bits, bfd_get_bits): Likewise.
* dwarf2.c (struct attribute): Use bfd_int64_t and bfd_uint64_t.
(read_8_bytes, read_indirect_string, read_address): Likewise.
(read_abbrevs, parse_comp_unit): Likewise.
* targets.c (struct bfd_target): Likewise.
* aix386-core.c (NO_GET64, NO_PUT64, NO_GETS64): Define and use.
* hppabsd-core.c: Likewise. Formatting.
* hpux-core.c: Likewise.
* irix-core.c: Likewise.
* netbsd-core.c: Likewise.
* osf-core.c: Likewise.
* ptrace-core.c: Likewise.
* sco5-core.c: Likewise.
* trad-core.c: Likewise.
* configure: Regenerate.
* bfd-in2.h: Regenerate.
2004-03-15 15:21:43 +01:00
|
|
|
static bfd_uint64_t
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
read_8_bytes (bfd *abfd, bfd_byte *buf, bfd_byte *end)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (buf + 8 > end)
|
|
|
|
return 0;
|
2004-01-12 06:34:16 +01:00
|
|
|
return bfd_get_64 (abfd, buf);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2005-02-20 15:59:07 +01:00
|
|
|
static bfd_byte *
|
2018-02-28 12:50:49 +01:00
|
|
|
read_n_bytes (bfd_byte * buf,
|
|
|
|
bfd_byte * end,
|
|
|
|
struct dwarf_block * block)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2018-02-28 12:50:49 +01:00
|
|
|
unsigned int size = block->size;
|
|
|
|
bfd_byte * block_end = buf + size;
|
|
|
|
|
|
|
|
if (block_end > end || block_end < buf)
|
|
|
|
{
|
|
|
|
block->data = NULL;
|
|
|
|
block->size = 0;
|
|
|
|
return end;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
block->data = buf;
|
|
|
|
return block_end;
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
/* Scans a NUL terminated string starting at BUF, returning a pointer to it.
|
|
|
|
Returns the number of characters in the string, *including* the NUL byte,
|
|
|
|
in BYTES_READ_PTR. This value is set even if the function fails. Bytes
|
|
|
|
at or beyond BUF_END will not be read. Returns NULL if there was a
|
|
|
|
problem, or if the string is empty. */
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
static char *
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
read_string (bfd * abfd ATTRIBUTE_UNUSED,
|
|
|
|
bfd_byte * buf,
|
|
|
|
bfd_byte * buf_end,
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
unsigned int * bytes_read_ptr)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_byte *str = buf;
|
|
|
|
|
|
|
|
if (buf >= buf_end)
|
|
|
|
{
|
|
|
|
* bytes_read_ptr = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-11-18 15:05:00 +01:00
|
|
|
|
2005-02-20 15:59:07 +01:00
|
|
|
if (*str == '\0')
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
* bytes_read_ptr = 1;
|
1999-05-03 09:29:11 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
while (buf < buf_end)
|
|
|
|
if (* buf ++ == 0)
|
|
|
|
{
|
|
|
|
* bytes_read_ptr = buf - str;
|
|
|
|
return (char *) str;
|
|
|
|
}
|
|
|
|
|
|
|
|
* bytes_read_ptr = buf - str;
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
/* Reads an offset from BUF and then locates the string at this offset
|
|
|
|
inside the debug string section. Returns a pointer to the string.
|
|
|
|
Returns the number of bytes read from BUF, *not* the length of the string,
|
|
|
|
in BYTES_READ_PTR. This value is set even if the function fails. Bytes
|
|
|
|
at or beyond BUF_END will not be read from BUF. Returns NULL if there was
|
|
|
|
a problem, or if the string is empty. Does not check for NUL termination
|
|
|
|
of the string. */
|
2008-11-18 15:05:00 +01:00
|
|
|
|
2001-11-14 12:16:47 +01:00
|
|
|
static char *
|
2008-11-18 15:05:00 +01:00
|
|
|
read_indirect_string (struct comp_unit * unit,
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_byte * buf,
|
|
|
|
bfd_byte * buf_end,
|
|
|
|
unsigned int * bytes_read_ptr)
|
2001-11-14 12:16:47 +01:00
|
|
|
{
|
* bfd-in.h (bfd_int64_t, bfd_uint64_t): New types.
(BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Don't define here.
(bfd_getb64, bfd_getl64, bfd_get_bits): Return bfd_uint64_t.
(bfd_getb_signed_64, bfd_getl_signed_64): Return bfd_int64_t.
(bfd_putb64, bfd_putl64, bfd_put_bits): Accept bfd_uint64_t.
* configure.in (HOST_U_64BIT_TYPE): Set when sizeof long is 8.
(BFD_HOST_64_BIT_DEFINED, BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Set
when using long.
* libbfd.c (EIGHT_GAZILLION, COERCE64): Use bfd_int64_t.
(bfd_getb64): Return bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_getl64, bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
(bfd_putb64): Accept bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_putl64, bfd_put_bits, bfd_get_bits): Likewise.
* dwarf2.c (struct attribute): Use bfd_int64_t and bfd_uint64_t.
(read_8_bytes, read_indirect_string, read_address): Likewise.
(read_abbrevs, parse_comp_unit): Likewise.
* targets.c (struct bfd_target): Likewise.
* aix386-core.c (NO_GET64, NO_PUT64, NO_GETS64): Define and use.
* hppabsd-core.c: Likewise. Formatting.
* hpux-core.c: Likewise.
* irix-core.c: Likewise.
* netbsd-core.c: Likewise.
* osf-core.c: Likewise.
* ptrace-core.c: Likewise.
* sco5-core.c: Likewise.
* trad-core.c: Likewise.
* configure: Regenerate.
* bfd-in2.h: Regenerate.
2004-03-15 15:21:43 +01:00
|
|
|
bfd_uint64_t offset;
|
2001-11-14 12:16:47 +01:00
|
|
|
struct dwarf2_debug *stash = unit->stash;
|
2005-02-20 15:59:07 +01:00
|
|
|
char *str;
|
2001-11-14 12:16:47 +01:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (buf + unit->offset_size > buf_end)
|
|
|
|
{
|
|
|
|
* bytes_read_ptr = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-02-15 09:32:46 +01:00
|
|
|
|
2001-11-14 12:16:47 +01:00
|
|
|
if (unit->offset_size == 4)
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
offset = read_4_bytes (unit->abfd, buf, buf_end);
|
2001-11-14 12:16:47 +01:00
|
|
|
else
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
offset = read_8_bytes (unit->abfd, buf, buf_end);
|
2008-11-18 15:05:00 +01:00
|
|
|
|
2001-11-14 12:16:47 +01:00
|
|
|
*bytes_read_ptr = unit->offset_size;
|
|
|
|
|
2011-09-30 12:39:45 +02:00
|
|
|
if (! read_section (unit->abfd, &stash->debug_sections[debug_str],
|
2014-04-24 14:29:56 +02:00
|
|
|
stash->syms, offset,
|
2008-09-05 19:55:07 +02:00
|
|
|
&stash->dwarf_str_buffer, &stash->dwarf_str_size))
|
2008-11-18 15:05:00 +01:00
|
|
|
return NULL;
|
2001-11-14 12:16:47 +01:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (offset >= stash->dwarf_str_size)
|
|
|
|
return NULL;
|
2005-02-20 15:59:07 +01:00
|
|
|
str = (char *) stash->dwarf_str_buffer + offset;
|
|
|
|
if (*str == '\0')
|
2001-11-14 12:16:47 +01:00
|
|
|
return NULL;
|
2005-02-20 15:59:07 +01:00
|
|
|
return str;
|
2001-11-14 12:16:47 +01:00
|
|
|
}
|
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
/* Like read_indirect_string but from .debug_line_str section. */
|
|
|
|
|
|
|
|
static char *
|
|
|
|
read_indirect_line_string (struct comp_unit * unit,
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_byte * buf,
|
|
|
|
bfd_byte * buf_end,
|
2017-07-04 10:09:27 +02:00
|
|
|
unsigned int * bytes_read_ptr)
|
|
|
|
{
|
|
|
|
bfd_uint64_t offset;
|
|
|
|
struct dwarf2_debug *stash = unit->stash;
|
|
|
|
char *str;
|
|
|
|
|
|
|
|
if (buf + unit->offset_size > buf_end)
|
|
|
|
{
|
|
|
|
* bytes_read_ptr = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unit->offset_size == 4)
|
|
|
|
offset = read_4_bytes (unit->abfd, buf, buf_end);
|
|
|
|
else
|
|
|
|
offset = read_8_bytes (unit->abfd, buf, buf_end);
|
|
|
|
|
|
|
|
*bytes_read_ptr = unit->offset_size;
|
|
|
|
|
|
|
|
if (! read_section (unit->abfd, &stash->debug_sections[debug_line_str],
|
|
|
|
stash->syms, offset,
|
|
|
|
&stash->dwarf_line_str_buffer,
|
|
|
|
&stash->dwarf_line_str_size))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (offset >= stash->dwarf_line_str_size)
|
|
|
|
return NULL;
|
|
|
|
str = (char *) stash->dwarf_line_str_buffer + offset;
|
|
|
|
if (*str == '\0')
|
|
|
|
return NULL;
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2013-05-29 16:58:35 +02:00
|
|
|
/* Like read_indirect_string but uses a .debug_str located in
|
2014-04-24 14:29:56 +02:00
|
|
|
an alternate file pointed to by the .gnu_debugaltlink section.
|
2013-05-29 16:58:35 +02:00
|
|
|
Used to impement DW_FORM_GNU_strp_alt. */
|
|
|
|
|
|
|
|
static char *
|
|
|
|
read_alt_indirect_string (struct comp_unit * unit,
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_byte * buf,
|
|
|
|
bfd_byte * buf_end,
|
2013-05-29 16:58:35 +02:00
|
|
|
unsigned int * bytes_read_ptr)
|
|
|
|
{
|
|
|
|
bfd_uint64_t offset;
|
|
|
|
struct dwarf2_debug *stash = unit->stash;
|
|
|
|
char *str;
|
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (buf + unit->offset_size > buf_end)
|
|
|
|
{
|
|
|
|
* bytes_read_ptr = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-02-15 09:32:46 +01:00
|
|
|
|
2013-05-29 16:58:35 +02:00
|
|
|
if (unit->offset_size == 4)
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
offset = read_4_bytes (unit->abfd, buf, buf_end);
|
2013-05-29 16:58:35 +02:00
|
|
|
else
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
offset = read_8_bytes (unit->abfd, buf, buf_end);
|
2013-05-29 16:58:35 +02:00
|
|
|
|
|
|
|
*bytes_read_ptr = unit->offset_size;
|
|
|
|
|
|
|
|
if (stash->alt_bfd_ptr == NULL)
|
|
|
|
{
|
|
|
|
bfd * debug_bfd;
|
|
|
|
char * debug_filename = bfd_follow_gnu_debugaltlink (unit->abfd, DEBUGDIR);
|
|
|
|
|
|
|
|
if (debug_filename == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if ((debug_bfd = bfd_openr (debug_filename, NULL)) == NULL
|
|
|
|
|| ! bfd_check_format (debug_bfd, bfd_object))
|
|
|
|
{
|
|
|
|
if (debug_bfd)
|
|
|
|
bfd_close (debug_bfd);
|
|
|
|
|
|
|
|
/* FIXME: Should we report our failure to follow the debuglink ? */
|
|
|
|
free (debug_filename);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
stash->alt_bfd_ptr = debug_bfd;
|
|
|
|
}
|
2015-02-15 09:32:46 +01:00
|
|
|
|
2013-05-29 16:58:35 +02:00
|
|
|
if (! read_section (unit->stash->alt_bfd_ptr,
|
|
|
|
stash->debug_sections + debug_str_alt,
|
|
|
|
NULL, /* FIXME: Do we need to load alternate symbols ? */
|
|
|
|
offset,
|
|
|
|
&stash->alt_dwarf_str_buffer,
|
|
|
|
&stash->alt_dwarf_str_size))
|
|
|
|
return NULL;
|
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (offset >= stash->alt_dwarf_str_size)
|
|
|
|
return NULL;
|
2013-05-29 16:58:35 +02:00
|
|
|
str = (char *) stash->alt_dwarf_str_buffer + offset;
|
|
|
|
if (*str == '\0')
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Resolve an alternate reference from UNIT at OFFSET.
|
|
|
|
Returns a pointer into the loaded alternate CU upon success
|
|
|
|
or NULL upon failure. */
|
|
|
|
|
|
|
|
static bfd_byte *
|
|
|
|
read_alt_indirect_ref (struct comp_unit * unit,
|
|
|
|
bfd_uint64_t offset)
|
|
|
|
{
|
|
|
|
struct dwarf2_debug *stash = unit->stash;
|
|
|
|
|
|
|
|
if (stash->alt_bfd_ptr == NULL)
|
|
|
|
{
|
|
|
|
bfd * debug_bfd;
|
|
|
|
char * debug_filename = bfd_follow_gnu_debugaltlink (unit->abfd, DEBUGDIR);
|
|
|
|
|
|
|
|
if (debug_filename == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if ((debug_bfd = bfd_openr (debug_filename, NULL)) == NULL
|
|
|
|
|| ! bfd_check_format (debug_bfd, bfd_object))
|
|
|
|
{
|
|
|
|
if (debug_bfd)
|
|
|
|
bfd_close (debug_bfd);
|
|
|
|
|
|
|
|
/* FIXME: Should we report our failure to follow the debuglink ? */
|
|
|
|
free (debug_filename);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
stash->alt_bfd_ptr = debug_bfd;
|
|
|
|
}
|
2015-02-15 09:32:46 +01:00
|
|
|
|
2013-05-29 16:58:35 +02:00
|
|
|
if (! read_section (unit->stash->alt_bfd_ptr,
|
|
|
|
stash->debug_sections + debug_info_alt,
|
|
|
|
NULL, /* FIXME: Do we need to load alternate symbols ? */
|
|
|
|
offset,
|
|
|
|
&stash->alt_dwarf_info_buffer,
|
|
|
|
&stash->alt_dwarf_info_size))
|
|
|
|
return NULL;
|
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (offset >= stash->alt_dwarf_info_size)
|
|
|
|
return NULL;
|
2013-05-29 16:58:35 +02:00
|
|
|
return stash->alt_dwarf_info_buffer + offset;
|
|
|
|
}
|
|
|
|
|
* bfd-in.h (bfd_int64_t, bfd_uint64_t): New types.
(BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Don't define here.
(bfd_getb64, bfd_getl64, bfd_get_bits): Return bfd_uint64_t.
(bfd_getb_signed_64, bfd_getl_signed_64): Return bfd_int64_t.
(bfd_putb64, bfd_putl64, bfd_put_bits): Accept bfd_uint64_t.
* configure.in (HOST_U_64BIT_TYPE): Set when sizeof long is 8.
(BFD_HOST_64_BIT_DEFINED, BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Set
when using long.
* libbfd.c (EIGHT_GAZILLION, COERCE64): Use bfd_int64_t.
(bfd_getb64): Return bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_getl64, bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
(bfd_putb64): Accept bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_putl64, bfd_put_bits, bfd_get_bits): Likewise.
* dwarf2.c (struct attribute): Use bfd_int64_t and bfd_uint64_t.
(read_8_bytes, read_indirect_string, read_address): Likewise.
(read_abbrevs, parse_comp_unit): Likewise.
* targets.c (struct bfd_target): Likewise.
* aix386-core.c (NO_GET64, NO_PUT64, NO_GETS64): Define and use.
* hppabsd-core.c: Likewise. Formatting.
* hpux-core.c: Likewise.
* irix-core.c: Likewise.
* netbsd-core.c: Likewise.
* osf-core.c: Likewise.
* ptrace-core.c: Likewise.
* sco5-core.c: Likewise.
* trad-core.c: Likewise.
* configure: Regenerate.
* bfd-in2.h: Regenerate.
2004-03-15 15:21:43 +01:00
|
|
|
static bfd_uint64_t
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
read_address (struct comp_unit *unit, bfd_byte *buf, bfd_byte * buf_end)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2014-12-10 04:36:42 +01:00
|
|
|
int signed_vma = 0;
|
|
|
|
|
|
|
|
if (bfd_get_flavour (unit->abfd) == bfd_target_elf_flavour)
|
|
|
|
signed_vma = get_elf_backend_data (unit->abfd)->sign_extend_vma;
|
2005-07-08 23:42:33 +02:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (buf + unit->addr_size > buf_end)
|
|
|
|
return 0;
|
|
|
|
|
2005-07-08 23:42:33 +02:00
|
|
|
if (signed_vma)
|
|
|
|
{
|
|
|
|
switch (unit->addr_size)
|
|
|
|
{
|
|
|
|
case 8:
|
|
|
|
return bfd_get_signed_64 (unit->abfd, buf);
|
|
|
|
case 4:
|
|
|
|
return bfd_get_signed_32 (unit->abfd, buf);
|
|
|
|
case 2:
|
|
|
|
return bfd_get_signed_16 (unit->abfd, buf);
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2005-07-08 23:42:33 +02:00
|
|
|
switch (unit->addr_size)
|
|
|
|
{
|
|
|
|
case 8:
|
|
|
|
return bfd_get_64 (unit->abfd, buf);
|
|
|
|
case 4:
|
|
|
|
return bfd_get_32 (unit->abfd, buf);
|
|
|
|
case 2:
|
|
|
|
return bfd_get_16 (unit->abfd, buf);
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Lookup an abbrev_info structure in the abbrev hash table. */
|
|
|
|
|
|
|
|
static struct abbrev_info *
|
2004-01-12 06:34:16 +01:00
|
|
|
lookup_abbrev (unsigned int number, struct abbrev_info **abbrevs)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
unsigned int hash_number;
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
|
|
|
|
hash_number = number % ABBREV_HASH_SIZE;
|
|
|
|
abbrev = abbrevs[hash_number];
|
|
|
|
|
|
|
|
while (abbrev)
|
|
|
|
{
|
|
|
|
if (abbrev->number == number)
|
|
|
|
return abbrev;
|
|
|
|
else
|
|
|
|
abbrev = abbrev->next;
|
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* In DWARF version 2, the description of the debugging information is
|
|
|
|
stored in a separate .debug_abbrev section. Before we read any
|
|
|
|
dies from a section we read in all abbreviations and install them
|
|
|
|
in a hash table. */
|
|
|
|
|
|
|
|
static struct abbrev_info**
|
* bfd-in.h (bfd_int64_t, bfd_uint64_t): New types.
(BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Don't define here.
(bfd_getb64, bfd_getl64, bfd_get_bits): Return bfd_uint64_t.
(bfd_getb_signed_64, bfd_getl_signed_64): Return bfd_int64_t.
(bfd_putb64, bfd_putl64, bfd_put_bits): Accept bfd_uint64_t.
* configure.in (HOST_U_64BIT_TYPE): Set when sizeof long is 8.
(BFD_HOST_64_BIT_DEFINED, BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Set
when using long.
* libbfd.c (EIGHT_GAZILLION, COERCE64): Use bfd_int64_t.
(bfd_getb64): Return bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_getl64, bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
(bfd_putb64): Accept bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_putl64, bfd_put_bits, bfd_get_bits): Likewise.
* dwarf2.c (struct attribute): Use bfd_int64_t and bfd_uint64_t.
(read_8_bytes, read_indirect_string, read_address): Likewise.
(read_abbrevs, parse_comp_unit): Likewise.
* targets.c (struct bfd_target): Likewise.
* aix386-core.c (NO_GET64, NO_PUT64, NO_GETS64): Define and use.
* hppabsd-core.c: Likewise. Formatting.
* hpux-core.c: Likewise.
* irix-core.c: Likewise.
* netbsd-core.c: Likewise.
* osf-core.c: Likewise.
* ptrace-core.c: Likewise.
* sco5-core.c: Likewise.
* trad-core.c: Likewise.
* configure: Regenerate.
* bfd-in2.h: Regenerate.
2004-03-15 15:21:43 +01:00
|
|
|
read_abbrevs (bfd *abfd, bfd_uint64_t offset, struct dwarf2_debug *stash)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
struct abbrev_info **abbrevs;
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *abbrev_ptr;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_byte *abbrev_end;
|
1999-05-03 09:29:11 +02:00
|
|
|
struct abbrev_info *cur_abbrev;
|
|
|
|
unsigned int abbrev_number, bytes_read, abbrev_name;
|
|
|
|
unsigned int abbrev_form, hash_number;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
bfd_size_type amt;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2011-09-30 12:39:45 +02:00
|
|
|
if (! read_section (abfd, &stash->debug_sections[debug_abbrev],
|
2014-04-24 14:29:56 +02:00
|
|
|
stash->syms, offset,
|
2008-09-05 19:55:07 +02:00
|
|
|
&stash->dwarf_abbrev_buffer, &stash->dwarf_abbrev_size))
|
2010-03-04 05:01:53 +01:00
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (offset >= stash->dwarf_abbrev_size)
|
|
|
|
return NULL;
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = sizeof (struct abbrev_info*) * ABBREV_HASH_SIZE;
|
2009-09-09 23:38:59 +02:00
|
|
|
abbrevs = (struct abbrev_info **) bfd_zalloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (abbrevs == NULL)
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
abbrev_ptr = stash->dwarf_abbrev_buffer + offset;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
abbrev_end = stash->dwarf_abbrev_buffer + stash->dwarf_abbrev_size;
|
2017-02-17 02:26:12 +01:00
|
|
|
abbrev_number = _bfd_safe_read_leb128 (abfd, abbrev_ptr, &bytes_read,
|
|
|
|
FALSE, abbrev_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Loop until we reach an abbrev number of 0. */
|
1999-05-03 09:29:11 +02:00
|
|
|
while (abbrev_number)
|
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = sizeof (struct abbrev_info);
|
2009-09-09 23:38:59 +02:00
|
|
|
cur_abbrev = (struct abbrev_info *) bfd_zalloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (cur_abbrev == NULL)
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Read in abbrev header. */
|
1999-05-03 09:29:11 +02:00
|
|
|
cur_abbrev->number = abbrev_number;
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
cur_abbrev->tag = (enum dwarf_tag)
|
2017-02-17 02:26:11 +01:00
|
|
|
_bfd_safe_read_leb128 (abfd, abbrev_ptr, &bytes_read,
|
|
|
|
FALSE, abbrev_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
abbrev_ptr += bytes_read;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
cur_abbrev->has_children = read_1_byte (abfd, abbrev_ptr, abbrev_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
abbrev_ptr += 1;
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Now read in declarations. */
|
2017-07-04 10:09:27 +02:00
|
|
|
for (;;)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2017-07-04 10:09:27 +02:00
|
|
|
/* Initialize it just to avoid a GCC false warning. */
|
|
|
|
bfd_vma implicit_const = -1;
|
|
|
|
|
|
|
|
abbrev_name = _bfd_safe_read_leb128 (abfd, abbrev_ptr, &bytes_read,
|
|
|
|
FALSE, abbrev_end);
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
abbrev_form = _bfd_safe_read_leb128 (abfd, abbrev_ptr, &bytes_read,
|
|
|
|
FALSE, abbrev_end);
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
if (abbrev_form == DW_FORM_implicit_const)
|
|
|
|
{
|
|
|
|
implicit_const = _bfd_safe_read_leb128 (abfd, abbrev_ptr,
|
|
|
|
&bytes_read, TRUE,
|
|
|
|
abbrev_end);
|
|
|
|
abbrev_ptr += bytes_read;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (abbrev_name == 0)
|
|
|
|
break;
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if ((cur_abbrev->num_attrs % ATTR_ALLOC_CHUNK) == 0)
|
|
|
|
{
|
2005-05-05 16:25:23 +02:00
|
|
|
struct attr_abbrev *tmp;
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = cur_abbrev->num_attrs + ATTR_ALLOC_CHUNK;
|
|
|
|
amt *= sizeof (struct attr_abbrev);
|
2009-09-09 23:38:59 +02:00
|
|
|
tmp = (struct attr_abbrev *) bfd_realloc (cur_abbrev->attrs, amt);
|
2005-05-05 16:25:23 +02:00
|
|
|
if (tmp == NULL)
|
2006-03-06 05:52:03 +01:00
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < ABBREV_HASH_SIZE; i++)
|
|
|
|
{
|
|
|
|
struct abbrev_info *abbrev = abbrevs[i];
|
|
|
|
|
|
|
|
while (abbrev)
|
|
|
|
{
|
2008-02-22 16:27:38 +01:00
|
|
|
free (abbrev->attrs);
|
|
|
|
abbrev = abbrev->next;
|
2006-03-06 05:52:03 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-05-05 16:25:23 +02:00
|
|
|
cur_abbrev->attrs = tmp;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
cur_abbrev->attrs[cur_abbrev->num_attrs].name
|
|
|
|
= (enum dwarf_attribute) abbrev_name;
|
2017-07-04 10:09:27 +02:00
|
|
|
cur_abbrev->attrs[cur_abbrev->num_attrs].form
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
= (enum dwarf_form) abbrev_form;
|
2017-07-04 10:09:27 +02:00
|
|
|
cur_abbrev->attrs[cur_abbrev->num_attrs].implicit_const
|
|
|
|
= implicit_const;
|
|
|
|
++cur_abbrev->num_attrs;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
hash_number = abbrev_number % ABBREV_HASH_SIZE;
|
|
|
|
cur_abbrev->next = abbrevs[hash_number];
|
|
|
|
abbrevs[hash_number] = cur_abbrev;
|
|
|
|
|
|
|
|
/* Get next abbreviation.
|
2002-10-23 14:41:32 +02:00
|
|
|
Under Irix6 the abbreviations for a compilation unit are not
|
1999-05-03 09:29:11 +02:00
|
|
|
always properly terminated with an abbrev number of 0.
|
|
|
|
Exit loop if we encounter an abbreviation which we have
|
|
|
|
already read (which means we are about to read the abbreviations
|
|
|
|
for the next compile unit) or if the end of the abbreviation
|
|
|
|
table is reached. */
|
|
|
|
if ((unsigned int) (abbrev_ptr - stash->dwarf_abbrev_buffer)
|
2006-03-06 05:52:03 +01:00
|
|
|
>= stash->dwarf_abbrev_size)
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
2017-02-17 02:26:11 +01:00
|
|
|
abbrev_number = _bfd_safe_read_leb128 (abfd, abbrev_ptr,
|
|
|
|
&bytes_read, FALSE, abbrev_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
abbrev_ptr += bytes_read;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (lookup_abbrev (abbrev_number, abbrevs) != NULL)
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return abbrevs;
|
|
|
|
}
|
|
|
|
|
2014-06-26 10:12:55 +02:00
|
|
|
/* Returns true if the form is one which has a string value. */
|
|
|
|
|
|
|
|
static inline bfd_boolean
|
|
|
|
is_str_attr (enum dwarf_form form)
|
|
|
|
{
|
2017-07-04 10:09:27 +02:00
|
|
|
return (form == DW_FORM_string || form == DW_FORM_strp
|
|
|
|
|| form == DW_FORM_line_strp || form == DW_FORM_GNU_strp_alt);
|
2014-06-26 10:12:55 +02:00
|
|
|
}
|
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
/* Read and fill in the value of attribute ATTR as described by FORM.
|
|
|
|
Read data starting from INFO_PTR, but never at or beyond INFO_PTR_END.
|
|
|
|
Returns an updated INFO_PTR taking into account the amount of data read. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2005-02-20 15:59:07 +01:00
|
|
|
static bfd_byte *
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
read_attribute_value (struct attribute * attr,
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
unsigned form,
|
|
|
|
bfd_vma implicit_const,
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
struct comp_unit * unit,
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_byte * info_ptr,
|
|
|
|
bfd_byte * info_ptr_end)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
bfd *abfd = unit->abfd;
|
|
|
|
unsigned int bytes_read;
|
|
|
|
struct dwarf_block *blk;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
bfd_size_type amt;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2016-03-22 13:20:18 +01:00
|
|
|
if (info_ptr >= info_ptr_end && form != DW_FORM_flag_present)
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
{
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
_bfd_error_handler (_("DWARF error: info pointer extends beyond end of attributes"));
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return info_ptr;
|
|
|
|
}
|
|
|
|
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
attr->form = (enum dwarf_form) form;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2001-11-14 00:37:41 +01:00
|
|
|
switch (form)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
case DW_FORM_ref_addr:
|
2008-09-08 23:58:29 +02:00
|
|
|
/* DW_FORM_ref_addr is an address in DWARF2, and an offset in
|
|
|
|
DWARF3. */
|
2010-04-01 07:24:52 +02:00
|
|
|
if (unit->version == 3 || unit->version == 4)
|
2008-09-08 23:58:29 +02:00
|
|
|
{
|
|
|
|
if (unit->offset_size == 4)
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_4_bytes (unit->abfd, info_ptr, info_ptr_end);
|
2008-09-08 23:58:29 +02:00
|
|
|
else
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_8_bytes (unit->abfd, info_ptr, info_ptr_end);
|
2008-09-08 23:58:29 +02:00
|
|
|
info_ptr += unit->offset_size;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case DW_FORM_addr:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_address (unit, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += unit->addr_size;
|
|
|
|
break;
|
2013-05-29 16:58:35 +02:00
|
|
|
case DW_FORM_GNU_ref_alt:
|
2010-04-01 07:24:52 +02:00
|
|
|
case DW_FORM_sec_offset:
|
|
|
|
if (unit->offset_size == 4)
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_4_bytes (unit->abfd, info_ptr, info_ptr_end);
|
2010-04-01 07:24:52 +02:00
|
|
|
else
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_8_bytes (unit->abfd, info_ptr, info_ptr_end);
|
2010-04-01 07:24:52 +02:00
|
|
|
info_ptr += unit->offset_size;
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
case DW_FORM_block2:
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = sizeof (struct dwarf_block);
|
2009-09-09 23:38:59 +02:00
|
|
|
blk = (struct dwarf_block *) bfd_alloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (blk == NULL)
|
|
|
|
return NULL;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
blk->size = read_2_bytes (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 2;
|
2018-02-28 12:50:49 +01:00
|
|
|
info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);
|
2003-10-30 10:50:02 +01:00
|
|
|
attr->u.blk = blk;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
case DW_FORM_block4:
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = sizeof (struct dwarf_block);
|
2009-09-09 23:38:59 +02:00
|
|
|
blk = (struct dwarf_block *) bfd_alloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (blk == NULL)
|
|
|
|
return NULL;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
blk->size = read_4_bytes (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 4;
|
2018-02-28 12:50:49 +01:00
|
|
|
info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);
|
2003-10-30 10:50:02 +01:00
|
|
|
attr->u.blk = blk;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
case DW_FORM_data2:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_2_bytes (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 2;
|
|
|
|
break;
|
|
|
|
case DW_FORM_data4:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 4;
|
|
|
|
break;
|
|
|
|
case DW_FORM_data8:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 8;
|
|
|
|
break;
|
|
|
|
case DW_FORM_string:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.str = read_string (abfd, info_ptr, info_ptr_end, &bytes_read);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
break;
|
2001-11-14 12:16:47 +01:00
|
|
|
case DW_FORM_strp:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.str = read_indirect_string (unit, info_ptr, info_ptr_end, &bytes_read);
|
2001-11-14 12:16:47 +01:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
break;
|
2017-07-04 10:09:27 +02:00
|
|
|
case DW_FORM_line_strp:
|
|
|
|
attr->u.str = read_indirect_line_string (unit, info_ptr, info_ptr_end, &bytes_read);
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
break;
|
2013-05-29 16:58:35 +02:00
|
|
|
case DW_FORM_GNU_strp_alt:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.str = read_alt_indirect_string (unit, info_ptr, info_ptr_end, &bytes_read);
|
2013-05-29 16:58:35 +02:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
break;
|
2010-04-01 07:24:52 +02:00
|
|
|
case DW_FORM_exprloc:
|
1999-05-03 09:29:11 +02:00
|
|
|
case DW_FORM_block:
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = sizeof (struct dwarf_block);
|
2009-09-09 23:38:59 +02:00
|
|
|
blk = (struct dwarf_block *) bfd_alloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (blk == NULL)
|
|
|
|
return NULL;
|
2017-02-17 02:26:11 +01:00
|
|
|
blk->size = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
FALSE, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += bytes_read;
|
2018-02-28 12:50:49 +01:00
|
|
|
info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);
|
2003-10-30 10:50:02 +01:00
|
|
|
attr->u.blk = blk;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
case DW_FORM_block1:
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = sizeof (struct dwarf_block);
|
2009-09-09 23:38:59 +02:00
|
|
|
blk = (struct dwarf_block *) bfd_alloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (blk == NULL)
|
|
|
|
return NULL;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
blk->size = read_1_byte (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 1;
|
2018-02-28 12:50:49 +01:00
|
|
|
info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);
|
2003-10-30 10:50:02 +01:00
|
|
|
attr->u.blk = blk;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
case DW_FORM_data1:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 1;
|
|
|
|
break;
|
|
|
|
case DW_FORM_flag:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 1;
|
|
|
|
break;
|
2010-04-01 07:24:52 +02:00
|
|
|
case DW_FORM_flag_present:
|
|
|
|
attr->u.val = 1;
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
case DW_FORM_sdata:
|
2017-02-17 02:26:11 +01:00
|
|
|
attr->u.sval = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
TRUE, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
break;
|
|
|
|
case DW_FORM_udata:
|
2017-02-17 02:26:11 +01:00
|
|
|
attr->u.val = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
FALSE, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
break;
|
|
|
|
case DW_FORM_ref1:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 1;
|
|
|
|
break;
|
|
|
|
case DW_FORM_ref2:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_2_bytes (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 2;
|
|
|
|
break;
|
|
|
|
case DW_FORM_ref4:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 4;
|
|
|
|
break;
|
1999-07-14 10:49:40 +02:00
|
|
|
case DW_FORM_ref8:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end);
|
1999-07-14 10:49:40 +02:00
|
|
|
info_ptr += 8;
|
|
|
|
break;
|
2010-01-20 00:17:57 +01:00
|
|
|
case DW_FORM_ref_sig8:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end);
|
2010-01-20 00:17:57 +01:00
|
|
|
info_ptr += 8;
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
case DW_FORM_ref_udata:
|
2017-02-17 02:26:11 +01:00
|
|
|
attr->u.val = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
FALSE, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
break;
|
|
|
|
case DW_FORM_indirect:
|
2017-02-17 02:26:11 +01:00
|
|
|
form = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
FALSE, info_ptr_end);
|
2001-11-14 00:37:41 +01:00
|
|
|
info_ptr += bytes_read;
|
2017-07-04 10:09:27 +02:00
|
|
|
if (form == DW_FORM_implicit_const)
|
|
|
|
{
|
|
|
|
implicit_const = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
TRUE, info_ptr_end);
|
|
|
|
info_ptr += bytes_read;
|
|
|
|
}
|
|
|
|
info_ptr = read_attribute_value (attr, form, implicit_const, unit,
|
|
|
|
info_ptr, info_ptr_end);
|
|
|
|
break;
|
|
|
|
case DW_FORM_implicit_const:
|
|
|
|
attr->form = DW_FORM_sdata;
|
|
|
|
attr->u.sval = implicit_const;
|
2001-11-14 00:37:41 +01:00
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
default:
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
_bfd_error_handler (_("DWARF error: invalid or unhandled FORM value: %#x"),
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
form);
|
1999-05-03 09:29:11 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2010-04-01 07:24:52 +02:00
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
return info_ptr;
|
|
|
|
}
|
|
|
|
|
2001-11-14 00:37:41 +01:00
|
|
|
/* Read an attribute described by an abbreviated attribute. */
|
|
|
|
|
2005-02-20 15:59:07 +01:00
|
|
|
static bfd_byte *
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
read_attribute (struct attribute * attr,
|
|
|
|
struct attr_abbrev * abbrev,
|
|
|
|
struct comp_unit * unit,
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_byte * info_ptr,
|
|
|
|
bfd_byte * info_ptr_end)
|
2001-11-14 00:37:41 +01:00
|
|
|
{
|
|
|
|
attr->name = abbrev->name;
|
2017-07-04 10:09:27 +02:00
|
|
|
info_ptr = read_attribute_value (attr, abbrev->form, abbrev->implicit_const,
|
|
|
|
unit, info_ptr, info_ptr_end);
|
2001-11-14 00:37:41 +01:00
|
|
|
return info_ptr;
|
|
|
|
}
|
|
|
|
|
2014-12-10 00:21:56 +01:00
|
|
|
/* Return whether DW_AT_name will return the same as DW_AT_linkage_name
|
|
|
|
for a function. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
non_mangled (int lang)
|
|
|
|
{
|
|
|
|
switch (lang)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
case DW_LANG_C89:
|
|
|
|
case DW_LANG_C:
|
|
|
|
case DW_LANG_Ada83:
|
|
|
|
case DW_LANG_Cobol74:
|
|
|
|
case DW_LANG_Cobol85:
|
|
|
|
case DW_LANG_Fortran77:
|
|
|
|
case DW_LANG_Pascal83:
|
|
|
|
case DW_LANG_C99:
|
|
|
|
case DW_LANG_Ada95:
|
|
|
|
case DW_LANG_PLI:
|
|
|
|
case DW_LANG_UPC:
|
|
|
|
case DW_LANG_C11:
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Source line information table routines. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
#define FILE_ALLOC_CHUNK 5
|
|
|
|
#define DIR_ALLOC_CHUNK 5
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
struct line_info
|
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
struct line_info * prev_line;
|
|
|
|
bfd_vma address;
|
|
|
|
char * filename;
|
|
|
|
unsigned int line;
|
|
|
|
unsigned int column;
|
|
|
|
unsigned int discriminator;
|
|
|
|
unsigned char op_index;
|
|
|
|
unsigned char end_sequence; /* End of (sequential) code sequence. */
|
1999-05-03 09:29:11 +02:00
|
|
|
};
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
struct fileinfo
|
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
char * name;
|
|
|
|
unsigned int dir;
|
|
|
|
unsigned int time;
|
|
|
|
unsigned int size;
|
1999-05-03 09:29:11 +02:00
|
|
|
};
|
|
|
|
|
2009-12-31 15:10:29 +01:00
|
|
|
struct line_sequence
|
|
|
|
{
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_vma low_pc;
|
2009-12-31 15:10:29 +01:00
|
|
|
struct line_sequence* prev_sequence;
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
struct line_info* last_line; /* Largest VMA. */
|
|
|
|
struct line_info** line_info_lookup;
|
2016-11-08 13:01:58 +01:00
|
|
|
bfd_size_type num_lines;
|
2009-12-31 15:10:29 +01:00
|
|
|
};
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
struct line_info_table
|
|
|
|
{
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd * abfd;
|
|
|
|
unsigned int num_files;
|
|
|
|
unsigned int num_dirs;
|
|
|
|
unsigned int num_sequences;
|
|
|
|
char * comp_dir;
|
|
|
|
char ** dirs;
|
|
|
|
struct fileinfo* files;
|
2009-12-31 15:10:29 +01:00
|
|
|
struct line_sequence* sequences;
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
struct line_info* lcl_head; /* Local head; used in 'add_line_info'. */
|
1999-05-03 09:29:11 +02:00
|
|
|
};
|
|
|
|
|
2005-05-23 19:44:55 +02:00
|
|
|
/* Remember some information about each function. If the function is
|
|
|
|
inlined (DW_TAG_inlined_subroutine) it may have two additional
|
|
|
|
attributes, DW_AT_call_file and DW_AT_call_line, which specify the
|
2012-05-16 15:57:11 +02:00
|
|
|
source code location where this function was inlined. */
|
2005-05-23 19:44:55 +02:00
|
|
|
|
2002-03-20 20:15:30 +01:00
|
|
|
struct funcinfo
|
|
|
|
{
|
2012-05-16 15:57:11 +02:00
|
|
|
/* Pointer to previous function in list of all functions. */
|
2016-11-08 13:01:58 +01:00
|
|
|
struct funcinfo * prev_func;
|
2012-05-16 15:57:11 +02:00
|
|
|
/* Pointer to function one scope higher. */
|
2016-11-08 13:01:58 +01:00
|
|
|
struct funcinfo * caller_func;
|
2012-05-16 15:57:11 +02:00
|
|
|
/* Source location file name where caller_func inlines this func. */
|
2016-11-08 13:01:58 +01:00
|
|
|
char * caller_file;
|
2012-05-16 15:57:11 +02:00
|
|
|
/* Source location file name. */
|
2016-11-08 13:01:58 +01:00
|
|
|
char * file;
|
2014-12-10 00:21:56 +01:00
|
|
|
/* Source location line number where caller_func inlines this func. */
|
2016-11-08 13:01:58 +01:00
|
|
|
int caller_line;
|
2012-05-16 15:57:11 +02:00
|
|
|
/* Source location line number. */
|
2016-11-08 13:01:58 +01:00
|
|
|
int line;
|
|
|
|
int tag;
|
2016-11-08 13:32:05 +01:00
|
|
|
bfd_boolean is_linkage;
|
2016-11-08 13:01:58 +01:00
|
|
|
const char * name;
|
|
|
|
struct arange arange;
|
2012-05-16 15:57:11 +02:00
|
|
|
/* Where the symbol is defined. */
|
2016-11-08 13:01:58 +01:00
|
|
|
asection * sec;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct lookup_funcinfo
|
|
|
|
{
|
|
|
|
/* Function information corresponding to this lookup table entry. */
|
|
|
|
struct funcinfo * funcinfo;
|
|
|
|
|
|
|
|
/* The lowest address for this specific function. */
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_vma low_addr;
|
2016-11-08 13:01:58 +01:00
|
|
|
|
|
|
|
/* The highest address of this function before the lookup table is sorted.
|
|
|
|
The highest address of all prior functions after the lookup table is
|
|
|
|
sorted, which is used for binary search. */
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_vma high_addr;
|
2005-06-06 16:28:31 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
struct varinfo
|
|
|
|
{
|
2008-02-12 01:26:00 +01:00
|
|
|
/* Pointer to previous variable in list of all variables */
|
2005-06-06 16:28:31 +02:00
|
|
|
struct varinfo *prev_var;
|
2008-02-12 01:26:00 +01:00
|
|
|
/* Source location file name */
|
2005-06-06 16:28:31 +02:00
|
|
|
char *file;
|
2008-02-12 01:26:00 +01:00
|
|
|
/* Source location line number */
|
2005-06-06 16:28:31 +02:00
|
|
|
int line;
|
|
|
|
int tag;
|
|
|
|
char *name;
|
2005-07-06 15:43:21 +02:00
|
|
|
bfd_vma addr;
|
2008-02-12 01:26:00 +01:00
|
|
|
/* Where the symbol is defined */
|
2005-06-06 16:28:31 +02:00
|
|
|
asection *sec;
|
2008-02-12 01:26:00 +01:00
|
|
|
/* Is this a stack variable? */
|
2005-06-06 16:28:31 +02:00
|
|
|
unsigned int stack: 1;
|
2002-03-20 20:15:30 +01:00
|
|
|
};
|
|
|
|
|
2006-03-06 02:36:52 +01:00
|
|
|
/* Return TRUE if NEW_LINE should sort after LINE. */
|
|
|
|
|
|
|
|
static inline bfd_boolean
|
|
|
|
new_line_sorts_after (struct line_info *new_line, struct line_info *line)
|
|
|
|
{
|
|
|
|
return (new_line->address > line->address
|
|
|
|
|| (new_line->address == line->address
|
2017-10-01 09:09:00 +02:00
|
|
|
&& new_line->op_index > line->op_index));
|
2006-03-06 02:36:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-04-01 12:18:54 +02:00
|
|
|
/* Adds a new entry to the line_info list in the line_info_table, ensuring
|
|
|
|
that the list is sorted. Note that the line_info list is sorted from
|
|
|
|
highest to lowest VMA (with possible duplicates); that is,
|
|
|
|
line_info->prev_line always accesses an equal or smaller VMA. */
|
|
|
|
|
2010-03-04 05:01:53 +01:00
|
|
|
static bfd_boolean
|
2004-01-12 06:34:16 +01:00
|
|
|
add_line_info (struct line_info_table *table,
|
|
|
|
bfd_vma address,
|
2010-04-05 21:30:00 +02:00
|
|
|
unsigned char op_index,
|
2004-01-12 06:34:16 +01:00
|
|
|
char *filename,
|
|
|
|
unsigned int line,
|
|
|
|
unsigned int column,
|
2012-07-24 23:06:58 +02:00
|
|
|
unsigned int discriminator,
|
2004-01-12 06:34:16 +01:00
|
|
|
int end_sequence)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
bfd_size_type amt = sizeof (struct line_info);
|
2009-12-31 15:10:29 +01:00
|
|
|
struct line_sequence* seq = table->sequences;
|
2009-09-09 23:38:59 +02:00
|
|
|
struct line_info* info = (struct line_info *) bfd_alloc (table->abfd, amt);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2010-03-04 05:01:53 +01:00
|
|
|
if (info == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
2006-03-06 02:36:52 +01:00
|
|
|
/* Set member data of 'info'. */
|
2010-07-06 23:13:57 +02:00
|
|
|
info->prev_line = NULL;
|
2006-03-06 02:36:52 +01:00
|
|
|
info->address = address;
|
2010-04-05 21:30:00 +02:00
|
|
|
info->op_index = op_index;
|
2006-03-06 02:36:52 +01:00
|
|
|
info->line = line;
|
|
|
|
info->column = column;
|
2012-07-24 23:06:58 +02:00
|
|
|
info->discriminator = discriminator;
|
2006-03-06 02:36:52 +01:00
|
|
|
info->end_sequence = end_sequence;
|
|
|
|
|
|
|
|
if (filename && filename[0])
|
|
|
|
{
|
2009-09-09 23:38:59 +02:00
|
|
|
info->filename = (char *) bfd_alloc (table->abfd, strlen (filename) + 1);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (info->filename == NULL)
|
|
|
|
return FALSE;
|
|
|
|
strcpy (info->filename, filename);
|
2006-03-06 02:36:52 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
info->filename = NULL;
|
|
|
|
|
2002-10-23 14:41:32 +02:00
|
|
|
/* Find the correct location for 'info'. Normally we will receive
|
|
|
|
new line_info data 1) in order and 2) with increasing VMAs.
|
|
|
|
However some compilers break the rules (cf. decode_line_info) and
|
|
|
|
so we include some heuristics for quickly finding the correct
|
|
|
|
location for 'info'. In particular, these heuristics optimize for
|
|
|
|
the common case in which the VMA sequence that we receive is a
|
|
|
|
list of locally sorted VMAs such as
|
|
|
|
p...z a...j (where a < j < p < z)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-10-23 14:41:32 +02:00
|
|
|
Note: table->lcl_head is used to head an *actual* or *possible*
|
2009-12-31 15:10:29 +01:00
|
|
|
sub-sequence within the list (such as a...j) that is not directly
|
2002-10-23 14:41:32 +02:00
|
|
|
headed by table->last_line
|
|
|
|
|
|
|
|
Note: we may receive duplicate entries from 'decode_line_info'. */
|
|
|
|
|
2009-12-31 15:10:29 +01:00
|
|
|
if (seq
|
|
|
|
&& seq->last_line->address == address
|
2010-04-05 21:30:00 +02:00
|
|
|
&& seq->last_line->op_index == op_index
|
2009-12-31 15:10:29 +01:00
|
|
|
&& seq->last_line->end_sequence == end_sequence)
|
2007-09-02 15:29:20 +02:00
|
|
|
{
|
|
|
|
/* We only keep the last entry with the same address and end
|
|
|
|
sequence. See PR ld/4986. */
|
2009-12-31 15:10:29 +01:00
|
|
|
if (table->lcl_head == seq->last_line)
|
2007-09-02 15:29:20 +02:00
|
|
|
table->lcl_head = info;
|
2009-12-31 15:10:29 +01:00
|
|
|
info->prev_line = seq->last_line->prev_line;
|
|
|
|
seq->last_line = info;
|
2007-09-02 15:29:20 +02:00
|
|
|
}
|
2009-12-31 15:10:29 +01:00
|
|
|
else if (!seq || seq->last_line->end_sequence)
|
2006-03-06 05:52:03 +01:00
|
|
|
{
|
2009-12-31 15:10:29 +01:00
|
|
|
/* Start a new line sequence. */
|
|
|
|
amt = sizeof (struct line_sequence);
|
|
|
|
seq = (struct line_sequence *) bfd_malloc (amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (seq == NULL)
|
|
|
|
return FALSE;
|
2009-12-31 15:10:29 +01:00
|
|
|
seq->low_pc = address;
|
|
|
|
seq->prev_sequence = table->sequences;
|
|
|
|
seq->last_line = info;
|
|
|
|
table->lcl_head = info;
|
|
|
|
table->sequences = seq;
|
|
|
|
table->num_sequences++;
|
|
|
|
}
|
2017-10-01 09:09:00 +02:00
|
|
|
else if (info->end_sequence
|
|
|
|
|| new_line_sorts_after (info, seq->last_line))
|
2009-12-31 15:10:29 +01:00
|
|
|
{
|
|
|
|
/* Normal case: add 'info' to the beginning of the current sequence. */
|
|
|
|
info->prev_line = seq->last_line;
|
|
|
|
seq->last_line = info;
|
2002-10-23 14:41:32 +02:00
|
|
|
|
2006-03-06 05:52:03 +01:00
|
|
|
/* lcl_head: initialize to head a *possible* sequence at the end. */
|
|
|
|
if (!table->lcl_head)
|
|
|
|
table->lcl_head = info;
|
|
|
|
}
|
|
|
|
else if (!new_line_sorts_after (info, table->lcl_head)
|
|
|
|
&& (!table->lcl_head->prev_line
|
|
|
|
|| new_line_sorts_after (info, table->lcl_head->prev_line)))
|
|
|
|
{
|
|
|
|
/* Abnormal but easy: lcl_head is the head of 'info'. */
|
|
|
|
info->prev_line = table->lcl_head->prev_line;
|
|
|
|
table->lcl_head->prev_line = info;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-12-31 15:10:29 +01:00
|
|
|
/* Abnormal and hard: Neither 'last_line' nor 'lcl_head'
|
|
|
|
are valid heads for 'info'. Reset 'lcl_head'. */
|
|
|
|
struct line_info* li2 = seq->last_line; /* Always non-NULL. */
|
2006-03-06 05:52:03 +01:00
|
|
|
struct line_info* li1 = li2->prev_line;
|
2002-10-23 14:41:32 +02:00
|
|
|
|
2006-03-06 05:52:03 +01:00
|
|
|
while (li1)
|
|
|
|
{
|
|
|
|
if (!new_line_sorts_after (info, li2)
|
|
|
|
&& new_line_sorts_after (info, li1))
|
|
|
|
break;
|
2002-10-23 14:41:32 +02:00
|
|
|
|
2008-02-12 01:26:00 +01:00
|
|
|
li2 = li1; /* always non-NULL */
|
2006-03-06 05:52:03 +01:00
|
|
|
li1 = li1->prev_line;
|
|
|
|
}
|
|
|
|
table->lcl_head = li2;
|
|
|
|
info->prev_line = table->lcl_head->prev_line;
|
|
|
|
table->lcl_head->prev_line = info;
|
2009-12-31 15:10:29 +01:00
|
|
|
if (address < seq->low_pc)
|
2014-04-24 14:29:56 +02:00
|
|
|
seq->low_pc = address;
|
2006-03-06 05:52:03 +01:00
|
|
|
}
|
2010-03-04 05:01:53 +01:00
|
|
|
return TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2003-03-31 20:13:25 +02:00
|
|
|
/* Extract a fully qualified filename from a line info table.
|
2003-04-01 12:18:54 +02:00
|
|
|
The returned string has been malloc'ed and it is the caller's
|
|
|
|
responsibility to free it. */
|
2003-03-31 20:13:25 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
static char *
|
2004-01-12 06:34:16 +01:00
|
|
|
concat_filename (struct line_info_table *table, unsigned int file)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2005-02-20 15:59:07 +01:00
|
|
|
char *filename;
|
1999-06-03 04:46:47 +02:00
|
|
|
|
2018-04-17 15:30:07 +02:00
|
|
|
if (table == NULL || file - 1 >= table->num_files)
|
1999-06-03 04:46:47 +02:00
|
|
|
{
|
2006-03-11 16:01:18 +01:00
|
|
|
/* FILE == 0 means unknown. */
|
|
|
|
if (file)
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: mangled line number section (bad file number)"));
|
2003-04-01 12:18:54 +02:00
|
|
|
return strdup ("<unknown>");
|
1999-06-03 04:46:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
filename = table->files[file - 1].name;
|
2017-09-26 02:08:26 +02:00
|
|
|
if (filename == NULL)
|
|
|
|
return strdup ("<unknown>");
|
2003-03-31 20:13:25 +02:00
|
|
|
|
2006-09-17 04:44:38 +02:00
|
|
|
if (!IS_ABSOLUTE_PATH (filename))
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2010-01-04 12:44:30 +01:00
|
|
|
char *dir_name = NULL;
|
|
|
|
char *subdir_name = NULL;
|
2006-09-17 04:44:38 +02:00
|
|
|
char *name;
|
|
|
|
size_t len;
|
2002-07-17 14:17:18 +02:00
|
|
|
|
2015-01-27 16:49:12 +01:00
|
|
|
if (table->files[file - 1].dir
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
/* PR 17512: file: 0317e960. */
|
|
|
|
&& table->files[file - 1].dir <= table->num_dirs
|
2015-01-27 16:49:12 +01:00
|
|
|
/* PR 17512: file: 7f3d2e4b. */
|
|
|
|
&& table->dirs != NULL)
|
2010-01-04 12:44:30 +01:00
|
|
|
subdir_name = table->dirs[table->files[file - 1].dir - 1];
|
2006-09-17 04:44:38 +02:00
|
|
|
|
2010-01-04 12:44:30 +01:00
|
|
|
if (!subdir_name || !IS_ABSOLUTE_PATH (subdir_name))
|
|
|
|
dir_name = table->comp_dir;
|
2006-09-17 04:44:38 +02:00
|
|
|
|
2010-01-04 12:44:30 +01:00
|
|
|
if (!dir_name)
|
2003-04-01 12:18:54 +02:00
|
|
|
{
|
2010-01-04 12:44:30 +01:00
|
|
|
dir_name = subdir_name;
|
|
|
|
subdir_name = NULL;
|
2006-09-17 04:44:38 +02:00
|
|
|
}
|
2003-04-01 12:18:54 +02:00
|
|
|
|
2010-01-04 12:44:30 +01:00
|
|
|
if (!dir_name)
|
2006-09-17 04:44:38 +02:00
|
|
|
return strdup (filename);
|
|
|
|
|
2010-01-04 12:44:30 +01:00
|
|
|
len = strlen (dir_name) + strlen (filename) + 2;
|
2006-09-17 04:44:38 +02:00
|
|
|
|
2010-01-04 12:44:30 +01:00
|
|
|
if (subdir_name)
|
2006-09-17 04:44:38 +02:00
|
|
|
{
|
2010-01-04 12:44:30 +01:00
|
|
|
len += strlen (subdir_name) + 1;
|
2009-09-09 23:38:59 +02:00
|
|
|
name = (char *) bfd_malloc (len);
|
2006-09-17 04:44:38 +02:00
|
|
|
if (name)
|
2010-01-04 12:44:30 +01:00
|
|
|
sprintf (name, "%s/%s/%s", dir_name, subdir_name, filename);
|
2006-09-17 04:44:38 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-09-09 23:38:59 +02:00
|
|
|
name = (char *) bfd_malloc (len);
|
2003-04-01 12:18:54 +02:00
|
|
|
if (name)
|
2010-01-04 12:44:30 +01:00
|
|
|
sprintf (name, "%s/%s", dir_name, filename);
|
2003-04-01 12:18:54 +02:00
|
|
|
}
|
2006-09-17 04:44:38 +02:00
|
|
|
|
|
|
|
return name;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2003-04-01 12:18:54 +02:00
|
|
|
|
|
|
|
return strdup (filename);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2010-03-04 05:01:53 +01:00
|
|
|
static bfd_boolean
|
2012-05-16 15:57:11 +02:00
|
|
|
arange_add (const struct comp_unit *unit, struct arange *first_arange,
|
2010-03-04 05:01:53 +01:00
|
|
|
bfd_vma low_pc, bfd_vma high_pc)
|
1999-06-26 18:05:58 +02:00
|
|
|
{
|
|
|
|
struct arange *arange;
|
|
|
|
|
2012-05-16 15:57:11 +02:00
|
|
|
/* Ignore empty ranges. */
|
|
|
|
if (low_pc == high_pc)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* If the first arange is empty, use it. */
|
2005-04-03 22:36:37 +02:00
|
|
|
if (first_arange->high == 0)
|
|
|
|
{
|
|
|
|
first_arange->low = low_pc;
|
|
|
|
first_arange->high = high_pc;
|
2010-03-04 05:01:53 +01:00
|
|
|
return TRUE;
|
2005-04-03 22:36:37 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2005-04-03 22:36:37 +02:00
|
|
|
/* Next see if we can cheaply extend an existing range. */
|
|
|
|
arange = first_arange;
|
1999-06-26 18:05:58 +02:00
|
|
|
do
|
|
|
|
{
|
|
|
|
if (low_pc == arange->high)
|
|
|
|
{
|
|
|
|
arange->high = high_pc;
|
2010-03-04 05:01:53 +01:00
|
|
|
return TRUE;
|
1999-06-26 18:05:58 +02:00
|
|
|
}
|
|
|
|
if (high_pc == arange->low)
|
|
|
|
{
|
|
|
|
arange->low = low_pc;
|
2010-03-04 05:01:53 +01:00
|
|
|
return TRUE;
|
1999-06-26 18:05:58 +02:00
|
|
|
}
|
|
|
|
arange = arange->next;
|
|
|
|
}
|
|
|
|
while (arange);
|
|
|
|
|
2005-04-03 22:36:37 +02:00
|
|
|
/* Need to allocate a new arange and insert it into the arange list.
|
2016-11-08 13:01:58 +01:00
|
|
|
Order isn't significant, so just insert after the first arange. */
|
2012-05-16 15:57:11 +02:00
|
|
|
arange = (struct arange *) bfd_alloc (unit->abfd, sizeof (*arange));
|
2010-03-04 05:01:53 +01:00
|
|
|
if (arange == NULL)
|
|
|
|
return FALSE;
|
1999-06-26 18:05:58 +02:00
|
|
|
arange->low = low_pc;
|
|
|
|
arange->high = high_pc;
|
2005-04-03 22:36:37 +02:00
|
|
|
arange->next = first_arange->next;
|
|
|
|
first_arange->next = arange;
|
2010-03-04 05:01:53 +01:00
|
|
|
return TRUE;
|
1999-06-26 18:05:58 +02:00
|
|
|
}
|
|
|
|
|
2009-12-31 15:10:29 +01:00
|
|
|
/* Compare function for line sequences. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
compare_sequences (const void* a, const void* b)
|
|
|
|
{
|
|
|
|
const struct line_sequence* seq1 = a;
|
|
|
|
const struct line_sequence* seq2 = b;
|
|
|
|
|
|
|
|
/* Sort by low_pc as the primary key. */
|
|
|
|
if (seq1->low_pc < seq2->low_pc)
|
|
|
|
return -1;
|
|
|
|
if (seq1->low_pc > seq2->low_pc)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* If low_pc values are equal, sort in reverse order of
|
|
|
|
high_pc, so that the largest region comes first. */
|
|
|
|
if (seq1->last_line->address < seq2->last_line->address)
|
|
|
|
return 1;
|
|
|
|
if (seq1->last_line->address > seq2->last_line->address)
|
|
|
|
return -1;
|
|
|
|
|
2010-04-05 21:30:00 +02:00
|
|
|
if (seq1->last_line->op_index < seq2->last_line->op_index)
|
|
|
|
return 1;
|
|
|
|
if (seq1->last_line->op_index > seq2->last_line->op_index)
|
|
|
|
return -1;
|
|
|
|
|
2009-12-31 15:10:29 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Construct the line information table for quick lookup. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
build_line_info_table (struct line_info_table * table,
|
|
|
|
struct line_sequence * seq)
|
|
|
|
{
|
|
|
|
bfd_size_type amt;
|
|
|
|
struct line_info** line_info_lookup;
|
|
|
|
struct line_info* each_line;
|
|
|
|
unsigned int num_lines;
|
2016-11-21 16:59:42 +01:00
|
|
|
unsigned int line_index;
|
2016-11-08 13:01:58 +01:00
|
|
|
|
|
|
|
if (seq->line_info_lookup != NULL)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* Count the number of line information entries. We could do this while
|
|
|
|
scanning the debug information, but some entries may be added via
|
|
|
|
lcl_head without having a sequence handy to increment the number of
|
|
|
|
lines. */
|
|
|
|
num_lines = 0;
|
|
|
|
for (each_line = seq->last_line; each_line; each_line = each_line->prev_line)
|
|
|
|
num_lines++;
|
|
|
|
|
|
|
|
if (num_lines == 0)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* Allocate space for the line information lookup table. */
|
|
|
|
amt = sizeof (struct line_info*) * num_lines;
|
|
|
|
line_info_lookup = (struct line_info**) bfd_alloc (table->abfd, amt);
|
|
|
|
if (line_info_lookup == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* Create the line information lookup table. */
|
2016-11-21 16:59:42 +01:00
|
|
|
line_index = num_lines;
|
2016-11-08 13:01:58 +01:00
|
|
|
for (each_line = seq->last_line; each_line; each_line = each_line->prev_line)
|
2016-11-21 16:59:42 +01:00
|
|
|
line_info_lookup[--line_index] = each_line;
|
2016-11-08 13:01:58 +01:00
|
|
|
|
2016-11-21 16:59:42 +01:00
|
|
|
BFD_ASSERT (line_index == 0);
|
2016-11-08 13:01:58 +01:00
|
|
|
|
|
|
|
seq->num_lines = num_lines;
|
|
|
|
seq->line_info_lookup = line_info_lookup;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2009-12-31 15:10:29 +01:00
|
|
|
/* Sort the line sequences for quick lookup. */
|
|
|
|
|
2010-03-04 05:01:53 +01:00
|
|
|
static bfd_boolean
|
2009-12-31 15:10:29 +01:00
|
|
|
sort_line_sequences (struct line_info_table* table)
|
|
|
|
{
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
bfd_size_type amt;
|
|
|
|
struct line_sequence* sequences;
|
|
|
|
struct line_sequence* seq;
|
|
|
|
unsigned int n = 0;
|
|
|
|
unsigned int num_sequences = table->num_sequences;
|
|
|
|
bfd_vma last_high_pc;
|
2009-12-31 15:10:29 +01:00
|
|
|
|
|
|
|
if (num_sequences == 0)
|
2010-03-04 05:01:53 +01:00
|
|
|
return TRUE;
|
2009-12-31 15:10:29 +01:00
|
|
|
|
|
|
|
/* Allocate space for an array of sequences. */
|
|
|
|
amt = sizeof (struct line_sequence) * num_sequences;
|
|
|
|
sequences = (struct line_sequence *) bfd_alloc (table->abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (sequences == NULL)
|
|
|
|
return FALSE;
|
2009-12-31 15:10:29 +01:00
|
|
|
|
|
|
|
/* Copy the linked list into the array, freeing the original nodes. */
|
|
|
|
seq = table->sequences;
|
|
|
|
for (n = 0; n < num_sequences; n++)
|
|
|
|
{
|
|
|
|
struct line_sequence* last_seq = seq;
|
|
|
|
|
|
|
|
BFD_ASSERT (seq);
|
|
|
|
sequences[n].low_pc = seq->low_pc;
|
|
|
|
sequences[n].prev_sequence = NULL;
|
|
|
|
sequences[n].last_line = seq->last_line;
|
2016-11-08 13:01:58 +01:00
|
|
|
sequences[n].line_info_lookup = NULL;
|
|
|
|
sequences[n].num_lines = 0;
|
2009-12-31 15:10:29 +01:00
|
|
|
seq = seq->prev_sequence;
|
|
|
|
free (last_seq);
|
|
|
|
}
|
|
|
|
BFD_ASSERT (seq == NULL);
|
|
|
|
|
|
|
|
qsort (sequences, n, sizeof (struct line_sequence), compare_sequences);
|
|
|
|
|
|
|
|
/* Make the list binary-searchable by trimming overlapping entries
|
|
|
|
and removing nested entries. */
|
|
|
|
num_sequences = 1;
|
|
|
|
last_high_pc = sequences[0].last_line->address;
|
|
|
|
for (n = 1; n < table->num_sequences; n++)
|
|
|
|
{
|
|
|
|
if (sequences[n].low_pc < last_high_pc)
|
2014-04-24 14:29:56 +02:00
|
|
|
{
|
2009-12-31 15:10:29 +01:00
|
|
|
if (sequences[n].last_line->address <= last_high_pc)
|
|
|
|
/* Skip nested entries. */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Trim overlapping entries. */
|
|
|
|
sequences[n].low_pc = last_high_pc;
|
2014-04-24 14:29:56 +02:00
|
|
|
}
|
2009-12-31 15:10:29 +01:00
|
|
|
last_high_pc = sequences[n].last_line->address;
|
|
|
|
if (n > num_sequences)
|
2014-04-24 14:29:56 +02:00
|
|
|
{
|
|
|
|
/* Close up the gap. */
|
|
|
|
sequences[num_sequences].low_pc = sequences[n].low_pc;
|
|
|
|
sequences[num_sequences].last_line = sequences[n].last_line;
|
|
|
|
}
|
2009-12-31 15:10:29 +01:00
|
|
|
num_sequences++;
|
|
|
|
}
|
|
|
|
|
|
|
|
table->sequences = sequences;
|
|
|
|
table->num_sequences = num_sequences;
|
2010-03-04 05:01:53 +01:00
|
|
|
return TRUE;
|
2009-12-31 15:10:29 +01:00
|
|
|
}
|
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
/* Add directory to TABLE. CUR_DIR memory ownership is taken by TABLE. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
line_info_add_include_dir (struct line_info_table *table, char *cur_dir)
|
|
|
|
{
|
|
|
|
if ((table->num_dirs % DIR_ALLOC_CHUNK) == 0)
|
|
|
|
{
|
|
|
|
char **tmp;
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
|
|
|
amt = table->num_dirs + DIR_ALLOC_CHUNK;
|
|
|
|
amt *= sizeof (char *);
|
|
|
|
|
|
|
|
tmp = (char **) bfd_realloc (table->dirs, amt);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return FALSE;
|
|
|
|
table->dirs = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
table->dirs[table->num_dirs++] = cur_dir;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
line_info_add_include_dir_stub (struct line_info_table *table, char *cur_dir,
|
|
|
|
unsigned int dir ATTRIBUTE_UNUSED,
|
2017-07-05 18:04:51 +02:00
|
|
|
unsigned int xtime ATTRIBUTE_UNUSED,
|
2017-07-04 10:09:27 +02:00
|
|
|
unsigned int size ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
return line_info_add_include_dir (table, cur_dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add file to TABLE. CUR_FILE memory ownership is taken by TABLE. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
line_info_add_file_name (struct line_info_table *table, char *cur_file,
|
2017-07-05 18:04:51 +02:00
|
|
|
unsigned int dir, unsigned int xtime,
|
|
|
|
unsigned int size)
|
2017-07-04 10:09:27 +02:00
|
|
|
{
|
|
|
|
if ((table->num_files % FILE_ALLOC_CHUNK) == 0)
|
|
|
|
{
|
|
|
|
struct fileinfo *tmp;
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
|
|
|
amt = table->num_files + FILE_ALLOC_CHUNK;
|
|
|
|
amt *= sizeof (struct fileinfo);
|
|
|
|
|
|
|
|
tmp = (struct fileinfo *) bfd_realloc (table->files, amt);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return FALSE;
|
|
|
|
table->files = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
table->files[table->num_files].name = cur_file;
|
|
|
|
table->files[table->num_files].dir = dir;
|
2017-07-05 18:04:51 +02:00
|
|
|
table->files[table->num_files].time = xtime;
|
2017-07-04 10:09:27 +02:00
|
|
|
table->files[table->num_files].size = size;
|
|
|
|
table->num_files++;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read directory or file name entry format, starting with byte of
|
|
|
|
format count entries, ULEB128 pairs of entry formats, ULEB128 of
|
|
|
|
entries count and the entries themselves in the described entry
|
|
|
|
format. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
read_formatted_entries (struct comp_unit *unit, bfd_byte **bufp,
|
|
|
|
bfd_byte *buf_end, struct line_info_table *table,
|
|
|
|
bfd_boolean (*callback) (struct line_info_table *table,
|
|
|
|
char *cur_file,
|
|
|
|
unsigned int dir,
|
|
|
|
unsigned int time,
|
|
|
|
unsigned int size))
|
|
|
|
{
|
|
|
|
bfd *abfd = unit->abfd;
|
|
|
|
bfd_byte format_count, formati;
|
|
|
|
bfd_vma data_count, datai;
|
|
|
|
bfd_byte *buf = *bufp;
|
|
|
|
bfd_byte *format_header_data;
|
|
|
|
unsigned int bytes_read;
|
|
|
|
|
|
|
|
format_count = read_1_byte (abfd, buf, buf_end);
|
|
|
|
buf += 1;
|
|
|
|
format_header_data = buf;
|
|
|
|
for (formati = 0; formati < format_count; formati++)
|
|
|
|
{
|
|
|
|
_bfd_safe_read_leb128 (abfd, buf, &bytes_read, FALSE, buf_end);
|
|
|
|
buf += bytes_read;
|
|
|
|
_bfd_safe_read_leb128 (abfd, buf, &bytes_read, FALSE, buf_end);
|
|
|
|
buf += bytes_read;
|
|
|
|
}
|
|
|
|
|
|
|
|
data_count = _bfd_safe_read_leb128 (abfd, buf, &bytes_read, FALSE, buf_end);
|
|
|
|
buf += bytes_read;
|
2017-09-25 11:33:46 +02:00
|
|
|
if (format_count == 0 && data_count != 0)
|
|
|
|
{
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
_bfd_error_handler (_("DWARF error: zero format count"));
|
2017-09-25 11:33:46 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2017-09-26 15:37:47 +02:00
|
|
|
/* PR 22210. Paranoia check. Don't bother running the loop
|
|
|
|
if we know that we are going to run out of buffer. */
|
|
|
|
if (data_count > (bfd_vma) (buf_end - buf))
|
|
|
|
{
|
%L conversions
* bfd-in.h: Include inttypes.h or if not available define
PRId64, PRIu64 and PRIx64.
* bfd.c (_bfd_doprnt, _bfd_doprnt_scan): Remove support for L
modifier to print bfd_vma.
* coff-arm.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic80.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * dwarf2.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-bfin.c, * elf32-cris.c, * elf32-hppa.c,
* elf32-i386.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32r.c,
* elf32-m68k.c, * elf32-metag.c, * elf32-nds32.c, * elf32-nios2.c,
* elf32-ppc.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-sh64.c, * elf32-spu.c,
* elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c,
* elf32-xtensa.c, * elf64-alpha.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mmix.c, * elf64-s390.c, * elf64-sh64.c, * elf64-x86-64.c,
* elfcode.h, * elfcore.h, * elflink.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * ieee.c, * ihex.c, * mach-o.c, * merge.c, * mmo.c,
* peXXigen.c, * xcofflink.c: Replace use of Lx modifier with PRIx64,
and cast input to uint64_t, and similarly for Ld and Lu.
* bfd-in2.h: Regenerate.
2018-02-19 09:04:15 +01:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: data count (%" PRIx64 ") larger than buffer size"),
|
%L conversions
* bfd-in.h: Include inttypes.h or if not available define
PRId64, PRIu64 and PRIx64.
* bfd.c (_bfd_doprnt, _bfd_doprnt_scan): Remove support for L
modifier to print bfd_vma.
* coff-arm.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic80.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * dwarf2.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-bfin.c, * elf32-cris.c, * elf32-hppa.c,
* elf32-i386.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32r.c,
* elf32-m68k.c, * elf32-metag.c, * elf32-nds32.c, * elf32-nios2.c,
* elf32-ppc.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-sh64.c, * elf32-spu.c,
* elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c,
* elf32-xtensa.c, * elf64-alpha.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mmix.c, * elf64-s390.c, * elf64-sh64.c, * elf64-x86-64.c,
* elfcode.h, * elfcore.h, * elflink.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * ieee.c, * ihex.c, * mach-o.c, * merge.c, * mmo.c,
* peXXigen.c, * xcofflink.c: Replace use of Lx modifier with PRIx64,
and cast input to uint64_t, and similarly for Ld and Lu.
* bfd-in2.h: Regenerate.
2018-02-19 09:04:15 +01:00
|
|
|
(uint64_t) data_count);
|
2017-09-26 15:37:47 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
for (datai = 0; datai < data_count; datai++)
|
|
|
|
{
|
|
|
|
bfd_byte *format = format_header_data;
|
|
|
|
struct fileinfo fe;
|
|
|
|
|
2017-09-26 02:08:26 +02:00
|
|
|
memset (&fe, 0, sizeof fe);
|
2017-07-04 10:09:27 +02:00
|
|
|
for (formati = 0; formati < format_count; formati++)
|
|
|
|
{
|
|
|
|
bfd_vma content_type, form;
|
|
|
|
char *string_trash;
|
|
|
|
char **stringp = &string_trash;
|
|
|
|
unsigned int uint_trash, *uintp = &uint_trash;
|
2017-09-26 15:50:06 +02:00
|
|
|
struct attribute attr;
|
2017-07-04 10:09:27 +02:00
|
|
|
|
|
|
|
content_type = _bfd_safe_read_leb128 (abfd, format, &bytes_read,
|
|
|
|
FALSE, buf_end);
|
|
|
|
format += bytes_read;
|
|
|
|
switch (content_type)
|
|
|
|
{
|
|
|
|
case DW_LNCT_path:
|
|
|
|
stringp = &fe.name;
|
|
|
|
break;
|
|
|
|
case DW_LNCT_directory_index:
|
|
|
|
uintp = &fe.dir;
|
|
|
|
break;
|
|
|
|
case DW_LNCT_timestamp:
|
|
|
|
uintp = &fe.time;
|
|
|
|
break;
|
|
|
|
case DW_LNCT_size:
|
|
|
|
uintp = &fe.size;
|
|
|
|
break;
|
|
|
|
case DW_LNCT_MD5:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: unknown format content type %" PRIu64),
|
%L conversions
* bfd-in.h: Include inttypes.h or if not available define
PRId64, PRIu64 and PRIx64.
* bfd.c (_bfd_doprnt, _bfd_doprnt_scan): Remove support for L
modifier to print bfd_vma.
* coff-arm.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic80.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * dwarf2.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-bfin.c, * elf32-cris.c, * elf32-hppa.c,
* elf32-i386.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32r.c,
* elf32-m68k.c, * elf32-metag.c, * elf32-nds32.c, * elf32-nios2.c,
* elf32-ppc.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-sh64.c, * elf32-spu.c,
* elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c,
* elf32-xtensa.c, * elf64-alpha.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mmix.c, * elf64-s390.c, * elf64-sh64.c, * elf64-x86-64.c,
* elfcode.h, * elfcore.h, * elflink.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * ieee.c, * ihex.c, * mach-o.c, * merge.c, * mmo.c,
* peXXigen.c, * xcofflink.c: Replace use of Lx modifier with PRIx64,
and cast input to uint64_t, and similarly for Ld and Lu.
* bfd-in2.h: Regenerate.
2018-02-19 09:04:15 +01:00
|
|
|
(uint64_t) content_type);
|
2017-07-04 10:09:27 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
form = _bfd_safe_read_leb128 (abfd, format, &bytes_read, FALSE,
|
|
|
|
buf_end);
|
|
|
|
format += bytes_read;
|
2017-09-26 15:50:06 +02:00
|
|
|
|
|
|
|
buf = read_attribute_value (&attr, form, 0, unit, buf, buf_end);
|
|
|
|
if (buf == NULL)
|
|
|
|
return FALSE;
|
2017-07-04 10:09:27 +02:00
|
|
|
switch (form)
|
|
|
|
{
|
|
|
|
case DW_FORM_string:
|
|
|
|
case DW_FORM_line_strp:
|
2017-09-26 15:50:06 +02:00
|
|
|
*stringp = attr.u.str;
|
2017-07-04 10:09:27 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_FORM_data1:
|
|
|
|
case DW_FORM_data2:
|
|
|
|
case DW_FORM_data4:
|
|
|
|
case DW_FORM_data8:
|
|
|
|
case DW_FORM_udata:
|
2017-09-26 15:50:06 +02:00
|
|
|
*uintp = attr.u.val;
|
2017-07-04 10:09:27 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!callback (table, fe.name, fe.dir, fe.time, fe.size))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
*bufp = buf;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2008-02-22 16:27:38 +01:00
|
|
|
/* Decode the line number information for UNIT. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2008-02-22 16:27:38 +01:00
|
|
|
static struct line_info_table*
|
2004-01-12 06:34:16 +01:00
|
|
|
decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
bfd *abfd = unit->abfd;
|
|
|
|
struct line_info_table* table;
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *line_ptr;
|
|
|
|
bfd_byte *line_end;
|
1999-05-03 09:29:11 +02:00
|
|
|
struct line_head lh;
|
2001-11-14 12:16:47 +01:00
|
|
|
unsigned int i, bytes_read, offset_size;
|
1999-05-03 09:29:11 +02:00
|
|
|
char *cur_file, *cur_dir;
|
|
|
|
unsigned char op_code, extended_op, adj_opcode;
|
2012-05-03 14:49:22 +02:00
|
|
|
unsigned int exop_len;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
bfd_size_type amt;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2011-09-30 12:39:45 +02:00
|
|
|
if (! read_section (abfd, &stash->debug_sections[debug_line],
|
2014-04-24 14:29:56 +02:00
|
|
|
stash->syms, unit->line_offset,
|
2008-09-05 19:55:07 +02:00
|
|
|
&stash->dwarf_line_buffer, &stash->dwarf_line_size))
|
2010-03-04 05:01:53 +01:00
|
|
|
return NULL;
|
2000-04-07 20:36:04 +02:00
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = sizeof (struct line_info_table);
|
2009-09-09 23:38:59 +02:00
|
|
|
table = (struct line_info_table *) bfd_alloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (table == NULL)
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
table->abfd = abfd;
|
|
|
|
table->comp_dir = unit->comp_dir;
|
|
|
|
|
|
|
|
table->num_files = 0;
|
|
|
|
table->files = NULL;
|
|
|
|
|
|
|
|
table->num_dirs = 0;
|
|
|
|
table->dirs = NULL;
|
|
|
|
|
2009-12-31 15:10:29 +01:00
|
|
|
table->num_sequences = 0;
|
|
|
|
table->sequences = NULL;
|
|
|
|
|
2002-10-23 14:41:32 +02:00
|
|
|
table->lcl_head = NULL;
|
1999-06-03 04:46:47 +02:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (stash->dwarf_line_size < 16)
|
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: line info section is too small (%" PRId64 ")"),
|
%L conversions
* bfd-in.h: Include inttypes.h or if not available define
PRId64, PRIu64 and PRIx64.
* bfd.c (_bfd_doprnt, _bfd_doprnt_scan): Remove support for L
modifier to print bfd_vma.
* coff-arm.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic80.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * dwarf2.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-bfin.c, * elf32-cris.c, * elf32-hppa.c,
* elf32-i386.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32r.c,
* elf32-m68k.c, * elf32-metag.c, * elf32-nds32.c, * elf32-nios2.c,
* elf32-ppc.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-sh64.c, * elf32-spu.c,
* elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c,
* elf32-xtensa.c, * elf64-alpha.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mmix.c, * elf64-s390.c, * elf64-sh64.c, * elf64-x86-64.c,
* elfcode.h, * elfcore.h, * elflink.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * ieee.c, * ihex.c, * mach-o.c, * merge.c, * mmo.c,
* peXXigen.c, * xcofflink.c: Replace use of Lx modifier with PRIx64,
and cast input to uint64_t, and similarly for Ld and Lu.
* bfd-in2.h: Regenerate.
2018-02-19 09:04:15 +01:00
|
|
|
(int64_t) stash->dwarf_line_size);
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return NULL;
|
|
|
|
}
|
1999-06-26 17:48:47 +02:00
|
|
|
line_ptr = stash->dwarf_line_buffer + unit->line_offset;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
line_end = stash->dwarf_line_buffer + stash->dwarf_line_size;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Read in the prologue. */
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
lh.total_length = read_4_bytes (abfd, line_ptr, line_end);
|
2002-06-27 13:51:42 +02:00
|
|
|
line_ptr += 4;
|
|
|
|
offset_size = 4;
|
|
|
|
if (lh.total_length == 0xffffffff)
|
2002-06-25 21:10:00 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
lh.total_length = read_8_bytes (abfd, line_ptr, line_end);
|
2002-06-25 21:10:00 +02:00
|
|
|
line_ptr += 8;
|
|
|
|
offset_size = 8;
|
|
|
|
}
|
2002-06-27 13:51:42 +02:00
|
|
|
else if (lh.total_length == 0 && unit->addr_size == 8)
|
2001-11-14 12:16:47 +01:00
|
|
|
{
|
2002-06-27 13:51:42 +02:00
|
|
|
/* Handle (non-standard) 64-bit DWARF2 formats. */
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
lh.total_length = read_4_bytes (abfd, line_ptr, line_end);
|
2002-06-27 13:51:42 +02:00
|
|
|
line_ptr += 4;
|
2001-11-14 12:16:47 +01:00
|
|
|
offset_size = 8;
|
|
|
|
}
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
2017-09-24 07:06:16 +02:00
|
|
|
if (lh.total_length > (size_t) (line_end - line_ptr))
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
2016-10-19 15:04:34 +02:00
|
|
|
/* xgettext: c-format */
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: line info data is bigger (%#" PRIx64 ")"
|
2017-09-24 07:06:16 +02:00
|
|
|
" than the space remaining in the section (%#lx)"),
|
%L conversions
* bfd-in.h: Include inttypes.h or if not available define
PRId64, PRIu64 and PRIx64.
* bfd.c (_bfd_doprnt, _bfd_doprnt_scan): Remove support for L
modifier to print bfd_vma.
* coff-arm.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic80.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * dwarf2.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-bfin.c, * elf32-cris.c, * elf32-hppa.c,
* elf32-i386.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32r.c,
* elf32-m68k.c, * elf32-metag.c, * elf32-nds32.c, * elf32-nios2.c,
* elf32-ppc.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-sh64.c, * elf32-spu.c,
* elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c,
* elf32-xtensa.c, * elf64-alpha.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mmix.c, * elf64-s390.c, * elf64-sh64.c, * elf64-x86-64.c,
* elfcode.h, * elfcore.h, * elflink.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * ieee.c, * ihex.c, * mach-o.c, * merge.c, * mmo.c,
* peXXigen.c, * xcofflink.c: Replace use of Lx modifier with PRIx64,
and cast input to uint64_t, and similarly for Ld and Lu.
* bfd-in2.h: Regenerate.
2018-02-19 09:04:15 +01:00
|
|
|
(uint64_t) lh.total_length, (unsigned long) (line_end - line_ptr));
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-02-15 09:32:46 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
line_end = line_ptr + lh.total_length;
|
2015-02-15 09:32:46 +01:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
lh.version = read_2_bytes (abfd, line_ptr, line_end);
|
2017-07-04 10:09:27 +02:00
|
|
|
if (lh.version < 2 || lh.version > 5)
|
2010-04-05 21:30:00 +02:00
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: unhandled .debug_line version %d"), lh.version);
|
2010-04-05 21:30:00 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return NULL;
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 2;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
if (line_ptr + offset_size + (lh.version >= 5 ? 8 : (lh.version >= 4 ? 6 : 5))
|
|
|
|
>= line_end)
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: ran out of room reading prologue"));
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
if (lh.version >= 5)
|
|
|
|
{
|
|
|
|
unsigned int segment_selector_size;
|
|
|
|
|
|
|
|
/* Skip address size. */
|
|
|
|
read_1_byte (abfd, line_ptr, line_end);
|
|
|
|
line_ptr += 1;
|
|
|
|
|
|
|
|
segment_selector_size = read_1_byte (abfd, line_ptr, line_end);
|
|
|
|
line_ptr += 1;
|
|
|
|
if (segment_selector_size != 0)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: line info unsupported segment selector size %u"),
|
2017-07-04 10:09:27 +02:00
|
|
|
segment_selector_size);
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-11-14 12:16:47 +01:00
|
|
|
if (offset_size == 4)
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
lh.prologue_length = read_4_bytes (abfd, line_ptr, line_end);
|
2001-11-14 12:16:47 +01:00
|
|
|
else
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
lh.prologue_length = read_8_bytes (abfd, line_ptr, line_end);
|
2001-11-14 12:16:47 +01:00
|
|
|
line_ptr += offset_size;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
|
|
|
lh.minimum_instruction_length = read_1_byte (abfd, line_ptr, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 1;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
2010-04-05 21:30:00 +02:00
|
|
|
if (lh.version >= 4)
|
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
lh.maximum_ops_per_insn = read_1_byte (abfd, line_ptr, line_end);
|
2010-04-05 21:30:00 +02:00
|
|
|
line_ptr += 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
lh.maximum_ops_per_insn = 1;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
2010-04-05 21:30:00 +02:00
|
|
|
if (lh.maximum_ops_per_insn == 0)
|
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: invalid maximum operations per instruction"));
|
2010-04-05 21:30:00 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return NULL;
|
|
|
|
}
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
|
|
|
lh.default_is_stmt = read_1_byte (abfd, line_ptr, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 1;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
|
|
|
lh.line_base = read_1_signed_byte (abfd, line_ptr, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 1;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
|
|
|
lh.line_range = read_1_byte (abfd, line_ptr, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 1;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
|
|
|
lh.opcode_base = read_1_byte (abfd, line_ptr, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 1;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
|
|
|
if (line_ptr + (lh.opcode_base - 1) >= line_end)
|
|
|
|
{
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
_bfd_error_handler (_("DWARF error: ran out of room reading opcodes"));
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-02-15 09:32:46 +01:00
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = lh.opcode_base * sizeof (unsigned char);
|
2009-09-09 23:38:59 +02:00
|
|
|
lh.standard_opcode_lengths = (unsigned char *) bfd_alloc (abfd, amt);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
lh.standard_opcode_lengths[0] = 1;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
for (i = 1; i < lh.opcode_base; ++i)
|
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
lh.standard_opcode_lengths[i] = read_1_byte (abfd, line_ptr, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 1;
|
|
|
|
}
|
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
if (lh.version >= 5)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2017-07-04 10:09:27 +02:00
|
|
|
/* Read directory table. */
|
|
|
|
if (!read_formatted_entries (unit, &line_ptr, line_end, table,
|
|
|
|
line_info_add_include_dir_stub))
|
|
|
|
goto fail;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
/* Read file name table. */
|
|
|
|
if (!read_formatted_entries (unit, &line_ptr, line_end, table,
|
|
|
|
line_info_add_file_name))
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Read directory table. */
|
|
|
|
while ((cur_dir = read_string (abfd, line_ptr, line_end, &bytes_read)) != NULL)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2017-07-04 10:09:27 +02:00
|
|
|
line_ptr += bytes_read;
|
2005-05-05 16:25:23 +02:00
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
if (!line_info_add_include_dir (table, cur_dir))
|
2010-03-04 05:01:53 +01:00
|
|
|
goto fail;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
/* Read file name table. */
|
|
|
|
while ((cur_file = read_string (abfd, line_ptr, line_end, &bytes_read)) != NULL)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2017-07-05 18:04:51 +02:00
|
|
|
unsigned int dir, xtime, size;
|
2017-07-04 10:09:27 +02:00
|
|
|
|
|
|
|
line_ptr += bytes_read;
|
2005-05-05 16:25:23 +02:00
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
dir = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read, FALSE, line_end);
|
|
|
|
line_ptr += bytes_read;
|
2017-07-05 18:04:51 +02:00
|
|
|
xtime = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read, FALSE, line_end);
|
2017-07-04 10:09:27 +02:00
|
|
|
line_ptr += bytes_read;
|
|
|
|
size = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read, FALSE, line_end);
|
|
|
|
line_ptr += bytes_read;
|
2005-05-05 16:25:23 +02:00
|
|
|
|
2017-07-05 18:04:51 +02:00
|
|
|
if (!line_info_add_file_name (table, cur_file, dir, xtime, size))
|
2010-03-04 05:01:53 +01:00
|
|
|
goto fail;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
/* Read the statement sequences until there's nothing left. */
|
|
|
|
while (line_ptr < line_end)
|
|
|
|
{
|
2000-09-02 22:21:40 +02:00
|
|
|
/* State machine registers. */
|
1999-05-03 09:29:11 +02:00
|
|
|
bfd_vma address = 0;
|
2010-04-05 21:30:00 +02:00
|
|
|
unsigned char op_index = 0;
|
2003-09-19 11:01:53 +02:00
|
|
|
char * filename = table->num_files ? concat_filename (table, 1) : NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
unsigned int line = 1;
|
|
|
|
unsigned int column = 0;
|
2012-07-24 23:06:58 +02:00
|
|
|
unsigned int discriminator = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
int is_stmt = lh.default_is_stmt;
|
2002-09-23 18:13:52 +02:00
|
|
|
int end_sequence = 0;
|
2017-09-26 02:08:26 +02:00
|
|
|
unsigned int dir, xtime, size;
|
2002-09-23 18:13:52 +02:00
|
|
|
/* eraxxon@alumni.rice.edu: Against the DWARF2 specs, some
|
2002-10-23 14:41:32 +02:00
|
|
|
compilers generate address sequences that are wildly out of
|
|
|
|
order using DW_LNE_set_address (e.g. Intel C++ 6.0 compiler
|
|
|
|
for ia64-Linux). Thus, to determine the low and high
|
|
|
|
address, we must compare on every DW_LNS_copy, etc. */
|
2005-06-10 12:14:23 +02:00
|
|
|
bfd_vma low_pc = (bfd_vma) -1;
|
2002-09-23 18:13:52 +02:00
|
|
|
bfd_vma high_pc = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Decode the table. */
|
2017-09-26 02:02:18 +02:00
|
|
|
while (!end_sequence && line_ptr < line_end)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
op_code = read_1_byte (abfd, line_ptr, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 1;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2001-11-13 21:13:30 +01:00
|
|
|
if (op_code >= lh.opcode_base)
|
2002-09-23 18:13:52 +02:00
|
|
|
{
|
|
|
|
/* Special operand. */
|
2001-11-13 21:13:30 +01:00
|
|
|
adj_opcode = op_code - lh.opcode_base;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (lh.line_range == 0)
|
|
|
|
goto line_fail;
|
2010-04-05 21:30:00 +02:00
|
|
|
if (lh.maximum_ops_per_insn == 1)
|
2012-05-16 15:57:11 +02:00
|
|
|
address += (adj_opcode / lh.line_range
|
|
|
|
* lh.minimum_instruction_length);
|
2010-04-05 21:30:00 +02:00
|
|
|
else
|
|
|
|
{
|
2012-05-16 15:57:11 +02:00
|
|
|
address += ((op_index + adj_opcode / lh.line_range)
|
|
|
|
/ lh.maximum_ops_per_insn
|
|
|
|
* lh.minimum_instruction_length);
|
|
|
|
op_index = ((op_index + adj_opcode / lh.line_range)
|
|
|
|
% lh.maximum_ops_per_insn);
|
2010-04-05 21:30:00 +02:00
|
|
|
}
|
2001-11-13 21:13:30 +01:00
|
|
|
line += lh.line_base + (adj_opcode % lh.line_range);
|
|
|
|
/* Append row to matrix using current values. */
|
2010-04-05 21:30:00 +02:00
|
|
|
if (!add_line_info (table, address, op_index, filename,
|
2012-07-24 23:06:58 +02:00
|
|
|
line, column, discriminator, 0))
|
2010-03-04 05:01:53 +01:00
|
|
|
goto line_fail;
|
2014-04-24 14:29:56 +02:00
|
|
|
discriminator = 0;
|
2005-06-10 12:14:23 +02:00
|
|
|
if (address < low_pc)
|
|
|
|
low_pc = address;
|
2002-09-23 18:13:52 +02:00
|
|
|
if (address > high_pc)
|
|
|
|
high_pc = address;
|
2001-11-13 21:13:30 +01:00
|
|
|
}
|
|
|
|
else switch (op_code)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
case DW_LNS_extended_op:
|
2017-02-17 02:26:11 +01:00
|
|
|
exop_len = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
FALSE, line_end);
|
2012-05-03 14:49:22 +02:00
|
|
|
line_ptr += bytes_read;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
extended_op = read_1_byte (abfd, line_ptr, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 1;
|
2002-09-23 18:13:52 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
switch (extended_op)
|
|
|
|
{
|
|
|
|
case DW_LNE_end_sequence:
|
|
|
|
end_sequence = 1;
|
2012-07-24 23:06:58 +02:00
|
|
|
if (!add_line_info (table, address, op_index, filename, line,
|
|
|
|
column, discriminator, end_sequence))
|
2010-03-04 05:01:53 +01:00
|
|
|
goto line_fail;
|
2014-04-24 14:29:56 +02:00
|
|
|
discriminator = 0;
|
2005-06-10 12:14:23 +02:00
|
|
|
if (address < low_pc)
|
|
|
|
low_pc = address;
|
2002-09-23 18:13:52 +02:00
|
|
|
if (address > high_pc)
|
|
|
|
high_pc = address;
|
2012-05-16 15:57:11 +02:00
|
|
|
if (!arange_add (unit, &unit->arange, low_pc, high_pc))
|
2010-03-04 05:01:53 +01:00
|
|
|
goto line_fail;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
case DW_LNE_set_address:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
address = read_address (unit, line_ptr, line_end);
|
2010-04-05 21:30:00 +02:00
|
|
|
op_index = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += unit->addr_size;
|
|
|
|
break;
|
|
|
|
case DW_LNE_define_file:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
cur_file = read_string (abfd, line_ptr, line_end, &bytes_read);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
2017-09-26 02:08:26 +02:00
|
|
|
dir = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
FALSE, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
2017-09-26 02:08:26 +02:00
|
|
|
xtime = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
FALSE, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
2017-09-26 02:08:26 +02:00
|
|
|
size = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
FALSE, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
2017-09-26 02:08:26 +02:00
|
|
|
if (!line_info_add_file_name (table, cur_file, dir,
|
|
|
|
xtime, size))
|
|
|
|
goto line_fail;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
2009-07-03 19:02:43 +02:00
|
|
|
case DW_LNE_set_discriminator:
|
2012-07-24 23:06:58 +02:00
|
|
|
discriminator =
|
2017-02-17 02:26:11 +01:00
|
|
|
_bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
FALSE, line_end);
|
2009-07-03 19:02:43 +02:00
|
|
|
line_ptr += bytes_read;
|
|
|
|
break;
|
2012-05-16 15:57:11 +02:00
|
|
|
case DW_LNE_HP_source_file_correlation:
|
|
|
|
line_ptr += exop_len - 1;
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
default:
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: mangled line number section"));
|
1999-05-03 09:29:11 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2010-03-04 05:01:53 +01:00
|
|
|
line_fail:
|
|
|
|
if (filename != NULL)
|
|
|
|
free (filename);
|
|
|
|
goto fail;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DW_LNS_copy:
|
2010-04-05 21:30:00 +02:00
|
|
|
if (!add_line_info (table, address, op_index,
|
2012-07-24 23:06:58 +02:00
|
|
|
filename, line, column, discriminator, 0))
|
2010-03-04 05:01:53 +01:00
|
|
|
goto line_fail;
|
2014-04-24 14:29:56 +02:00
|
|
|
discriminator = 0;
|
2005-06-10 12:14:23 +02:00
|
|
|
if (address < low_pc)
|
|
|
|
low_pc = address;
|
2002-09-23 18:13:52 +02:00
|
|
|
if (address > high_pc)
|
|
|
|
high_pc = address;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
case DW_LNS_advance_pc:
|
2010-04-05 21:30:00 +02:00
|
|
|
if (lh.maximum_ops_per_insn == 1)
|
2012-05-16 15:57:11 +02:00
|
|
|
address += (lh.minimum_instruction_length
|
2017-02-17 02:26:11 +01:00
|
|
|
* _bfd_safe_read_leb128 (abfd, line_ptr,
|
|
|
|
&bytes_read,
|
|
|
|
FALSE, line_end));
|
2010-04-05 21:30:00 +02:00
|
|
|
else
|
|
|
|
{
|
2017-02-17 02:26:11 +01:00
|
|
|
bfd_vma adjust = _bfd_safe_read_leb128 (abfd, line_ptr,
|
|
|
|
&bytes_read,
|
|
|
|
FALSE, line_end);
|
2012-05-16 15:57:11 +02:00
|
|
|
address = ((op_index + adjust) / lh.maximum_ops_per_insn
|
|
|
|
* lh.minimum_instruction_length);
|
2010-04-05 21:30:00 +02:00
|
|
|
op_index = (op_index + adjust) % lh.maximum_ops_per_insn;
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
|
|
|
break;
|
|
|
|
case DW_LNS_advance_line:
|
2017-02-17 02:26:11 +01:00
|
|
|
line += _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
TRUE, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
|
|
|
break;
|
|
|
|
case DW_LNS_set_file:
|
|
|
|
{
|
|
|
|
unsigned int file;
|
|
|
|
|
2002-09-23 18:13:52 +02:00
|
|
|
/* The file and directory tables are 0
|
|
|
|
based, the references are 1 based. */
|
2017-02-17 02:26:11 +01:00
|
|
|
file = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
FALSE, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
2003-04-01 12:18:54 +02:00
|
|
|
if (filename)
|
|
|
|
free (filename);
|
1999-05-03 09:29:11 +02:00
|
|
|
filename = concat_filename (table, file);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case DW_LNS_set_column:
|
2017-02-17 02:26:11 +01:00
|
|
|
column = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
FALSE, line_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += bytes_read;
|
|
|
|
break;
|
|
|
|
case DW_LNS_negate_stmt:
|
|
|
|
is_stmt = (!is_stmt);
|
|
|
|
break;
|
|
|
|
case DW_LNS_set_basic_block:
|
|
|
|
break;
|
|
|
|
case DW_LNS_const_add_pc:
|
2017-09-24 07:06:48 +02:00
|
|
|
if (lh.line_range == 0)
|
|
|
|
goto line_fail;
|
2010-04-05 21:30:00 +02:00
|
|
|
if (lh.maximum_ops_per_insn == 1)
|
2012-05-16 15:57:11 +02:00
|
|
|
address += (lh.minimum_instruction_length
|
|
|
|
* ((255 - lh.opcode_base) / lh.line_range));
|
2010-04-05 21:30:00 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_vma adjust = ((255 - lh.opcode_base) / lh.line_range);
|
2012-05-16 15:57:11 +02:00
|
|
|
address += (lh.minimum_instruction_length
|
|
|
|
* ((op_index + adjust)
|
|
|
|
/ lh.maximum_ops_per_insn));
|
2010-04-05 21:30:00 +02:00
|
|
|
op_index = (op_index + adjust) % lh.maximum_ops_per_insn;
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
case DW_LNS_fixed_advance_pc:
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
address += read_2_bytes (abfd, line_ptr, line_end);
|
2010-04-05 21:30:00 +02:00
|
|
|
op_index = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
line_ptr += 2;
|
|
|
|
break;
|
2001-11-13 21:13:30 +01:00
|
|
|
default:
|
2009-12-11 14:42:17 +01:00
|
|
|
/* Unknown standard opcode, ignore it. */
|
|
|
|
for (i = 0; i < lh.standard_opcode_lengths[op_code]; i++)
|
|
|
|
{
|
2017-02-17 02:26:11 +01:00
|
|
|
(void) _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read,
|
|
|
|
FALSE, line_end);
|
2009-12-11 14:42:17 +01:00
|
|
|
line_ptr += bytes_read;
|
|
|
|
}
|
|
|
|
break;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
}
|
2003-03-31 20:13:25 +02:00
|
|
|
|
2003-04-01 12:18:54 +02:00
|
|
|
if (filename)
|
|
|
|
free (filename);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2010-03-04 05:01:53 +01:00
|
|
|
if (sort_line_sequences (table))
|
|
|
|
return table;
|
2009-12-31 15:10:29 +01:00
|
|
|
|
2010-03-04 05:01:53 +01:00
|
|
|
fail:
|
2017-09-24 09:40:14 +02:00
|
|
|
while (table->sequences != NULL)
|
|
|
|
{
|
|
|
|
struct line_sequence* seq = table->sequences;
|
|
|
|
table->sequences = table->sequences->prev_sequence;
|
|
|
|
free (seq);
|
|
|
|
}
|
2010-03-04 05:01:53 +01:00
|
|
|
if (table->files != NULL)
|
|
|
|
free (table->files);
|
|
|
|
if (table->dirs != NULL)
|
|
|
|
free (table->dirs);
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2013-10-25 10:32:43 +02:00
|
|
|
/* If ADDR is within TABLE set the output parameters and return the
|
|
|
|
range of addresses covered by the entry used to fill them out.
|
|
|
|
Otherwise set * FILENAME_PTR to NULL and return 0.
|
|
|
|
The parameters FILENAME_PTR, LINENUMBER_PTR and DISCRIMINATOR_PTR
|
|
|
|
are pointers to the objects to be filled in. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2013-10-25 10:32:43 +02:00
|
|
|
static bfd_vma
|
2004-01-12 06:34:16 +01:00
|
|
|
lookup_address_in_line_info_table (struct line_info_table *table,
|
|
|
|
bfd_vma addr,
|
|
|
|
const char **filename_ptr,
|
2012-07-24 23:06:58 +02:00
|
|
|
unsigned int *linenumber_ptr,
|
|
|
|
unsigned int *discriminator_ptr)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2009-12-31 15:10:29 +01:00
|
|
|
struct line_sequence *seq = NULL;
|
2016-11-08 13:01:58 +01:00
|
|
|
struct line_info *info;
|
2009-12-31 15:10:29 +01:00
|
|
|
int low, high, mid;
|
2002-10-23 14:41:32 +02:00
|
|
|
|
2009-12-31 15:10:29 +01:00
|
|
|
/* Binary search the array of sequences. */
|
|
|
|
low = 0;
|
|
|
|
high = table->num_sequences;
|
|
|
|
while (low < high)
|
|
|
|
{
|
|
|
|
mid = (low + high) / 2;
|
|
|
|
seq = &table->sequences[mid];
|
|
|
|
if (addr < seq->low_pc)
|
|
|
|
high = mid;
|
|
|
|
else if (addr >= seq->last_line->address)
|
|
|
|
low = mid + 1;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Check for a valid sequence. */
|
|
|
|
if (!seq || addr < seq->low_pc || addr >= seq->last_line->address)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (!build_line_info_table (table, seq))
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
/* Binary search the array of line information. */
|
|
|
|
low = 0;
|
|
|
|
high = seq->num_lines;
|
|
|
|
info = NULL;
|
|
|
|
while (low < high)
|
2002-03-20 20:15:30 +01:00
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
mid = (low + high) / 2;
|
|
|
|
info = seq->line_info_lookup[mid];
|
|
|
|
if (addr < info->address)
|
|
|
|
high = mid;
|
|
|
|
else if (addr >= seq->line_info_lookup[mid + 1]->address)
|
|
|
|
low = mid + 1;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
2009-12-31 15:10:29 +01:00
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Check for a valid line information entry. */
|
|
|
|
if (info
|
|
|
|
&& addr >= info->address
|
|
|
|
&& addr < seq->line_info_lookup[mid + 1]->address
|
|
|
|
&& !(info->end_sequence || info == seq->last_line))
|
|
|
|
{
|
|
|
|
*filename_ptr = info->filename;
|
|
|
|
*linenumber_ptr = info->line;
|
|
|
|
if (discriminator_ptr)
|
|
|
|
*discriminator_ptr = info->discriminator;
|
|
|
|
return seq->last_line->address - seq->low_pc;
|
2002-03-20 20:15:30 +01:00
|
|
|
}
|
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
fail:
|
2009-09-24 02:11:51 +02:00
|
|
|
*filename_ptr = NULL;
|
2013-10-25 10:32:43 +02:00
|
|
|
return 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2009-12-31 15:10:29 +01:00
|
|
|
/* Read in the .debug_ranges section for future reference. */
|
2005-04-03 22:36:37 +02:00
|
|
|
|
|
|
|
static bfd_boolean
|
2016-11-08 13:01:58 +01:00
|
|
|
read_debug_ranges (struct comp_unit * unit)
|
2005-04-03 22:36:37 +02:00
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
struct dwarf2_debug * stash = unit->stash;
|
|
|
|
|
2011-09-30 12:39:45 +02:00
|
|
|
return read_section (unit->abfd, &stash->debug_sections[debug_ranges],
|
2014-04-24 14:29:56 +02:00
|
|
|
stash->syms, 0,
|
2016-11-08 13:01:58 +01:00
|
|
|
&stash->dwarf_ranges_buffer,
|
|
|
|
&stash->dwarf_ranges_size);
|
2005-04-03 22:36:37 +02:00
|
|
|
}
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Function table functions. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
static int
|
|
|
|
compare_lookup_funcinfos (const void * a, const void * b)
|
|
|
|
{
|
|
|
|
const struct lookup_funcinfo * lookup1 = a;
|
|
|
|
const struct lookup_funcinfo * lookup2 = b;
|
|
|
|
|
|
|
|
if (lookup1->low_addr < lookup2->low_addr)
|
|
|
|
return -1;
|
|
|
|
if (lookup1->low_addr > lookup2->low_addr)
|
|
|
|
return 1;
|
|
|
|
if (lookup1->high_addr < lookup2->high_addr)
|
|
|
|
return -1;
|
|
|
|
if (lookup1->high_addr > lookup2->high_addr)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
build_lookup_funcinfo_table (struct comp_unit * unit)
|
|
|
|
{
|
|
|
|
struct lookup_funcinfo *lookup_funcinfo_table = unit->lookup_funcinfo_table;
|
|
|
|
unsigned int number_of_functions = unit->number_of_functions;
|
|
|
|
struct funcinfo *each;
|
|
|
|
struct lookup_funcinfo *entry;
|
2016-11-21 16:59:42 +01:00
|
|
|
size_t func_index;
|
2016-11-08 13:01:58 +01:00
|
|
|
struct arange *range;
|
|
|
|
bfd_vma low_addr, high_addr;
|
|
|
|
|
|
|
|
if (lookup_funcinfo_table || number_of_functions == 0)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* Create the function info lookup table. */
|
|
|
|
lookup_funcinfo_table = (struct lookup_funcinfo *)
|
|
|
|
bfd_malloc (number_of_functions * sizeof (struct lookup_funcinfo));
|
|
|
|
if (lookup_funcinfo_table == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* Populate the function info lookup table. */
|
2016-11-21 16:59:42 +01:00
|
|
|
func_index = number_of_functions;
|
2016-11-08 13:01:58 +01:00
|
|
|
for (each = unit->function_table; each; each = each->prev_func)
|
|
|
|
{
|
2016-11-21 16:59:42 +01:00
|
|
|
entry = &lookup_funcinfo_table[--func_index];
|
2016-11-08 13:01:58 +01:00
|
|
|
entry->funcinfo = each;
|
|
|
|
|
|
|
|
/* Calculate the lowest and highest address for this function entry. */
|
|
|
|
low_addr = entry->funcinfo->arange.low;
|
|
|
|
high_addr = entry->funcinfo->arange.high;
|
|
|
|
|
|
|
|
for (range = entry->funcinfo->arange.next; range; range = range->next)
|
|
|
|
{
|
|
|
|
if (range->low < low_addr)
|
|
|
|
low_addr = range->low;
|
|
|
|
if (range->high > high_addr)
|
|
|
|
high_addr = range->high;
|
|
|
|
}
|
|
|
|
|
|
|
|
entry->low_addr = low_addr;
|
|
|
|
entry->high_addr = high_addr;
|
|
|
|
}
|
|
|
|
|
2016-11-21 16:59:42 +01:00
|
|
|
BFD_ASSERT (func_index == 0);
|
2016-11-08 13:01:58 +01:00
|
|
|
|
|
|
|
/* Sort the function by address. */
|
|
|
|
qsort (lookup_funcinfo_table,
|
|
|
|
number_of_functions,
|
|
|
|
sizeof (struct lookup_funcinfo),
|
|
|
|
compare_lookup_funcinfos);
|
|
|
|
|
|
|
|
/* Calculate the high watermark for each function in the lookup table. */
|
|
|
|
high_addr = lookup_funcinfo_table[0].high_addr;
|
2016-11-21 16:59:42 +01:00
|
|
|
for (func_index = 1; func_index < number_of_functions; func_index++)
|
2016-11-08 13:01:58 +01:00
|
|
|
{
|
2016-11-21 16:59:42 +01:00
|
|
|
entry = &lookup_funcinfo_table[func_index];
|
2016-11-08 13:01:58 +01:00
|
|
|
if (entry->high_addr > high_addr)
|
|
|
|
high_addr = entry->high_addr;
|
|
|
|
else
|
|
|
|
entry->high_addr = high_addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
unit->lookup_funcinfo_table = lookup_funcinfo_table;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2014-12-10 00:21:56 +01:00
|
|
|
/* If ADDR is within UNIT's function tables, set FUNCTION_PTR, and return
|
2013-10-25 10:32:43 +02:00
|
|
|
TRUE. Note that we need to find the function that has the smallest range
|
|
|
|
that contains ADDR, to handle inlined functions without depending upon
|
|
|
|
them being ordered in TABLE by increasing range. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
static bfd_boolean
|
2005-05-23 19:44:55 +02:00
|
|
|
lookup_address_in_function_table (struct comp_unit *unit,
|
2004-01-12 06:34:16 +01:00
|
|
|
bfd_vma addr,
|
2014-12-10 00:21:56 +01:00
|
|
|
struct funcinfo **function_ptr)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
unsigned int number_of_functions = unit->number_of_functions;
|
|
|
|
struct lookup_funcinfo* lookup_funcinfo = NULL;
|
|
|
|
struct funcinfo* funcinfo = NULL;
|
2005-04-03 22:36:37 +02:00
|
|
|
struct funcinfo* best_fit = NULL;
|
2014-05-28 09:21:11 +02:00
|
|
|
bfd_vma best_fit_len = 0;
|
2016-11-08 13:01:58 +01:00
|
|
|
bfd_size_type low, high, mid, first;
|
2005-04-03 22:36:37 +02:00
|
|
|
struct arange *arange;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2017-01-09 17:49:48 +01:00
|
|
|
if (number_of_functions == 0)
|
|
|
|
return FALSE;
|
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
if (!build_lookup_funcinfo_table (unit))
|
|
|
|
return FALSE;
|
|
|
|
|
2017-01-09 17:49:48 +01:00
|
|
|
if (unit->lookup_funcinfo_table[number_of_functions - 1].high_addr < addr)
|
|
|
|
return FALSE;
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Find the first function in the lookup table which may contain the
|
|
|
|
specified address. */
|
|
|
|
low = 0;
|
|
|
|
high = number_of_functions;
|
|
|
|
first = high;
|
|
|
|
while (low < high)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
mid = (low + high) / 2;
|
|
|
|
lookup_funcinfo = &unit->lookup_funcinfo_table[mid];
|
|
|
|
if (addr < lookup_funcinfo->low_addr)
|
|
|
|
high = mid;
|
|
|
|
else if (addr >= lookup_funcinfo->high_addr)
|
|
|
|
low = mid + 1;
|
|
|
|
else
|
|
|
|
high = first = mid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the 'best' match for the address. The prior algorithm defined the
|
|
|
|
best match as the function with the smallest address range containing
|
|
|
|
the specified address. This definition should probably be changed to the
|
|
|
|
innermost inline routine containing the address, but right now we want
|
|
|
|
to get the same results we did before. */
|
|
|
|
while (first < number_of_functions)
|
|
|
|
{
|
|
|
|
if (addr < unit->lookup_funcinfo_table[first].low_addr)
|
|
|
|
break;
|
|
|
|
funcinfo = unit->lookup_funcinfo_table[first].funcinfo;
|
|
|
|
|
|
|
|
for (arange = &funcinfo->arange; arange; arange = arange->next)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
if (addr < arange->low || addr >= arange->high)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!best_fit
|
|
|
|
|| arange->high - arange->low < best_fit_len
|
|
|
|
/* The following comparison is designed to return the same
|
|
|
|
match as the previous algorithm for routines which have the
|
|
|
|
same best fit length. */
|
|
|
|
|| (arange->high - arange->low == best_fit_len
|
|
|
|
&& funcinfo > best_fit))
|
2005-04-03 22:36:37 +02:00
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
best_fit = funcinfo;
|
|
|
|
best_fit_len = arange->high - arange->low;
|
2005-04-03 22:36:37 +02:00
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
first++;
|
2005-04-03 22:36:37 +02:00
|
|
|
}
|
2016-11-08 13:01:58 +01:00
|
|
|
|
|
|
|
if (!best_fit)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
*function_ptr = best_fit;
|
|
|
|
return TRUE;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2005-06-06 16:28:31 +02:00
|
|
|
/* If SYM at ADDR is within function table of UNIT, set FILENAME_PTR
|
|
|
|
and LINENUMBER_PTR, and return TRUE. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
lookup_symbol_in_function_table (struct comp_unit *unit,
|
|
|
|
asymbol *sym,
|
|
|
|
bfd_vma addr,
|
|
|
|
const char **filename_ptr,
|
|
|
|
unsigned int *linenumber_ptr)
|
|
|
|
{
|
|
|
|
struct funcinfo* each_func;
|
|
|
|
struct funcinfo* best_fit = NULL;
|
2014-05-28 09:21:11 +02:00
|
|
|
bfd_vma best_fit_len = 0;
|
2005-06-06 16:28:31 +02:00
|
|
|
struct arange *arange;
|
|
|
|
const char *name = bfd_asymbol_name (sym);
|
|
|
|
asection *sec = bfd_get_section (sym);
|
|
|
|
|
|
|
|
for (each_func = unit->function_table;
|
|
|
|
each_func;
|
|
|
|
each_func = each_func->prev_func)
|
|
|
|
{
|
|
|
|
for (arange = &each_func->arange;
|
|
|
|
arange;
|
|
|
|
arange = arange->next)
|
|
|
|
{
|
|
|
|
if ((!each_func->sec || each_func->sec == sec)
|
|
|
|
&& addr >= arange->low
|
|
|
|
&& addr < arange->high
|
2005-12-27 17:07:36 +01:00
|
|
|
&& each_func->name
|
2005-06-06 16:28:31 +02:00
|
|
|
&& strcmp (name, each_func->name) == 0
|
|
|
|
&& (!best_fit
|
2014-05-28 09:21:11 +02:00
|
|
|
|| arange->high - arange->low < best_fit_len))
|
|
|
|
{
|
|
|
|
best_fit = each_func;
|
|
|
|
best_fit_len = arange->high - arange->low;
|
|
|
|
}
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (best_fit)
|
|
|
|
{
|
|
|
|
best_fit->sec = sec;
|
|
|
|
*filename_ptr = best_fit->file;
|
|
|
|
*linenumber_ptr = best_fit->line;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Variable table functions. */
|
|
|
|
|
|
|
|
/* If SYM is within variable table of UNIT, set FILENAME_PTR and
|
|
|
|
LINENUMBER_PTR, and return TRUE. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
lookup_symbol_in_variable_table (struct comp_unit *unit,
|
|
|
|
asymbol *sym,
|
2005-07-06 15:43:21 +02:00
|
|
|
bfd_vma addr,
|
2005-06-06 16:28:31 +02:00
|
|
|
const char **filename_ptr,
|
|
|
|
unsigned int *linenumber_ptr)
|
|
|
|
{
|
|
|
|
const char *name = bfd_asymbol_name (sym);
|
|
|
|
asection *sec = bfd_get_section (sym);
|
|
|
|
struct varinfo* each;
|
|
|
|
|
|
|
|
for (each = unit->variable_table; each; each = each->prev_var)
|
|
|
|
if (each->stack == 0
|
2005-07-06 15:43:21 +02:00
|
|
|
&& each->file != NULL
|
|
|
|
&& each->name != NULL
|
|
|
|
&& each->addr == addr
|
2005-06-06 16:28:31 +02:00
|
|
|
&& (!each->sec || each->sec == sec)
|
|
|
|
&& strcmp (name, each->name) == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (each)
|
|
|
|
{
|
|
|
|
each->sec = sec;
|
|
|
|
*filename_ptr = each->file;
|
|
|
|
*linenumber_ptr = each->line;
|
|
|
|
return TRUE;
|
|
|
|
}
|
2016-11-08 13:01:58 +01:00
|
|
|
|
|
|
|
return FALSE;
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
|
|
|
|
2017-09-24 07:07:16 +02:00
|
|
|
static bfd_boolean
|
Allow the find_abstract_instance_name() function in the BFD library to also return file and line number information.
The nm utility supports -l for using debug information to obtain file and line information for each symbol, if available.
We have a tool that consumes this information and displays it.
This identified a problem with the 'nm' utility.
When a source is compiled with -O2, functions can be inlined. The compiler also produces an uninlined copy of the function, normally for linking to other object files.
In the case of DWARF2 debug information, the compiler generates debug information to describe a function. If that function is inlined, the compiler then references that debug information from the inlined and uninlined copies of the routine through the use of the DW_AT_abstract_origin reference.
When nm is used on such a file, it is not able to find file and line information because that information is present in the common debug information and not at each actual implementation of the function.
The 'nm' utility only retrieves the name of the function from the abstract origin debug information and no more.
What I am proposing is to modify the find_abstract_instance_name() function (which I renamed to find_abstract_instance() ) to return the name of the function as well as any file and line information. The routine is already parsing all of the debug information in the abstract instance, so it is easy to pick up the file and line information at that time. If, for some reason, the file and line information is not present, the routine behaves as before.
For example, if I have a simple test case:
int foo(int j)
{
if (j < 15)
j += j << 2;
else
j += j << 6;
return j;
}
int main (int argc,char **argv)
{
int i = argc;
i += foo(i);
return i;
}
If that test case is compiled with -O2 and then 'nm -l' reads that executable, it currently produces this symbol output (ignoring a lot of library symbols):
8048400 T foo
080482e0 T main /scratch/pcarroll/its254/test/mytest.c:12
If I modify 'nm' to return file and line information for abstract instances, it produces the following output:
08048400 T foo /scratch/pcarroll/its254/test/mytest.c:1
080482e0 T main /scratch/pcarroll/its254/test/mytest.c:12
--------------------------------------------------------------------------
bfd * bfd/dwarf2.c (find_abstract_name): Modified to return file and
line information in addition to name, if they can be found.
2018-02-06 16:45:31 +01:00
|
|
|
find_abstract_instance (struct comp_unit * unit,
|
|
|
|
bfd_byte * orig_info_ptr,
|
|
|
|
struct attribute * attr_ptr,
|
|
|
|
const char ** pname,
|
|
|
|
bfd_boolean * is_linkage,
|
|
|
|
char ** filename_ptr,
|
|
|
|
int * linenumber_ptr)
|
2005-01-05 11:37:05 +01:00
|
|
|
{
|
|
|
|
bfd *abfd = unit->abfd;
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *info_ptr;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_byte *info_ptr_end;
|
2005-01-05 11:37:05 +01:00
|
|
|
unsigned int abbrev_number, bytes_read, i;
|
|
|
|
struct abbrev_info *abbrev;
|
2008-09-08 23:58:29 +02:00
|
|
|
bfd_uint64_t die_ref = attr_ptr->u.val;
|
2005-01-05 11:37:05 +01:00
|
|
|
struct attribute attr;
|
2017-09-24 07:07:16 +02:00
|
|
|
const char *name = NULL;
|
2005-01-05 11:37:05 +01:00
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
/* DW_FORM_ref_addr can reference an entry in a different CU. It
|
|
|
|
is an offset from the .debug_info section, not the current CU. */
|
|
|
|
if (attr_ptr->form == DW_FORM_ref_addr)
|
|
|
|
{
|
|
|
|
/* We only support DW_FORM_ref_addr within the same file, so
|
2017-09-26 14:17:24 +02:00
|
|
|
any relocations should be resolved already. Check this by
|
|
|
|
testing for a zero die_ref; There can't be a valid reference
|
|
|
|
to the header of a .debug_info section.
|
|
|
|
DW_FORM_ref_addr is an offset relative to .debug_info.
|
|
|
|
Normally when using the GNU linker this is accomplished by
|
|
|
|
emitting a symbolic reference to a label, because .debug_info
|
|
|
|
sections are linked at zero. When there are multiple section
|
|
|
|
groups containing .debug_info, as there might be in a
|
|
|
|
relocatable object file, it would be reasonable to assume that
|
|
|
|
a symbolic reference to a label in any .debug_info section
|
|
|
|
might be used. Since we lay out multiple .debug_info
|
|
|
|
sections at non-zero VMAs (see place_sections), and read
|
|
|
|
them contiguously into stash->info_ptr_memory, that means
|
|
|
|
the reference is relative to stash->info_ptr_memory. */
|
|
|
|
size_t total;
|
|
|
|
|
|
|
|
info_ptr = unit->stash->info_ptr_memory;
|
|
|
|
info_ptr_end = unit->stash->info_ptr_end;
|
|
|
|
total = info_ptr_end - info_ptr;
|
|
|
|
if (!die_ref || die_ref >= total)
|
2017-09-24 07:07:16 +02:00
|
|
|
{
|
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: invalid abstract instance DIE ref"));
|
2017-09-24 07:07:16 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2017-09-26 14:17:24 +02:00
|
|
|
info_ptr += die_ref;
|
2014-01-28 14:43:35 +01:00
|
|
|
|
|
|
|
/* Now find the CU containing this pointer. */
|
|
|
|
if (info_ptr >= unit->info_ptr_unit && info_ptr < unit->end_ptr)
|
2017-09-26 14:17:24 +02:00
|
|
|
info_ptr_end = unit->end_ptr;
|
2014-01-28 14:43:35 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Check other CUs to see if they contain the abbrev. */
|
|
|
|
struct comp_unit * u;
|
|
|
|
|
|
|
|
for (u = unit->prev_unit; u != NULL; u = u->prev_unit)
|
|
|
|
if (info_ptr >= u->info_ptr_unit && info_ptr < u->end_ptr)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (u == NULL)
|
|
|
|
for (u = unit->next_unit; u != NULL; u = u->next_unit)
|
|
|
|
if (info_ptr >= u->info_ptr_unit && info_ptr < u->end_ptr)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (u)
|
2017-09-26 14:17:24 +02:00
|
|
|
{
|
|
|
|
unit = u;
|
|
|
|
info_ptr_end = unit->end_ptr;
|
|
|
|
}
|
2014-01-28 14:43:35 +01:00
|
|
|
/* else FIXME: What do we do now ? */
|
|
|
|
}
|
2008-09-08 23:58:29 +02:00
|
|
|
}
|
2013-05-29 16:58:35 +02:00
|
|
|
else if (attr_ptr->form == DW_FORM_GNU_ref_alt)
|
|
|
|
{
|
|
|
|
info_ptr = read_alt_indirect_ref (unit, die_ref);
|
|
|
|
if (info_ptr == NULL)
|
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: unable to read alt ref %" PRIu64),
|
2018-02-19 09:18:15 +01:00
|
|
|
(uint64_t) die_ref);
|
2013-05-29 16:58:35 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2017-09-24 07:07:16 +02:00
|
|
|
return FALSE;
|
2013-05-29 16:58:35 +02:00
|
|
|
}
|
2017-09-24 07:07:16 +02:00
|
|
|
info_ptr_end = (unit->stash->alt_dwarf_info_buffer
|
|
|
|
+ unit->stash->alt_dwarf_info_size);
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
|
2014-01-28 14:43:35 +01:00
|
|
|
/* FIXME: Do we need to locate the correct CU, in a similar
|
|
|
|
fashion to the code in the DW_FORM_ref_addr case above ? */
|
2013-05-29 16:58:35 +02:00
|
|
|
}
|
2013-01-10 21:03:55 +01:00
|
|
|
else
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
{
|
2017-09-26 14:17:24 +02:00
|
|
|
/* DW_FORM_ref1, DW_FORM_ref2, DW_FORM_ref4, DW_FORM_ref8 or
|
|
|
|
DW_FORM_ref_udata. These are all references relative to the
|
|
|
|
start of the current CU. */
|
|
|
|
size_t total;
|
|
|
|
|
|
|
|
info_ptr = unit->info_ptr_unit;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
info_ptr_end = unit->end_ptr;
|
2017-09-26 14:17:24 +02:00
|
|
|
total = info_ptr_end - info_ptr;
|
|
|
|
if (!die_ref || die_ref >= total)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: invalid abstract instance DIE ref"));
|
2017-09-26 14:17:24 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
info_ptr += die_ref;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
}
|
2013-05-29 16:58:35 +02:00
|
|
|
|
2017-02-17 02:26:11 +01:00
|
|
|
abbrev_number = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
FALSE, info_ptr_end);
|
2005-01-05 11:37:05 +01:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
|
|
|
if (abbrev_number)
|
|
|
|
{
|
|
|
|
abbrev = lookup_abbrev (abbrev_number, unit->abbrevs);
|
|
|
|
if (! abbrev)
|
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: could not find abbrev number %u"), abbrev_number);
|
2005-01-05 11:37:05 +01:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2017-09-24 07:07:16 +02:00
|
|
|
return FALSE;
|
2005-01-05 11:37:05 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2005-09-20 20:13:32 +02:00
|
|
|
for (i = 0; i < abbrev->num_attrs; ++i)
|
2005-01-05 11:37:05 +01:00
|
|
|
{
|
2010-03-04 05:01:53 +01:00
|
|
|
info_ptr = read_attribute (&attr, &abbrev->attrs[i], unit,
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
info_ptr, info_ptr_end);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (info_ptr == NULL)
|
|
|
|
break;
|
2017-09-24 07:07:16 +02:00
|
|
|
/* It doesn't ever make sense for DW_AT_specification to
|
|
|
|
refer to the same DIE. Stop simple recursion. */
|
|
|
|
if (info_ptr == orig_info_ptr)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: abstract instance recursion detected"));
|
2017-09-24 07:07:16 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2005-02-21 19:00:17 +01:00
|
|
|
switch (attr.name)
|
|
|
|
{
|
|
|
|
case DW_AT_name:
|
2010-04-20 11:53:05 +02:00
|
|
|
/* Prefer DW_AT_MIPS_linkage_name or DW_AT_linkage_name
|
|
|
|
over DW_AT_name. */
|
2014-06-26 10:12:55 +02:00
|
|
|
if (name == NULL && is_str_attr (attr.form))
|
2014-12-10 00:21:56 +01:00
|
|
|
{
|
|
|
|
name = attr.u.str;
|
|
|
|
if (non_mangled (unit->lang))
|
|
|
|
*is_linkage = TRUE;
|
|
|
|
}
|
2005-02-21 19:00:17 +01:00
|
|
|
break;
|
|
|
|
case DW_AT_specification:
|
Allow the find_abstract_instance_name() function in the BFD library to also return file and line number information.
The nm utility supports -l for using debug information to obtain file and line information for each symbol, if available.
We have a tool that consumes this information and displays it.
This identified a problem with the 'nm' utility.
When a source is compiled with -O2, functions can be inlined. The compiler also produces an uninlined copy of the function, normally for linking to other object files.
In the case of DWARF2 debug information, the compiler generates debug information to describe a function. If that function is inlined, the compiler then references that debug information from the inlined and uninlined copies of the routine through the use of the DW_AT_abstract_origin reference.
When nm is used on such a file, it is not able to find file and line information because that information is present in the common debug information and not at each actual implementation of the function.
The 'nm' utility only retrieves the name of the function from the abstract origin debug information and no more.
What I am proposing is to modify the find_abstract_instance_name() function (which I renamed to find_abstract_instance() ) to return the name of the function as well as any file and line information. The routine is already parsing all of the debug information in the abstract instance, so it is easy to pick up the file and line information at that time. If, for some reason, the file and line information is not present, the routine behaves as before.
For example, if I have a simple test case:
int foo(int j)
{
if (j < 15)
j += j << 2;
else
j += j << 6;
return j;
}
int main (int argc,char **argv)
{
int i = argc;
i += foo(i);
return i;
}
If that test case is compiled with -O2 and then 'nm -l' reads that executable, it currently produces this symbol output (ignoring a lot of library symbols):
8048400 T foo
080482e0 T main /scratch/pcarroll/its254/test/mytest.c:12
If I modify 'nm' to return file and line information for abstract instances, it produces the following output:
08048400 T foo /scratch/pcarroll/its254/test/mytest.c:1
080482e0 T main /scratch/pcarroll/its254/test/mytest.c:12
--------------------------------------------------------------------------
bfd * bfd/dwarf2.c (find_abstract_name): Modified to return file and
line information in addition to name, if they can be found.
2018-02-06 16:45:31 +01:00
|
|
|
if (!find_abstract_instance (unit, info_ptr, &attr,
|
|
|
|
pname, is_linkage,
|
|
|
|
filename_ptr, linenumber_ptr))
|
2017-09-24 07:07:16 +02:00
|
|
|
return FALSE;
|
2005-02-21 19:00:17 +01:00
|
|
|
break;
|
2010-04-20 11:53:05 +02:00
|
|
|
case DW_AT_linkage_name:
|
2005-09-20 20:13:32 +02:00
|
|
|
case DW_AT_MIPS_linkage_name:
|
2014-06-26 10:12:55 +02:00
|
|
|
/* PR 16949: Corrupt debug info can place
|
|
|
|
non-string forms into these attributes. */
|
2014-09-15 14:58:29 +02:00
|
|
|
if (is_str_attr (attr.form))
|
2014-12-10 00:21:56 +01:00
|
|
|
{
|
|
|
|
name = attr.u.str;
|
|
|
|
*is_linkage = TRUE;
|
|
|
|
}
|
2005-09-20 20:13:32 +02:00
|
|
|
break;
|
Allow the find_abstract_instance_name() function in the BFD library to also return file and line number information.
The nm utility supports -l for using debug information to obtain file and line information for each symbol, if available.
We have a tool that consumes this information and displays it.
This identified a problem with the 'nm' utility.
When a source is compiled with -O2, functions can be inlined. The compiler also produces an uninlined copy of the function, normally for linking to other object files.
In the case of DWARF2 debug information, the compiler generates debug information to describe a function. If that function is inlined, the compiler then references that debug information from the inlined and uninlined copies of the routine through the use of the DW_AT_abstract_origin reference.
When nm is used on such a file, it is not able to find file and line information because that information is present in the common debug information and not at each actual implementation of the function.
The 'nm' utility only retrieves the name of the function from the abstract origin debug information and no more.
What I am proposing is to modify the find_abstract_instance_name() function (which I renamed to find_abstract_instance() ) to return the name of the function as well as any file and line information. The routine is already parsing all of the debug information in the abstract instance, so it is easy to pick up the file and line information at that time. If, for some reason, the file and line information is not present, the routine behaves as before.
For example, if I have a simple test case:
int foo(int j)
{
if (j < 15)
j += j << 2;
else
j += j << 6;
return j;
}
int main (int argc,char **argv)
{
int i = argc;
i += foo(i);
return i;
}
If that test case is compiled with -O2 and then 'nm -l' reads that executable, it currently produces this symbol output (ignoring a lot of library symbols):
8048400 T foo
080482e0 T main /scratch/pcarroll/its254/test/mytest.c:12
If I modify 'nm' to return file and line information for abstract instances, it produces the following output:
08048400 T foo /scratch/pcarroll/its254/test/mytest.c:1
080482e0 T main /scratch/pcarroll/its254/test/mytest.c:12
--------------------------------------------------------------------------
bfd * bfd/dwarf2.c (find_abstract_name): Modified to return file and
line information in addition to name, if they can be found.
2018-02-06 16:45:31 +01:00
|
|
|
case DW_AT_decl_file:
|
|
|
|
*filename_ptr = concat_filename (unit->line_table,
|
|
|
|
attr.u.val);
|
|
|
|
break;
|
|
|
|
case DW_AT_decl_line:
|
|
|
|
*linenumber_ptr = attr.u.val;
|
|
|
|
break;
|
2005-02-21 19:00:17 +01:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2005-01-05 11:37:05 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-09-24 07:07:16 +02:00
|
|
|
*pname = name;
|
|
|
|
return TRUE;
|
2005-01-05 11:37:05 +01:00
|
|
|
}
|
|
|
|
|
2010-03-04 05:01:53 +01:00
|
|
|
static bfd_boolean
|
|
|
|
read_rangelist (struct comp_unit *unit, struct arange *arange,
|
|
|
|
bfd_uint64_t offset)
|
2005-04-03 22:36:37 +02:00
|
|
|
{
|
|
|
|
bfd_byte *ranges_ptr;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_byte *ranges_end;
|
2005-04-03 22:36:37 +02:00
|
|
|
bfd_vma base_address = unit->base_address;
|
|
|
|
|
|
|
|
if (! unit->stash->dwarf_ranges_buffer)
|
|
|
|
{
|
|
|
|
if (! read_debug_ranges (unit))
|
2010-03-04 05:01:53 +01:00
|
|
|
return FALSE;
|
2005-04-03 22:36:37 +02:00
|
|
|
}
|
2006-03-06 05:52:03 +01:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
ranges_ptr = unit->stash->dwarf_ranges_buffer + offset;
|
|
|
|
if (ranges_ptr < unit->stash->dwarf_ranges_buffer)
|
|
|
|
return FALSE;
|
|
|
|
ranges_end = unit->stash->dwarf_ranges_buffer + unit->stash->dwarf_ranges_size;
|
2015-02-15 09:32:46 +01:00
|
|
|
|
2005-04-03 22:36:37 +02:00
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
bfd_vma low_pc;
|
|
|
|
bfd_vma high_pc;
|
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
/* PR 17512: file: 62cada7d. */
|
2015-02-15 09:32:46 +01:00
|
|
|
if (ranges_ptr + 2 * unit->addr_size > ranges_end)
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
low_pc = read_address (unit, ranges_ptr, ranges_end);
|
2009-01-30 02:04:47 +01:00
|
|
|
ranges_ptr += unit->addr_size;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
high_pc = read_address (unit, ranges_ptr, ranges_end);
|
2009-01-30 02:04:47 +01:00
|
|
|
ranges_ptr += unit->addr_size;
|
|
|
|
|
2005-04-03 22:36:37 +02:00
|
|
|
if (low_pc == 0 && high_pc == 0)
|
|
|
|
break;
|
|
|
|
if (low_pc == -1UL && high_pc != -1UL)
|
|
|
|
base_address = high_pc;
|
|
|
|
else
|
2010-03-04 05:01:53 +01:00
|
|
|
{
|
2012-05-16 15:57:11 +02:00
|
|
|
if (!arange_add (unit, arange,
|
2010-03-04 05:01:53 +01:00
|
|
|
base_address + low_pc, base_address + high_pc))
|
|
|
|
return FALSE;
|
|
|
|
}
|
2005-04-03 22:36:37 +02:00
|
|
|
}
|
2010-03-04 05:01:53 +01:00
|
|
|
return TRUE;
|
2005-04-03 22:36:37 +02:00
|
|
|
}
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* DWARF2 Compilation unit functions. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* Scan over each die in a comp. unit looking for functions to add
|
2008-02-22 16:27:38 +01:00
|
|
|
to the function table and variables to the variable table. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
static bfd_boolean
|
2005-06-06 16:28:31 +02:00
|
|
|
scan_unit_for_symbols (struct comp_unit *unit)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
bfd *abfd = unit->abfd;
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *info_ptr = unit->first_child_die_ptr;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_byte *info_ptr_end = unit->stash->info_ptr_end;
|
2017-09-24 07:07:16 +02:00
|
|
|
int nesting_level = 0;
|
|
|
|
struct nest_funcinfo {
|
|
|
|
struct funcinfo *func;
|
|
|
|
} *nested_funcs;
|
2005-09-22 21:50:27 +02:00
|
|
|
int nested_funcs_size;
|
|
|
|
|
|
|
|
/* Maintain a stack of in-scope functions and inlined functions, which we
|
|
|
|
can use to set the caller_func field. */
|
|
|
|
nested_funcs_size = 32;
|
2017-09-24 07:07:16 +02:00
|
|
|
nested_funcs = (struct nest_funcinfo *)
|
|
|
|
bfd_malloc (nested_funcs_size * sizeof (*nested_funcs));
|
2005-09-22 21:50:27 +02:00
|
|
|
if (nested_funcs == NULL)
|
|
|
|
return FALSE;
|
2017-09-24 07:07:16 +02:00
|
|
|
nested_funcs[nesting_level].func = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2017-09-24 07:07:16 +02:00
|
|
|
while (nesting_level >= 0)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
unsigned int abbrev_number, bytes_read, i;
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
struct attribute attr;
|
|
|
|
struct funcinfo *func;
|
2005-06-06 16:28:31 +02:00
|
|
|
struct varinfo *var;
|
2005-04-03 22:36:37 +02:00
|
|
|
bfd_vma low_pc = 0;
|
|
|
|
bfd_vma high_pc = 0;
|
2012-04-27 21:03:04 +02:00
|
|
|
bfd_boolean high_pc_relative = FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-01-27 16:49:12 +01:00
|
|
|
/* PR 17512: file: 9f405d9d. */
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
if (info_ptr >= info_ptr_end)
|
2015-01-27 16:49:12 +01:00
|
|
|
goto fail;
|
2015-02-15 09:32:46 +01:00
|
|
|
|
2017-02-17 02:26:11 +01:00
|
|
|
abbrev_number = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
FALSE, info_ptr_end);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
|
|
|
|
if (! abbrev_number)
|
|
|
|
{
|
|
|
|
nesting_level--;
|
|
|
|
continue;
|
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2017-03-29 13:27:44 +02:00
|
|
|
abbrev = lookup_abbrev (abbrev_number, unit->abbrevs);
|
1999-05-03 09:29:11 +02:00
|
|
|
if (! abbrev)
|
|
|
|
{
|
2017-03-29 13:27:44 +02:00
|
|
|
static unsigned int previous_failed_abbrev = -1U;
|
|
|
|
|
|
|
|
/* Avoid multiple reports of the same missing abbrev. */
|
|
|
|
if (abbrev_number != previous_failed_abbrev)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: could not find abbrev number %u"),
|
2017-03-29 13:27:44 +02:00
|
|
|
abbrev_number);
|
|
|
|
previous_failed_abbrev = abbrev_number;
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2010-03-04 05:01:53 +01:00
|
|
|
goto fail;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2005-06-06 16:28:31 +02:00
|
|
|
var = NULL;
|
2005-01-05 11:37:05 +01:00
|
|
|
if (abbrev->tag == DW_TAG_subprogram
|
2005-06-06 16:28:31 +02:00
|
|
|
|| abbrev->tag == DW_TAG_entry_point
|
2005-01-05 11:37:05 +01:00
|
|
|
|| abbrev->tag == DW_TAG_inlined_subroutine)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
bfd_size_type amt = sizeof (struct funcinfo);
|
2009-09-09 23:38:59 +02:00
|
|
|
func = (struct funcinfo *) bfd_zalloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (func == NULL)
|
|
|
|
goto fail;
|
2005-05-23 19:44:55 +02:00
|
|
|
func->tag = abbrev->tag;
|
1999-05-03 09:29:11 +02:00
|
|
|
func->prev_func = unit->function_table;
|
|
|
|
unit->function_table = func;
|
2017-03-29 13:27:44 +02:00
|
|
|
unit->number_of_functions++;
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
BFD_ASSERT (!unit->cached);
|
2005-09-22 21:50:27 +02:00
|
|
|
|
|
|
|
if (func->tag == DW_TAG_inlined_subroutine)
|
2017-09-24 07:07:16 +02:00
|
|
|
for (i = nesting_level; i-- != 0; )
|
|
|
|
if (nested_funcs[i].func)
|
2005-09-22 21:50:27 +02:00
|
|
|
{
|
2017-09-24 07:07:16 +02:00
|
|
|
func->caller_func = nested_funcs[i].func;
|
2005-09-22 21:50:27 +02:00
|
|
|
break;
|
|
|
|
}
|
2017-09-24 07:07:16 +02:00
|
|
|
nested_funcs[nesting_level].func = func;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
else
|
2005-06-06 16:28:31 +02:00
|
|
|
{
|
|
|
|
func = NULL;
|
|
|
|
if (abbrev->tag == DW_TAG_variable)
|
|
|
|
{
|
|
|
|
bfd_size_type amt = sizeof (struct varinfo);
|
2009-09-09 23:38:59 +02:00
|
|
|
var = (struct varinfo *) bfd_zalloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (var == NULL)
|
|
|
|
goto fail;
|
2005-06-06 16:28:31 +02:00
|
|
|
var->tag = abbrev->tag;
|
|
|
|
var->stack = 1;
|
|
|
|
var->prev_var = unit->variable_table;
|
|
|
|
unit->variable_table = var;
|
2017-03-29 13:27:44 +02:00
|
|
|
/* PR 18205: Missing debug information can cause this
|
|
|
|
var to be attached to an already cached unit. */
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
2005-09-22 21:50:27 +02:00
|
|
|
|
|
|
|
/* No inline function in scope at this nesting level. */
|
2017-09-24 07:07:16 +02:00
|
|
|
nested_funcs[nesting_level].func = 0;
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
for (i = 0; i < abbrev->num_attrs; ++i)
|
|
|
|
{
|
2017-09-24 07:07:16 +02:00
|
|
|
info_ptr = read_attribute (&attr, &abbrev->attrs[i],
|
|
|
|
unit, info_ptr, info_ptr_end);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (info_ptr == NULL)
|
2011-03-04 00:43:08 +01:00
|
|
|
goto fail;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (func)
|
|
|
|
{
|
|
|
|
switch (attr.name)
|
|
|
|
{
|
2005-05-23 19:44:55 +02:00
|
|
|
case DW_AT_call_file:
|
2010-03-04 05:01:53 +01:00
|
|
|
func->caller_file = concat_filename (unit->line_table,
|
|
|
|
attr.u.val);
|
2005-05-23 19:44:55 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_call_line:
|
|
|
|
func->caller_line = attr.u.val;
|
|
|
|
break;
|
|
|
|
|
2005-01-05 11:37:05 +01:00
|
|
|
case DW_AT_abstract_origin:
|
2011-04-07 19:47:23 +02:00
|
|
|
case DW_AT_specification:
|
Allow the find_abstract_instance_name() function in the BFD library to also return file and line number information.
The nm utility supports -l for using debug information to obtain file and line information for each symbol, if available.
We have a tool that consumes this information and displays it.
This identified a problem with the 'nm' utility.
When a source is compiled with -O2, functions can be inlined. The compiler also produces an uninlined copy of the function, normally for linking to other object files.
In the case of DWARF2 debug information, the compiler generates debug information to describe a function. If that function is inlined, the compiler then references that debug information from the inlined and uninlined copies of the routine through the use of the DW_AT_abstract_origin reference.
When nm is used on such a file, it is not able to find file and line information because that information is present in the common debug information and not at each actual implementation of the function.
The 'nm' utility only retrieves the name of the function from the abstract origin debug information and no more.
What I am proposing is to modify the find_abstract_instance_name() function (which I renamed to find_abstract_instance() ) to return the name of the function as well as any file and line information. The routine is already parsing all of the debug information in the abstract instance, so it is easy to pick up the file and line information at that time. If, for some reason, the file and line information is not present, the routine behaves as before.
For example, if I have a simple test case:
int foo(int j)
{
if (j < 15)
j += j << 2;
else
j += j << 6;
return j;
}
int main (int argc,char **argv)
{
int i = argc;
i += foo(i);
return i;
}
If that test case is compiled with -O2 and then 'nm -l' reads that executable, it currently produces this symbol output (ignoring a lot of library symbols):
8048400 T foo
080482e0 T main /scratch/pcarroll/its254/test/mytest.c:12
If I modify 'nm' to return file and line information for abstract instances, it produces the following output:
08048400 T foo /scratch/pcarroll/its254/test/mytest.c:1
080482e0 T main /scratch/pcarroll/its254/test/mytest.c:12
--------------------------------------------------------------------------
bfd * bfd/dwarf2.c (find_abstract_name): Modified to return file and
line information in addition to name, if they can be found.
2018-02-06 16:45:31 +01:00
|
|
|
if (!find_abstract_instance (unit, info_ptr, &attr,
|
|
|
|
&func->name,
|
|
|
|
&func->is_linkage,
|
|
|
|
&func->file,
|
|
|
|
&func->line))
|
2017-09-24 07:07:16 +02:00
|
|
|
goto fail;
|
2005-01-05 11:37:05 +01:00
|
|
|
break;
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
case DW_AT_name:
|
2010-04-20 11:53:05 +02:00
|
|
|
/* Prefer DW_AT_MIPS_linkage_name or DW_AT_linkage_name
|
|
|
|
over DW_AT_name. */
|
2014-06-26 10:12:55 +02:00
|
|
|
if (func->name == NULL && is_str_attr (attr.form))
|
2014-12-10 00:21:56 +01:00
|
|
|
{
|
|
|
|
func->name = attr.u.str;
|
|
|
|
if (non_mangled (unit->lang))
|
|
|
|
func->is_linkage = TRUE;
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2010-04-20 11:53:05 +02:00
|
|
|
case DW_AT_linkage_name:
|
1999-05-03 09:29:11 +02:00
|
|
|
case DW_AT_MIPS_linkage_name:
|
2014-06-26 10:12:55 +02:00
|
|
|
/* PR 16949: Corrupt debug info can place
|
|
|
|
non-string forms into these attributes. */
|
|
|
|
if (is_str_attr (attr.form))
|
2014-12-10 00:21:56 +01:00
|
|
|
{
|
|
|
|
func->name = attr.u.str;
|
|
|
|
func->is_linkage = TRUE;
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_low_pc:
|
2005-04-03 22:36:37 +02:00
|
|
|
low_pc = attr.u.val;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_high_pc:
|
2005-04-03 22:36:37 +02:00
|
|
|
high_pc = attr.u.val;
|
2012-04-27 21:03:04 +02:00
|
|
|
high_pc_relative = attr.form != DW_FORM_addr;
|
2005-04-03 22:36:37 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_ranges:
|
2010-03-04 05:01:53 +01:00
|
|
|
if (!read_rangelist (unit, &func->arange, attr.u.val))
|
|
|
|
goto fail;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
|
2005-06-06 16:28:31 +02:00
|
|
|
case DW_AT_decl_file:
|
|
|
|
func->file = concat_filename (unit->line_table,
|
|
|
|
attr.u.val);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_decl_line:
|
|
|
|
func->line = attr.u.val;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (var)
|
|
|
|
{
|
|
|
|
switch (attr.name)
|
|
|
|
{
|
|
|
|
case DW_AT_name:
|
2017-09-25 12:16:34 +02:00
|
|
|
if (is_str_attr (attr.form))
|
|
|
|
var->name = attr.u.str;
|
2005-06-06 16:28:31 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_decl_file:
|
|
|
|
var->file = concat_filename (unit->line_table,
|
|
|
|
attr.u.val);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_decl_line:
|
|
|
|
var->line = attr.u.val;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_external:
|
|
|
|
if (attr.u.val != 0)
|
|
|
|
var->stack = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_location:
|
2005-07-06 15:43:21 +02:00
|
|
|
switch (attr.form)
|
2005-06-06 16:28:31 +02:00
|
|
|
{
|
2005-07-06 15:43:21 +02:00
|
|
|
case DW_FORM_block:
|
|
|
|
case DW_FORM_block1:
|
|
|
|
case DW_FORM_block2:
|
|
|
|
case DW_FORM_block4:
|
2010-04-01 07:24:52 +02:00
|
|
|
case DW_FORM_exprloc:
|
2017-09-24 07:05:33 +02:00
|
|
|
if (attr.u.blk->data != NULL
|
|
|
|
&& *attr.u.blk->data == DW_OP_addr)
|
2005-06-06 16:28:31 +02:00
|
|
|
{
|
2005-07-06 15:43:21 +02:00
|
|
|
var->stack = 0;
|
2005-08-11 01:33:39 +02:00
|
|
|
|
|
|
|
/* Verify that DW_OP_addr is the only opcode in the
|
|
|
|
location, in which case the block size will be 1
|
|
|
|
plus the address size. */
|
|
|
|
/* ??? For TLS variables, gcc can emit
|
|
|
|
DW_OP_addr <addr> DW_OP_GNU_push_tls_address
|
|
|
|
which we don't handle here yet. */
|
|
|
|
if (attr.u.blk->size == unit->addr_size + 1U)
|
|
|
|
var->addr = bfd_get (unit->addr_size * 8,
|
|
|
|
unit->abfd,
|
|
|
|
attr.u.blk->data + 1);
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
2005-07-06 15:43:21 +02:00
|
|
|
break;
|
2006-03-06 05:52:03 +01:00
|
|
|
|
2005-07-06 15:43:21 +02:00
|
|
|
default:
|
|
|
|
break;
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-27 21:03:04 +02:00
|
|
|
if (high_pc_relative)
|
|
|
|
high_pc += low_pc;
|
|
|
|
|
2005-04-03 22:36:37 +02:00
|
|
|
if (func && high_pc != 0)
|
|
|
|
{
|
2012-05-16 15:57:11 +02:00
|
|
|
if (!arange_add (unit, &func->arange, low_pc, high_pc))
|
2010-03-04 05:01:53 +01:00
|
|
|
goto fail;
|
2005-04-03 22:36:37 +02:00
|
|
|
}
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (abbrev->has_children)
|
2005-09-22 21:50:27 +02:00
|
|
|
{
|
|
|
|
nesting_level++;
|
|
|
|
|
|
|
|
if (nesting_level >= nested_funcs_size)
|
|
|
|
{
|
2017-09-24 07:07:16 +02:00
|
|
|
struct nest_funcinfo *tmp;
|
2005-09-22 21:50:27 +02:00
|
|
|
|
|
|
|
nested_funcs_size *= 2;
|
2017-09-24 07:07:16 +02:00
|
|
|
tmp = (struct nest_funcinfo *)
|
2012-05-16 15:57:11 +02:00
|
|
|
bfd_realloc (nested_funcs,
|
2017-09-24 07:07:16 +02:00
|
|
|
nested_funcs_size * sizeof (*nested_funcs));
|
2005-09-22 21:50:27 +02:00
|
|
|
if (tmp == NULL)
|
2010-03-04 05:01:53 +01:00
|
|
|
goto fail;
|
2005-09-22 21:50:27 +02:00
|
|
|
nested_funcs = tmp;
|
|
|
|
}
|
2017-09-24 07:07:16 +02:00
|
|
|
nested_funcs[nesting_level].func = 0;
|
2005-09-22 21:50:27 +02:00
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2005-09-22 21:50:27 +02:00
|
|
|
free (nested_funcs);
|
2002-11-30 09:39:46 +01:00
|
|
|
return TRUE;
|
2010-03-04 05:01:53 +01:00
|
|
|
|
|
|
|
fail:
|
|
|
|
free (nested_funcs);
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
1999-07-02 23:03:56 +02:00
|
|
|
/* Parse a DWARF2 compilation unit starting at INFO_PTR. This
|
|
|
|
includes the compilation unit header that proceeds the DIE's, but
|
2003-11-24 19:06:40 +01:00
|
|
|
does not include the length field that precedes each compilation
|
1999-07-02 23:03:56 +02:00
|
|
|
unit header. END_PTR points one past the end of this comp unit.
|
2001-11-14 12:16:47 +01:00
|
|
|
OFFSET_SIZE is the size of DWARF2 offsets (either 4 or 8 bytes).
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
This routine does not read the whole compilation unit; only enough
|
|
|
|
to get to the line number information for the compilation unit. */
|
|
|
|
|
|
|
|
static struct comp_unit *
|
2007-06-22 10:13:12 +02:00
|
|
|
parse_comp_unit (struct dwarf2_debug *stash,
|
2004-01-12 06:34:16 +01:00
|
|
|
bfd_vma unit_length,
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *info_ptr_unit,
|
2004-01-12 06:34:16 +01:00
|
|
|
unsigned int offset_size)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
struct comp_unit* unit;
|
2002-05-04 14:01:02 +02:00
|
|
|
unsigned int version;
|
* bfd-in.h (bfd_int64_t, bfd_uint64_t): New types.
(BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Don't define here.
(bfd_getb64, bfd_getl64, bfd_get_bits): Return bfd_uint64_t.
(bfd_getb_signed_64, bfd_getl_signed_64): Return bfd_int64_t.
(bfd_putb64, bfd_putl64, bfd_put_bits): Accept bfd_uint64_t.
* configure.in (HOST_U_64BIT_TYPE): Set when sizeof long is 8.
(BFD_HOST_64_BIT_DEFINED, BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Set
when using long.
* libbfd.c (EIGHT_GAZILLION, COERCE64): Use bfd_int64_t.
(bfd_getb64): Return bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_getl64, bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
(bfd_putb64): Accept bfd_uint64_t. Enable when BFD_HOST_64_BIT.
(bfd_putl64, bfd_put_bits, bfd_get_bits): Likewise.
* dwarf2.c (struct attribute): Use bfd_int64_t and bfd_uint64_t.
(read_8_bytes, read_indirect_string, read_address): Likewise.
(read_abbrevs, parse_comp_unit): Likewise.
* targets.c (struct bfd_target): Likewise.
* aix386-core.c (NO_GET64, NO_PUT64, NO_GETS64): Define and use.
* hppabsd-core.c: Likewise. Formatting.
* hpux-core.c: Likewise.
* irix-core.c: Likewise.
* netbsd-core.c: Likewise.
* osf-core.c: Likewise.
* ptrace-core.c: Likewise.
* sco5-core.c: Likewise.
* trad-core.c: Likewise.
* configure: Regenerate.
* bfd-in2.h: Regenerate.
2004-03-15 15:21:43 +01:00
|
|
|
bfd_uint64_t abbrev_offset = 0;
|
2017-07-04 10:09:27 +02:00
|
|
|
/* Initialize it just to avoid a GCC false warning. */
|
|
|
|
unsigned int addr_size = -1;
|
1999-05-03 09:29:11 +02:00
|
|
|
struct abbrev_info** abbrevs;
|
|
|
|
unsigned int abbrev_number, bytes_read, i;
|
|
|
|
struct abbrev_info *abbrev;
|
|
|
|
struct attribute attr;
|
2005-02-20 15:59:07 +01:00
|
|
|
bfd_byte *info_ptr = stash->info_ptr;
|
|
|
|
bfd_byte *end_ptr = info_ptr + unit_length;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
bfd_size_type amt;
|
2005-04-03 22:36:37 +02:00
|
|
|
bfd_vma low_pc = 0;
|
|
|
|
bfd_vma high_pc = 0;
|
2009-09-09 23:38:59 +02:00
|
|
|
bfd *abfd = stash->bfd_ptr;
|
2012-04-27 21:03:04 +02:00
|
|
|
bfd_boolean high_pc_relative = FALSE;
|
2017-07-04 10:09:27 +02:00
|
|
|
enum dwarf_unit_type unit_type;
|
2001-01-23 21:27:54 +01:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
version = read_2_bytes (abfd, info_ptr, end_ptr);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += 2;
|
2017-07-04 10:09:27 +02:00
|
|
|
if (version < 2 || version > 5)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2016-04-04 13:53:33 +02:00
|
|
|
/* PR 19872: A version number of 0 probably means that there is padding
|
|
|
|
at the end of the .debug_info section. Gold puts it there when
|
|
|
|
performing an incremental link, for example. So do not generate
|
|
|
|
an error, just return a NULL. */
|
|
|
|
if (version)
|
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: found dwarf version '%u', this reader"
|
|
|
|
" only handles version 2, 3, 4 and 5 information"), version);
|
2016-04-04 13:53:33 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
}
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2017-07-04 10:09:27 +02:00
|
|
|
if (version < 5)
|
|
|
|
unit_type = DW_UT_compile;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unit_type = read_1_byte (abfd, info_ptr, end_ptr);
|
|
|
|
info_ptr += 1;
|
|
|
|
|
|
|
|
addr_size = read_1_byte (abfd, info_ptr, end_ptr);
|
|
|
|
info_ptr += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
BFD_ASSERT (offset_size == 4 || offset_size == 8);
|
|
|
|
if (offset_size == 4)
|
|
|
|
abbrev_offset = read_4_bytes (abfd, info_ptr, end_ptr);
|
|
|
|
else
|
|
|
|
abbrev_offset = read_8_bytes (abfd, info_ptr, end_ptr);
|
|
|
|
info_ptr += offset_size;
|
|
|
|
|
|
|
|
if (version < 5)
|
|
|
|
{
|
|
|
|
addr_size = read_1_byte (abfd, info_ptr, end_ptr);
|
|
|
|
info_ptr += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unit_type == DW_UT_type)
|
|
|
|
{
|
|
|
|
/* Skip type signature. */
|
|
|
|
info_ptr += 8;
|
|
|
|
|
|
|
|
/* Skip type offset. */
|
|
|
|
info_ptr += offset_size;
|
|
|
|
}
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (addr_size > sizeof (bfd_vma))
|
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
2016-10-19 15:04:34 +02:00
|
|
|
/* xgettext: c-format */
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: found address size '%u', this reader"
|
|
|
|
" can not handle sizes greater than '%u'"),
|
2012-05-16 15:57:11 +02:00
|
|
|
addr_size,
|
|
|
|
(unsigned int) sizeof (bfd_vma));
|
1999-05-03 09:29:11 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2016-04-04 13:53:33 +02:00
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2000-02-23 23:27:55 +01:00
|
|
|
if (addr_size != 2 && addr_size != 4 && addr_size != 8)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
("DWARF error: found address size '%u', this reader"
|
|
|
|
" can only handle address sizes '2', '4' and '8'", addr_size);
|
1999-05-03 09:29:11 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2016-04-04 13:53:33 +02:00
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Read the abbrevs for this compilation unit into a table. */
|
2000-12-08 23:50:07 +01:00
|
|
|
abbrevs = read_abbrevs (abfd, abbrev_offset, stash);
|
1999-05-03 09:29:11 +02:00
|
|
|
if (! abbrevs)
|
2016-04-04 13:53:33 +02:00
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2017-02-17 02:26:11 +01:00
|
|
|
abbrev_number = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
|
|
|
|
FALSE, end_ptr);
|
1999-05-03 09:29:11 +02:00
|
|
|
info_ptr += bytes_read;
|
|
|
|
if (! abbrev_number)
|
|
|
|
{
|
2016-04-04 13:53:33 +02:00
|
|
|
/* PR 19872: An abbrev number of 0 probably means that there is padding
|
|
|
|
at the end of the .debug_abbrev section. Gold puts it there when
|
|
|
|
performing an incremental link, for example. So do not generate
|
|
|
|
an error, just return a NULL. */
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
abbrev = lookup_abbrev (abbrev_number, abbrevs);
|
|
|
|
if (! abbrev)
|
|
|
|
{
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
_bfd_error_handler (_("DWARF error: could not find abbrev number %u"),
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
abbrev_number);
|
1999-05-03 09:29:11 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2016-04-04 13:53:33 +02:00
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
amt = sizeof (struct comp_unit);
|
2009-09-09 23:38:59 +02:00
|
|
|
unit = (struct comp_unit *) bfd_zalloc (abfd, amt);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (unit == NULL)
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
unit->abfd = abfd;
|
2008-09-08 23:58:29 +02:00
|
|
|
unit->version = version;
|
2000-11-16 20:29:48 +01:00
|
|
|
unit->addr_size = addr_size;
|
2001-11-14 12:16:47 +01:00
|
|
|
unit->offset_size = offset_size;
|
1999-05-03 09:29:11 +02:00
|
|
|
unit->abbrevs = abbrevs;
|
|
|
|
unit->end_ptr = end_ptr;
|
2001-11-14 12:16:47 +01:00
|
|
|
unit->stash = stash;
|
2005-01-17 18:12:00 +01:00
|
|
|
unit->info_ptr_unit = info_ptr_unit;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
for (i = 0; i < abbrev->num_attrs; ++i)
|
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
info_ptr = read_attribute (&attr, &abbrev->attrs[i], unit, info_ptr, end_ptr);
|
2010-03-04 05:01:53 +01:00
|
|
|
if (info_ptr == NULL)
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* Store the data if it is of an attribute we want to keep in a
|
|
|
|
partial symbol table. */
|
|
|
|
switch (attr.name)
|
|
|
|
{
|
|
|
|
case DW_AT_stmt_list:
|
|
|
|
unit->stmtlist = 1;
|
2003-10-30 10:50:02 +01:00
|
|
|
unit->line_offset = attr.u.val;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_name:
|
2017-09-25 12:16:34 +02:00
|
|
|
if (is_str_attr (attr.form))
|
|
|
|
unit->name = attr.u.str;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_low_pc:
|
2005-04-03 22:36:37 +02:00
|
|
|
low_pc = attr.u.val;
|
|
|
|
/* If the compilation unit DIE has a DW_AT_low_pc attribute,
|
|
|
|
this is the base address to use when reading location
|
2016-11-08 13:01:58 +01:00
|
|
|
lists or range lists. */
|
2012-05-16 15:57:11 +02:00
|
|
|
if (abbrev->tag == DW_TAG_compile_unit)
|
|
|
|
unit->base_address = low_pc;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_high_pc:
|
2005-04-03 22:36:37 +02:00
|
|
|
high_pc = attr.u.val;
|
2012-04-27 21:03:04 +02:00
|
|
|
high_pc_relative = attr.form != DW_FORM_addr;
|
2005-04-03 22:36:37 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_ranges:
|
2010-03-04 05:01:53 +01:00
|
|
|
if (!read_rangelist (unit, &unit->arange, attr.u.val))
|
|
|
|
return NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DW_AT_comp_dir:
|
|
|
|
{
|
2005-02-20 15:59:07 +01:00
|
|
|
char *comp_dir = attr.u.str;
|
2015-01-27 16:49:12 +01:00
|
|
|
|
|
|
|
/* PR 17512: file: 1fe726be. */
|
|
|
|
if (! is_str_attr (attr.form))
|
|
|
|
{
|
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
2016-09-30 05:30:18 +02:00
|
|
|
_bfd_error_handler
|
ELF linker messages
This fixes a number of cases where we capitalized error messages or
printed a full-stop, and corrects "Dwarf" to "DWARF".
bfd/
* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
* elflink.c: Standardize error/warning messages. Replace use of
linker callback einfo with _bfd_error_handler when possible.
ld/
* testsuite/ld-elf/indirect.exp,
* testsuite/ld-elf/pr22649-2ab-mips.msg,
* testsuite/ld-elf/pr22649-2cd-mips.msg,
* testsuite/ld-elf/pr22649.msg,
* testsuite/ld-elf/tls_common.exp,
* testsuite/ld-elfcomm/elfcomm.exp,
* testsuite/ld-arm/attr-merge-incompatible.d,
* testsuite/ld-tic6x/attr-compatibility-gnu-other.d,
* testsuite/ld-tic6x/attr-compatibility-other-gnu.d,
* testsuite/ld-tic6x/attr-compatibility-other-other.d,
* testsuite/ld-i386/warn1.d: Update expected error/warning messages.
2018-02-20 10:02:12 +01:00
|
|
|
(_("DWARF error: DW_AT_comp_dir attribute encountered with a non-string form"));
|
2015-01-27 16:49:12 +01:00
|
|
|
comp_dir = NULL;
|
|
|
|
}
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (comp_dir)
|
|
|
|
{
|
|
|
|
/* Irix 6.2 native cc prepends <machine>.: to the compilation
|
|
|
|
directory, get rid of it. */
|
2004-01-12 06:34:16 +01:00
|
|
|
char *cp = strchr (comp_dir, ':');
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (cp && cp != comp_dir && cp[-1] == '.' && cp[1] == '/')
|
|
|
|
comp_dir = cp + 1;
|
|
|
|
}
|
|
|
|
unit->comp_dir = comp_dir;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-12-10 00:21:56 +01:00
|
|
|
case DW_AT_language:
|
|
|
|
unit->lang = attr.u.val;
|
|
|
|
break;
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-04-27 21:03:04 +02:00
|
|
|
if (high_pc_relative)
|
|
|
|
high_pc += low_pc;
|
2005-04-03 22:36:37 +02:00
|
|
|
if (high_pc != 0)
|
2008-02-12 01:26:00 +01:00
|
|
|
{
|
2012-05-16 15:57:11 +02:00
|
|
|
if (!arange_add (unit, &unit->arange, low_pc, high_pc))
|
2010-03-04 05:01:53 +01:00
|
|
|
return NULL;
|
2008-02-12 01:26:00 +01:00
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
unit->first_child_die_ptr = info_ptr;
|
|
|
|
return unit;
|
|
|
|
}
|
|
|
|
|
2006-01-17 18:12:58 +01:00
|
|
|
/* Return TRUE if UNIT may contain the address given by ADDR. When
|
|
|
|
there are functions written entirely with inline asm statements, the
|
|
|
|
range info in the compilation unit header may not be correct. We
|
|
|
|
need to consult the line info table to see if a compilation unit
|
|
|
|
really contains the given address. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
static bfd_boolean
|
2004-01-12 06:34:16 +01:00
|
|
|
comp_unit_contains_address (struct comp_unit *unit, bfd_vma addr)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2008-02-12 01:26:00 +01:00
|
|
|
struct arange *arange;
|
|
|
|
|
|
|
|
if (unit->error)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
arange = &unit->arange;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (addr >= arange->low && addr < arange->high)
|
|
|
|
return TRUE;
|
|
|
|
arange = arange->next;
|
|
|
|
}
|
|
|
|
while (arange);
|
|
|
|
|
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If UNIT contains ADDR, set the output parameters to the values for
|
|
|
|
the line containing ADDR. The output parameters, FILENAME_PTR,
|
2014-12-10 00:21:56 +01:00
|
|
|
FUNCTION_PTR, and LINENUMBER_PTR, are pointers to the objects
|
2000-11-16 20:29:48 +01:00
|
|
|
to be filled in.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2013-10-25 10:32:43 +02:00
|
|
|
Returns the range of addresses covered by the entry that was used
|
|
|
|
to fill in *LINENUMBER_PTR or 0 if it was not filled in. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2013-10-25 10:32:43 +02:00
|
|
|
static bfd_vma
|
2004-01-12 06:34:16 +01:00
|
|
|
comp_unit_find_nearest_line (struct comp_unit *unit,
|
|
|
|
bfd_vma addr,
|
|
|
|
const char **filename_ptr,
|
2014-12-10 00:21:56 +01:00
|
|
|
struct funcinfo **function_ptr,
|
2004-01-12 06:34:16 +01:00
|
|
|
unsigned int *linenumber_ptr,
|
2012-07-24 23:06:58 +02:00
|
|
|
unsigned int *discriminator_ptr,
|
2004-01-12 06:34:16 +01:00
|
|
|
struct dwarf2_debug *stash)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2002-11-30 09:39:46 +01:00
|
|
|
bfd_boolean func_p;
|
2000-11-16 20:29:48 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (unit->error)
|
2002-11-30 09:39:46 +01:00
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (! unit->line_table)
|
|
|
|
{
|
|
|
|
if (! unit->stmtlist)
|
|
|
|
{
|
|
|
|
unit->error = 1;
|
2002-11-30 09:39:46 +01:00
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2000-12-08 23:50:07 +01:00
|
|
|
unit->line_table = decode_line_info (unit, stash);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (! unit->line_table)
|
|
|
|
{
|
|
|
|
unit->error = 1;
|
2002-11-30 09:39:46 +01:00
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-11-16 20:29:48 +01:00
|
|
|
|
2001-10-06 12:01:09 +02:00
|
|
|
if (unit->first_child_die_ptr < unit->end_ptr
|
2005-06-06 16:28:31 +02:00
|
|
|
&& ! scan_unit_for_symbols (unit))
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
unit->error = 1;
|
2002-11-30 09:39:46 +01:00
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-10 00:21:56 +01:00
|
|
|
*function_ptr = NULL;
|
|
|
|
func_p = lookup_address_in_function_table (unit, addr, function_ptr);
|
|
|
|
if (func_p && (*function_ptr)->tag == DW_TAG_inlined_subroutine)
|
|
|
|
stash->inliner_chain = *function_ptr;
|
2013-10-25 10:32:43 +02:00
|
|
|
|
|
|
|
return lookup_address_in_line_info_table (unit->line_table, addr,
|
|
|
|
filename_ptr,
|
|
|
|
linenumber_ptr,
|
|
|
|
discriminator_ptr);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
/* Check to see if line info is already decoded in a comp_unit.
|
|
|
|
If not, decode it. Returns TRUE if no errors were encountered;
|
2005-06-06 16:28:31 +02:00
|
|
|
FALSE otherwise. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
comp_unit_maybe_decode_line_info (struct comp_unit *unit,
|
|
|
|
struct dwarf2_debug *stash)
|
2005-06-06 16:28:31 +02:00
|
|
|
{
|
|
|
|
if (unit->error)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (! unit->line_table)
|
|
|
|
{
|
|
|
|
if (! unit->stmtlist)
|
|
|
|
{
|
|
|
|
unit->error = 1;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
unit->line_table = decode_line_info (unit, stash);
|
|
|
|
|
|
|
|
if (! unit->line_table)
|
|
|
|
{
|
|
|
|
unit->error = 1;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unit->first_child_die_ptr < unit->end_ptr
|
|
|
|
&& ! scan_unit_for_symbols (unit))
|
|
|
|
{
|
|
|
|
unit->error = 1;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If UNIT contains SYM at ADDR, set the output parameters to the
|
|
|
|
values for the line containing SYM. The output parameters,
|
|
|
|
FILENAME_PTR, and LINENUMBER_PTR, are pointers to the objects to be
|
|
|
|
filled in.
|
|
|
|
|
|
|
|
Return TRUE if UNIT contains SYM, and no errors were encountered;
|
|
|
|
FALSE otherwise. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
comp_unit_find_line (struct comp_unit *unit,
|
|
|
|
asymbol *sym,
|
|
|
|
bfd_vma addr,
|
|
|
|
const char **filename_ptr,
|
|
|
|
unsigned int *linenumber_ptr,
|
|
|
|
struct dwarf2_debug *stash)
|
|
|
|
{
|
|
|
|
if (!comp_unit_maybe_decode_line_info (unit, stash))
|
|
|
|
return FALSE;
|
|
|
|
|
2005-06-06 16:28:31 +02:00
|
|
|
if (sym->flags & BSF_FUNCTION)
|
|
|
|
return lookup_symbol_in_function_table (unit, sym, addr,
|
|
|
|
filename_ptr,
|
|
|
|
linenumber_ptr);
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
|
|
|
|
return lookup_symbol_in_variable_table (unit, sym, addr,
|
|
|
|
filename_ptr,
|
|
|
|
linenumber_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct funcinfo *
|
|
|
|
reverse_funcinfo_list (struct funcinfo *head)
|
|
|
|
{
|
|
|
|
struct funcinfo *rhead;
|
|
|
|
struct funcinfo *temp;
|
|
|
|
|
|
|
|
for (rhead = NULL; head; head = temp)
|
|
|
|
{
|
|
|
|
temp = head->prev_func;
|
|
|
|
head->prev_func = rhead;
|
|
|
|
rhead = head;
|
|
|
|
}
|
|
|
|
return rhead;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct varinfo *
|
|
|
|
reverse_varinfo_list (struct varinfo *head)
|
|
|
|
{
|
|
|
|
struct varinfo *rhead;
|
|
|
|
struct varinfo *temp;
|
|
|
|
|
|
|
|
for (rhead = NULL; head; head = temp)
|
|
|
|
{
|
|
|
|
temp = head->prev_var;
|
|
|
|
head->prev_var = rhead;
|
|
|
|
rhead = head;
|
|
|
|
}
|
|
|
|
return rhead;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Extract all interesting funcinfos and varinfos of a compilation
|
|
|
|
unit into hash tables for faster lookup. Returns TRUE if no
|
|
|
|
errors were enountered; FALSE otherwise. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
comp_unit_hash_info (struct dwarf2_debug *stash,
|
|
|
|
struct comp_unit *unit,
|
|
|
|
struct info_hash_table *funcinfo_hash_table,
|
|
|
|
struct info_hash_table *varinfo_hash_table)
|
|
|
|
{
|
|
|
|
struct funcinfo* each_func;
|
|
|
|
struct varinfo* each_var;
|
|
|
|
bfd_boolean okay = TRUE;
|
|
|
|
|
|
|
|
BFD_ASSERT (stash->info_hash_status != STASH_INFO_HASH_DISABLED);
|
|
|
|
|
|
|
|
if (!comp_unit_maybe_decode_line_info (unit, stash))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
BFD_ASSERT (!unit->cached);
|
|
|
|
|
|
|
|
/* To preserve the original search order, we went to visit the function
|
|
|
|
infos in the reversed order of the list. However, making the list
|
|
|
|
bi-directional use quite a bit of extra memory. So we reverse
|
|
|
|
the list first, traverse the list in the now reversed order and
|
|
|
|
finally reverse the list again to get back the original order. */
|
|
|
|
unit->function_table = reverse_funcinfo_list (unit->function_table);
|
|
|
|
for (each_func = unit->function_table;
|
|
|
|
each_func && okay;
|
|
|
|
each_func = each_func->prev_func)
|
|
|
|
{
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Skip nameless functions. */
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
if (each_func->name)
|
|
|
|
/* There is no need to copy name string into hash table as
|
|
|
|
name string is either in the dwarf string buffer or
|
|
|
|
info in the stash. */
|
|
|
|
okay = insert_info_hash_table (funcinfo_hash_table, each_func->name,
|
|
|
|
(void*) each_func, FALSE);
|
|
|
|
}
|
|
|
|
unit->function_table = reverse_funcinfo_list (unit->function_table);
|
|
|
|
if (!okay)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* We do the same for variable infos. */
|
|
|
|
unit->variable_table = reverse_varinfo_list (unit->variable_table);
|
|
|
|
for (each_var = unit->variable_table;
|
|
|
|
each_var && okay;
|
|
|
|
each_var = each_var->prev_var)
|
|
|
|
{
|
|
|
|
/* Skip stack vars and vars with no files or names. */
|
|
|
|
if (each_var->stack == 0
|
|
|
|
&& each_var->file != NULL
|
|
|
|
&& each_var->name != NULL)
|
|
|
|
/* There is no need to copy name string into hash table as
|
|
|
|
name string is either in the dwarf string buffer or
|
|
|
|
info in the stash. */
|
|
|
|
okay = insert_info_hash_table (varinfo_hash_table, each_var->name,
|
|
|
|
(void*) each_var, FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
unit->variable_table = reverse_varinfo_list (unit->variable_table);
|
|
|
|
unit->cached = TRUE;
|
|
|
|
return okay;
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
|
|
|
|
2002-09-23 18:13:52 +02:00
|
|
|
/* Locate a section in a BFD containing debugging info. The search starts
|
|
|
|
from the section after AFTER_SEC, or from the first section in the BFD if
|
|
|
|
AFTER_SEC is NULL. The search works by examining the names of the
|
2011-09-30 12:39:45 +02:00
|
|
|
sections. There are three permissiable names. The first two are given
|
|
|
|
by DEBUG_SECTIONS[debug_info] (whose standard DWARF2 names are .debug_info
|
|
|
|
and .zdebug_info). The third is a prefix .gnu.linkonce.wi.
|
2002-09-23 18:13:52 +02:00
|
|
|
This is a variation on the .debug_info section which has a checksum
|
|
|
|
describing the contents appended onto the name. This allows the linker to
|
|
|
|
identify and discard duplicate debugging sections for different
|
|
|
|
compilation units. */
|
2000-09-02 22:21:40 +02:00
|
|
|
#define GNU_LINKONCE_INFO ".gnu.linkonce.wi."
|
|
|
|
|
|
|
|
static asection *
|
2011-09-30 12:39:45 +02:00
|
|
|
find_debug_info (bfd *abfd, const struct dwarf_debug_section *debug_sections,
|
2014-04-24 14:29:56 +02:00
|
|
|
asection *after_sec)
|
2000-09-02 22:21:40 +02:00
|
|
|
{
|
2012-05-16 15:57:11 +02:00
|
|
|
asection *msec;
|
|
|
|
const char *look;
|
|
|
|
|
|
|
|
if (after_sec == NULL)
|
|
|
|
{
|
|
|
|
look = debug_sections[debug_info].uncompressed_name;
|
|
|
|
msec = bfd_get_section_by_name (abfd, look);
|
|
|
|
if (msec != NULL)
|
|
|
|
return msec;
|
2000-09-02 22:21:40 +02:00
|
|
|
|
2012-05-16 15:57:11 +02:00
|
|
|
look = debug_sections[debug_info].compressed_name;
|
|
|
|
if (look != NULL)
|
|
|
|
{
|
|
|
|
msec = bfd_get_section_by_name (abfd, look);
|
|
|
|
if (msec != NULL)
|
|
|
|
return msec;
|
|
|
|
}
|
2000-09-02 22:21:40 +02:00
|
|
|
|
2012-05-16 15:57:11 +02:00
|
|
|
for (msec = abfd->sections; msec != NULL; msec = msec->next)
|
|
|
|
if (CONST_STRNEQ (msec->name, GNU_LINKONCE_INFO))
|
|
|
|
return msec;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (msec = after_sec->next; msec != NULL; msec = msec->next)
|
2000-09-02 22:21:40 +02:00
|
|
|
{
|
2012-05-16 15:57:11 +02:00
|
|
|
look = debug_sections[debug_info].uncompressed_name;
|
|
|
|
if (strcmp (msec->name, look) == 0)
|
2000-09-02 22:21:40 +02:00
|
|
|
return msec;
|
|
|
|
|
2012-05-16 15:57:11 +02:00
|
|
|
look = debug_sections[debug_info].compressed_name;
|
|
|
|
if (look != NULL && strcmp (msec->name, look) == 0)
|
2008-07-10 03:32:23 +02:00
|
|
|
return msec;
|
|
|
|
|
2006-09-16 20:12:17 +02:00
|
|
|
if (CONST_STRNEQ (msec->name, GNU_LINKONCE_INFO))
|
2000-09-02 22:21:40 +02:00
|
|
|
return msec;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
/* Transfer VMAs from object file to separate debug file. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
set_debug_vma (bfd *orig_bfd, bfd *debug_bfd)
|
|
|
|
{
|
|
|
|
asection *s, *d;
|
|
|
|
|
|
|
|
for (s = orig_bfd->sections, d = debug_bfd->sections;
|
|
|
|
s != NULL && d != NULL;
|
|
|
|
s = s->next, d = d->next)
|
|
|
|
{
|
|
|
|
if ((d->flags & SEC_DEBUGGING) != 0)
|
|
|
|
break;
|
|
|
|
/* ??? Assumes 1-1 correspondence between sections in the
|
|
|
|
two files. */
|
|
|
|
if (strcmp (s->name, d->name) == 0)
|
|
|
|
{
|
|
|
|
d->output_section = s->output_section;
|
|
|
|
d->output_offset = s->output_offset;
|
|
|
|
d->vma = s->vma;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
/* Unset vmas for adjusted sections in STASH. */
|
2006-03-06 02:36:52 +01:00
|
|
|
|
|
|
|
static void
|
|
|
|
unset_sections (struct dwarf2_debug *stash)
|
|
|
|
{
|
2014-04-24 14:29:56 +02:00
|
|
|
int i;
|
2008-09-08 23:58:29 +02:00
|
|
|
struct adjusted_section *p;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
i = stash->adjusted_section_count;
|
|
|
|
p = stash->adjusted_sections;
|
2006-03-06 02:36:52 +01:00
|
|
|
for (; i > 0; i--, p++)
|
|
|
|
p->section->vma = 0;
|
|
|
|
}
|
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
/* Set VMAs for allocated and .debug_info sections in ORIG_BFD, a
|
|
|
|
relocatable object file. VMAs are normally all zero in relocatable
|
|
|
|
object files, so if we want to distinguish locations in sections by
|
|
|
|
address we need to set VMAs so the sections do not overlap. We
|
|
|
|
also set VMA on .debug_info so that when we have multiple
|
|
|
|
.debug_info sections (or the linkonce variant) they also do not
|
|
|
|
overlap. The multiple .debug_info sections make up a single
|
|
|
|
logical section. ??? We should probably do the same for other
|
|
|
|
debug sections. */
|
2006-02-15 23:29:42 +01:00
|
|
|
|
|
|
|
static bfd_boolean
|
2014-04-24 14:29:56 +02:00
|
|
|
place_sections (bfd *orig_bfd, struct dwarf2_debug *stash)
|
2006-02-15 23:29:42 +01:00
|
|
|
{
|
2014-04-24 14:29:56 +02:00
|
|
|
bfd *abfd;
|
2008-09-08 23:58:29 +02:00
|
|
|
struct adjusted_section *p;
|
2014-04-24 14:29:56 +02:00
|
|
|
int i;
|
|
|
|
const char *debug_info_name;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
if (stash->adjusted_section_count != 0)
|
2006-02-15 23:29:42 +01:00
|
|
|
{
|
2008-09-08 23:58:29 +02:00
|
|
|
i = stash->adjusted_section_count;
|
|
|
|
p = stash->adjusted_sections;
|
2006-03-06 02:36:52 +01:00
|
|
|
for (; i > 0; i--, p++)
|
|
|
|
p->section->vma = p->adj_vma;
|
2014-04-24 14:29:56 +02:00
|
|
|
return TRUE;
|
2006-03-06 02:36:52 +01:00
|
|
|
}
|
2014-04-24 14:29:56 +02:00
|
|
|
|
|
|
|
debug_info_name = stash->debug_sections[debug_info].uncompressed_name;
|
|
|
|
i = 0;
|
|
|
|
abfd = orig_bfd;
|
|
|
|
while (1)
|
2006-03-06 02:36:52 +01:00
|
|
|
{
|
|
|
|
asection *sect;
|
2006-02-15 23:29:42 +01:00
|
|
|
|
2006-03-06 02:36:52 +01:00
|
|
|
for (sect = abfd->sections; sect != NULL; sect = sect->next)
|
2006-02-15 23:29:42 +01:00
|
|
|
{
|
2008-09-08 23:58:29 +02:00
|
|
|
int is_debug_info;
|
|
|
|
|
PR ld/16787, stale dwarf2 stash
Throw away the dwarf2 stash if it becomes invalid due to section
VMAs changing. It would be nice to reclaim all the bfd_alloc
memory here when we throw away the stash, perhaps by putting
everything we alloc on a private dwarf2 objalloc, but I haven't done
that with this patch.
I've also fixed a problem with bfd_perform_relocation losing reloc
addends, which meant a second or subsequent look at debug info
sections did not properly relocate the sections. I can't see why
bfd_perform_relocation should need to change addends except for ld -r,
and the history (985fca12, e98e6ec1) doesn't help much.
Finally, the patch tweaks place_sections to avoid unnecessary work.
If we've mapped input to output sections, then input section VMA
isn't used so there's not much point in adjusting it. Incidentally,
this also means place_sections isn't effective in all cases.
PR ld/16787
* dwarf2.c (struct dwarf2_debug): Add sec_vma field.
(place_sections): Do not modify VMA of sections when called from
linker after sections have been placed in output sections. Short
circuit single section case.
(save_section_vma, section_vma_same): New functions.
(_bfd_dwarf2_slurp_debug_info): Throw away stash if section VMAs
change.
* reloc.c (bfd_perform_relocation): Do not modify reloc addend
when non-relocatable.
2014-04-23 06:56:19 +02:00
|
|
|
if ((sect->output_section != NULL
|
2014-04-24 14:29:56 +02:00
|
|
|
&& sect->output_section != sect
|
|
|
|
&& (sect->flags & SEC_DEBUGGING) == 0)
|
PR ld/16787, stale dwarf2 stash
Throw away the dwarf2 stash if it becomes invalid due to section
VMAs changing. It would be nice to reclaim all the bfd_alloc
memory here when we throw away the stash, perhaps by putting
everything we alloc on a private dwarf2 objalloc, but I haven't done
that with this patch.
I've also fixed a problem with bfd_perform_relocation losing reloc
addends, which meant a second or subsequent look at debug info
sections did not properly relocate the sections. I can't see why
bfd_perform_relocation should need to change addends except for ld -r,
and the history (985fca12, e98e6ec1) doesn't help much.
Finally, the patch tweaks place_sections to avoid unnecessary work.
If we've mapped input to output sections, then input section VMA
isn't used so there's not much point in adjusting it. Incidentally,
this also means place_sections isn't effective in all cases.
PR ld/16787
* dwarf2.c (struct dwarf2_debug): Add sec_vma field.
(place_sections): Do not modify VMA of sections when called from
linker after sections have been placed in output sections. Short
circuit single section case.
(save_section_vma, section_vma_same): New functions.
(_bfd_dwarf2_slurp_debug_info): Throw away stash if section VMAs
change.
* reloc.c (bfd_perform_relocation): Do not modify reloc addend
when non-relocatable.
2014-04-23 06:56:19 +02:00
|
|
|
|| sect->vma != 0)
|
2008-09-08 23:58:29 +02:00
|
|
|
continue;
|
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
is_debug_info = (strcmp (sect->name, debug_info_name) == 0
|
|
|
|
|| CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO));
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
if (!((sect->flags & SEC_ALLOC) != 0 && abfd == orig_bfd)
|
|
|
|
&& !is_debug_info)
|
2006-03-06 02:36:52 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
i++;
|
|
|
|
}
|
2014-04-24 14:29:56 +02:00
|
|
|
if (abfd == stash->bfd_ptr)
|
|
|
|
break;
|
|
|
|
abfd = stash->bfd_ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i <= 1)
|
|
|
|
stash->adjusted_section_count = -1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_vma last_vma = 0, last_dwarf = 0;
|
|
|
|
bfd_size_type amt = i * sizeof (struct adjusted_section);
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
p = (struct adjusted_section *) bfd_malloc (amt);
|
|
|
|
if (p == NULL)
|
2006-03-06 02:36:52 +01:00
|
|
|
return FALSE;
|
|
|
|
|
2008-09-08 23:58:29 +02:00
|
|
|
stash->adjusted_sections = p;
|
|
|
|
stash->adjusted_section_count = i;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
abfd = orig_bfd;
|
|
|
|
while (1)
|
2006-03-06 02:36:52 +01:00
|
|
|
{
|
2014-04-24 14:29:56 +02:00
|
|
|
asection *sect;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
for (sect = abfd->sections; sect != NULL; sect = sect->next)
|
|
|
|
{
|
|
|
|
bfd_size_type sz;
|
|
|
|
int is_debug_info;
|
2008-09-08 23:58:29 +02:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
if ((sect->output_section != NULL
|
|
|
|
&& sect->output_section != sect
|
|
|
|
&& (sect->flags & SEC_DEBUGGING) == 0)
|
|
|
|
|| sect->vma != 0)
|
|
|
|
continue;
|
2008-09-08 23:58:29 +02:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
is_debug_info = (strcmp (sect->name, debug_info_name) == 0
|
|
|
|
|| CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO));
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
if (!((sect->flags & SEC_ALLOC) != 0 && abfd == orig_bfd)
|
|
|
|
&& !is_debug_info)
|
|
|
|
continue;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
sz = sect->rawsize ? sect->rawsize : sect->size;
|
2008-09-08 23:58:29 +02:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
if (is_debug_info)
|
|
|
|
{
|
|
|
|
BFD_ASSERT (sect->alignment_power == 0);
|
|
|
|
sect->vma = last_dwarf;
|
|
|
|
last_dwarf += sz;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Align the new address to the current section
|
|
|
|
alignment. */
|
|
|
|
last_vma = ((last_vma
|
2015-11-09 17:12:56 +01:00
|
|
|
+ ~(-((bfd_vma) 1 << sect->alignment_power)))
|
|
|
|
& (-((bfd_vma) 1 << sect->alignment_power)));
|
2014-04-24 14:29:56 +02:00
|
|
|
sect->vma = last_vma;
|
|
|
|
last_vma += sz;
|
|
|
|
}
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
p->section = sect;
|
|
|
|
p->adj_vma = sect->vma;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
if (abfd == stash->bfd_ptr)
|
|
|
|
break;
|
|
|
|
abfd = stash->bfd_ptr;
|
2006-02-15 23:29:42 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
if (orig_bfd != stash->bfd_ptr)
|
|
|
|
set_debug_vma (orig_bfd, stash->bfd_ptr);
|
|
|
|
|
2006-02-15 23:29:42 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
/* Look up a funcinfo by name using the given info hash table. If found,
|
|
|
|
also update the locations pointed to by filename_ptr and linenumber_ptr.
|
|
|
|
|
|
|
|
This function returns TRUE if a funcinfo that matches the given symbol
|
|
|
|
and address is found with any error; otherwise it returns FALSE. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
info_hash_lookup_funcinfo (struct info_hash_table *hash_table,
|
|
|
|
asymbol *sym,
|
|
|
|
bfd_vma addr,
|
|
|
|
const char **filename_ptr,
|
|
|
|
unsigned int *linenumber_ptr)
|
|
|
|
{
|
|
|
|
struct funcinfo* each_func;
|
|
|
|
struct funcinfo* best_fit = NULL;
|
2014-05-28 09:21:11 +02:00
|
|
|
bfd_vma best_fit_len = 0;
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
struct info_list_node *node;
|
|
|
|
struct arange *arange;
|
|
|
|
const char *name = bfd_asymbol_name (sym);
|
|
|
|
asection *sec = bfd_get_section (sym);
|
|
|
|
|
|
|
|
for (node = lookup_info_hash_table (hash_table, name);
|
|
|
|
node;
|
|
|
|
node = node->next)
|
|
|
|
{
|
2009-09-09 23:38:59 +02:00
|
|
|
each_func = (struct funcinfo *) node->info;
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
for (arange = &each_func->arange;
|
|
|
|
arange;
|
|
|
|
arange = arange->next)
|
|
|
|
{
|
|
|
|
if ((!each_func->sec || each_func->sec == sec)
|
|
|
|
&& addr >= arange->low
|
|
|
|
&& addr < arange->high
|
|
|
|
&& (!best_fit
|
2014-05-28 09:21:11 +02:00
|
|
|
|| arange->high - arange->low < best_fit_len))
|
|
|
|
{
|
|
|
|
best_fit = each_func;
|
|
|
|
best_fit_len = arange->high - arange->low;
|
|
|
|
}
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (best_fit)
|
|
|
|
{
|
|
|
|
best_fit->sec = sec;
|
|
|
|
*filename_ptr = best_fit->file;
|
|
|
|
*linenumber_ptr = best_fit->line;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look up a varinfo by name using the given info hash table. If found,
|
|
|
|
also update the locations pointed to by filename_ptr and linenumber_ptr.
|
|
|
|
|
|
|
|
This function returns TRUE if a varinfo that matches the given symbol
|
|
|
|
and address is found with any error; otherwise it returns FALSE. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
info_hash_lookup_varinfo (struct info_hash_table *hash_table,
|
|
|
|
asymbol *sym,
|
|
|
|
bfd_vma addr,
|
|
|
|
const char **filename_ptr,
|
|
|
|
unsigned int *linenumber_ptr)
|
|
|
|
{
|
|
|
|
const char *name = bfd_asymbol_name (sym);
|
|
|
|
asection *sec = bfd_get_section (sym);
|
|
|
|
struct varinfo* each;
|
|
|
|
struct info_list_node *node;
|
|
|
|
|
|
|
|
for (node = lookup_info_hash_table (hash_table, name);
|
|
|
|
node;
|
|
|
|
node = node->next)
|
|
|
|
{
|
2009-09-09 23:38:59 +02:00
|
|
|
each = (struct varinfo *) node->info;
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
if (each->addr == addr
|
|
|
|
&& (!each->sec || each->sec == sec))
|
|
|
|
{
|
|
|
|
each->sec = sec;
|
|
|
|
*filename_ptr = each->file;
|
|
|
|
*linenumber_ptr = each->line;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the funcinfo and varinfo info hash tables if they are
|
|
|
|
not up to date. Returns TRUE if there is no error; otherwise
|
|
|
|
returns FALSE and disable the info hash tables. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
stash_maybe_update_info_hash_tables (struct dwarf2_debug *stash)
|
|
|
|
{
|
|
|
|
struct comp_unit *each;
|
|
|
|
|
|
|
|
/* Exit if hash tables are up-to-date. */
|
|
|
|
if (stash->all_comp_units == stash->hash_units_head)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
if (stash->hash_units_head)
|
|
|
|
each = stash->hash_units_head->prev_unit;
|
|
|
|
else
|
|
|
|
each = stash->last_comp_unit;
|
|
|
|
|
|
|
|
while (each)
|
|
|
|
{
|
|
|
|
if (!comp_unit_hash_info (stash, each, stash->funcinfo_hash_table,
|
|
|
|
stash->varinfo_hash_table))
|
|
|
|
{
|
|
|
|
stash->info_hash_status = STASH_INFO_HASH_DISABLED;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
each = each->prev_unit;
|
|
|
|
}
|
|
|
|
|
|
|
|
stash->hash_units_head = stash->all_comp_units;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
/* Check consistency of info hash tables. This is for debugging only. */
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
|
|
|
|
static void ATTRIBUTE_UNUSED
|
|
|
|
stash_verify_info_hash_table (struct dwarf2_debug *stash)
|
|
|
|
{
|
|
|
|
struct comp_unit *each_unit;
|
|
|
|
struct funcinfo *each_func;
|
|
|
|
struct varinfo *each_var;
|
|
|
|
struct info_list_node *node;
|
|
|
|
bfd_boolean found;
|
|
|
|
|
|
|
|
for (each_unit = stash->all_comp_units;
|
|
|
|
each_unit;
|
|
|
|
each_unit = each_unit->next_unit)
|
|
|
|
{
|
|
|
|
for (each_func = each_unit->function_table;
|
|
|
|
each_func;
|
|
|
|
each_func = each_func->prev_func)
|
|
|
|
{
|
|
|
|
if (!each_func->name)
|
|
|
|
continue;
|
|
|
|
node = lookup_info_hash_table (stash->funcinfo_hash_table,
|
|
|
|
each_func->name);
|
|
|
|
BFD_ASSERT (node);
|
|
|
|
found = FALSE;
|
|
|
|
while (node && !found)
|
|
|
|
{
|
|
|
|
found = node->info == each_func;
|
|
|
|
node = node->next;
|
|
|
|
}
|
|
|
|
BFD_ASSERT (found);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (each_var = each_unit->variable_table;
|
|
|
|
each_var;
|
|
|
|
each_var = each_var->prev_var)
|
|
|
|
{
|
|
|
|
if (!each_var->name || !each_var->file || each_var->stack)
|
|
|
|
continue;
|
|
|
|
node = lookup_info_hash_table (stash->varinfo_hash_table,
|
|
|
|
each_var->name);
|
|
|
|
BFD_ASSERT (node);
|
|
|
|
found = FALSE;
|
|
|
|
while (node && !found)
|
|
|
|
{
|
|
|
|
found = node->info == each_var;
|
|
|
|
node = node->next;
|
|
|
|
}
|
|
|
|
BFD_ASSERT (found);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check to see if we want to enable the info hash tables, which consume
|
|
|
|
quite a bit of memory. Currently we only check the number times
|
|
|
|
bfd_dwarf2_find_line is called. In the future, we may also want to
|
|
|
|
take the number of symbols into account. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
stash_maybe_enable_info_hash_tables (bfd *abfd, struct dwarf2_debug *stash)
|
|
|
|
{
|
|
|
|
BFD_ASSERT (stash->info_hash_status == STASH_INFO_HASH_OFF);
|
|
|
|
|
|
|
|
if (stash->info_hash_count++ < STASH_INFO_HASH_TRIGGER)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* FIXME: Maybe we should check the reduce_memory_overheads
|
|
|
|
and optimize fields in the bfd_link_info structure ? */
|
|
|
|
|
|
|
|
/* Create hash tables. */
|
|
|
|
stash->funcinfo_hash_table = create_info_hash_table (abfd);
|
|
|
|
stash->varinfo_hash_table = create_info_hash_table (abfd);
|
|
|
|
if (!stash->funcinfo_hash_table || !stash->varinfo_hash_table)
|
|
|
|
{
|
|
|
|
/* Turn off info hashes if any allocation above fails. */
|
|
|
|
stash->info_hash_status = STASH_INFO_HASH_DISABLED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* We need a forced update so that the info hash tables will
|
|
|
|
be created even though there is no compilation unit. That
|
|
|
|
happens if STASH_INFO_HASH_TRIGGER is 0. */
|
|
|
|
stash_maybe_update_info_hash_tables (stash);
|
|
|
|
stash->info_hash_status = STASH_INFO_HASH_ON;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the file and line associated with a symbol and address using the
|
|
|
|
info hash tables of a stash. If there is a match, the function returns
|
|
|
|
TRUE and update the locations pointed to by filename_ptr and linenumber_ptr;
|
|
|
|
otherwise it returns FALSE. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
stash_find_line_fast (struct dwarf2_debug *stash,
|
|
|
|
asymbol *sym,
|
|
|
|
bfd_vma addr,
|
|
|
|
const char **filename_ptr,
|
|
|
|
unsigned int *linenumber_ptr)
|
|
|
|
{
|
|
|
|
BFD_ASSERT (stash->info_hash_status == STASH_INFO_HASH_ON);
|
|
|
|
|
|
|
|
if (sym->flags & BSF_FUNCTION)
|
|
|
|
return info_hash_lookup_funcinfo (stash->funcinfo_hash_table, sym, addr,
|
|
|
|
filename_ptr, linenumber_ptr);
|
|
|
|
return info_hash_lookup_varinfo (stash->varinfo_hash_table, sym, addr,
|
|
|
|
filename_ptr, linenumber_ptr);
|
|
|
|
}
|
|
|
|
|
PR ld/16787, stale dwarf2 stash
Throw away the dwarf2 stash if it becomes invalid due to section
VMAs changing. It would be nice to reclaim all the bfd_alloc
memory here when we throw away the stash, perhaps by putting
everything we alloc on a private dwarf2 objalloc, but I haven't done
that with this patch.
I've also fixed a problem with bfd_perform_relocation losing reloc
addends, which meant a second or subsequent look at debug info
sections did not properly relocate the sections. I can't see why
bfd_perform_relocation should need to change addends except for ld -r,
and the history (985fca12, e98e6ec1) doesn't help much.
Finally, the patch tweaks place_sections to avoid unnecessary work.
If we've mapped input to output sections, then input section VMA
isn't used so there's not much point in adjusting it. Incidentally,
this also means place_sections isn't effective in all cases.
PR ld/16787
* dwarf2.c (struct dwarf2_debug): Add sec_vma field.
(place_sections): Do not modify VMA of sections when called from
linker after sections have been placed in output sections. Short
circuit single section case.
(save_section_vma, section_vma_same): New functions.
(_bfd_dwarf2_slurp_debug_info): Throw away stash if section VMAs
change.
* reloc.c (bfd_perform_relocation): Do not modify reloc addend
when non-relocatable.
2014-04-23 06:56:19 +02:00
|
|
|
/* Save current section VMAs. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
save_section_vma (const bfd *abfd, struct dwarf2_debug *stash)
|
|
|
|
{
|
|
|
|
asection *s;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
if (abfd->section_count == 0)
|
|
|
|
return TRUE;
|
|
|
|
stash->sec_vma = bfd_malloc (sizeof (*stash->sec_vma) * abfd->section_count);
|
|
|
|
if (stash->sec_vma == NULL)
|
|
|
|
return FALSE;
|
|
|
|
for (i = 0, s = abfd->sections; i < abfd->section_count; i++, s = s->next)
|
|
|
|
{
|
|
|
|
if (s->output_section != NULL)
|
|
|
|
stash->sec_vma[i] = s->output_section->vma + s->output_offset;
|
|
|
|
else
|
|
|
|
stash->sec_vma[i] = s->vma;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compare current section VMAs against those at the time the stash
|
|
|
|
was created. If find_nearest_line is used in linker warnings or
|
|
|
|
errors early in the link process, the debug info stash will be
|
|
|
|
invalid for later calls. This is because we relocate debug info
|
|
|
|
sections, so the stashed section contents depend on symbol values,
|
|
|
|
which in turn depend on section VMAs. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
section_vma_same (const bfd *abfd, const struct dwarf2_debug *stash)
|
|
|
|
{
|
|
|
|
asection *s;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0, s = abfd->sections; i < abfd->section_count; i++, s = s->next)
|
|
|
|
{
|
|
|
|
bfd_vma vma;
|
|
|
|
|
|
|
|
if (s->output_section != NULL)
|
|
|
|
vma = s->output_section->vma + s->output_offset;
|
|
|
|
else
|
|
|
|
vma = s->vma;
|
|
|
|
if (vma != stash->sec_vma[i])
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2012-01-04 09:44:04 +01:00
|
|
|
/* Read debug information from DEBUG_BFD when DEBUG_BFD is specified.
|
|
|
|
If DEBUG_BFD is not specified, we read debug information from ABFD
|
|
|
|
or its gnu_debuglink. The results will be stored in PINFO.
|
|
|
|
The function returns TRUE iff debug information is ready. */
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd,
|
2014-04-24 14:29:56 +02:00
|
|
|
const struct dwarf_debug_section *debug_sections,
|
|
|
|
asymbol **symbols,
|
|
|
|
void **pinfo,
|
|
|
|
bfd_boolean do_place)
|
2012-01-04 09:44:04 +01:00
|
|
|
{
|
|
|
|
bfd_size_type amt = sizeof (struct dwarf2_debug);
|
|
|
|
bfd_size_type total_size;
|
|
|
|
asection *msec;
|
|
|
|
struct dwarf2_debug *stash = (struct dwarf2_debug *) *pinfo;
|
|
|
|
|
|
|
|
if (stash != NULL)
|
PR ld/16787, stale dwarf2 stash
Throw away the dwarf2 stash if it becomes invalid due to section
VMAs changing. It would be nice to reclaim all the bfd_alloc
memory here when we throw away the stash, perhaps by putting
everything we alloc on a private dwarf2 objalloc, but I haven't done
that with this patch.
I've also fixed a problem with bfd_perform_relocation losing reloc
addends, which meant a second or subsequent look at debug info
sections did not properly relocate the sections. I can't see why
bfd_perform_relocation should need to change addends except for ld -r,
and the history (985fca12, e98e6ec1) doesn't help much.
Finally, the patch tweaks place_sections to avoid unnecessary work.
If we've mapped input to output sections, then input section VMA
isn't used so there's not much point in adjusting it. Incidentally,
this also means place_sections isn't effective in all cases.
PR ld/16787
* dwarf2.c (struct dwarf2_debug): Add sec_vma field.
(place_sections): Do not modify VMA of sections when called from
linker after sections have been placed in output sections. Short
circuit single section case.
(save_section_vma, section_vma_same): New functions.
(_bfd_dwarf2_slurp_debug_info): Throw away stash if section VMAs
change.
* reloc.c (bfd_perform_relocation): Do not modify reloc addend
when non-relocatable.
2014-04-23 06:56:19 +02:00
|
|
|
{
|
bfd/dwarf: Improve use of previously loaded dwarf information
When parsing DWARF data in order to report file/line type error messages
we perform section placement to make section addresses unique within
relocatable object files.
Currently, if we reuse previously loaded (and cached) dwarf data then we
neglect to perform section placement, the result is that the section
addresses will not be unique, and we might, incorrectly associate an
address with the wrong debug information, and so report an incorrect
file and line number.
Further we neglect to check that that bfd for which we are looking up
debug information is actually the bfd for which the previous debug
information was loaded, it is possible that we will reuse previously
loaded debug information for a different bfd.
And finally, due to following of gnu_debuglink links in one bfd to
another, the process of checking that the cached debug information is
valid requires us to track the original bfd in the cached debug
information. The original debug information here is either the bfd that
we're interested in, not the bfd we finally load the debug information
from.
bfd/ChangeLog:
* dwarf2.c (struct dwarf2_debug): Add orig_bfd member.
(_bfd_dwarf2_slurp_debug_info): If stashed debug information does
not match current bfd, then reload debug information. Record bfd
we're loading debug info for in the stash. If we have debug
informatin in the cache then perform section placement before
returning.
ld/ChangeLog:
* testsuite/ld-elf/dwarf.exp (build_tests): Add new tests.
* testsuite/ld-elf/dwarf2.err: New file.
* testsuite/ld-elf/dwarf2a.c: New file.
* testsuite/ld-elf/dwarf2b.c: New file.
* testsuite/ld-elf/dwarf3.c: New file.
* testsuite/ld-elf/dwarf3.err: New file.
2016-12-15 16:22:49 +01:00
|
|
|
if (stash->orig_bfd == abfd
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
&& section_vma_same (abfd, stash))
|
|
|
|
{
|
|
|
|
/* Check that we did previously find some debug information
|
|
|
|
before attempting to make use of it. */
|
|
|
|
if (stash->bfd_ptr != NULL)
|
|
|
|
{
|
|
|
|
if (do_place && !place_sections (abfd, stash))
|
|
|
|
return FALSE;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
PR ld/16787, stale dwarf2 stash
Throw away the dwarf2 stash if it becomes invalid due to section
VMAs changing. It would be nice to reclaim all the bfd_alloc
memory here when we throw away the stash, perhaps by putting
everything we alloc on a private dwarf2 objalloc, but I haven't done
that with this patch.
I've also fixed a problem with bfd_perform_relocation losing reloc
addends, which meant a second or subsequent look at debug info
sections did not properly relocate the sections. I can't see why
bfd_perform_relocation should need to change addends except for ld -r,
and the history (985fca12, e98e6ec1) doesn't help much.
Finally, the patch tweaks place_sections to avoid unnecessary work.
If we've mapped input to output sections, then input section VMA
isn't used so there's not much point in adjusting it. Incidentally,
this also means place_sections isn't effective in all cases.
PR ld/16787
* dwarf2.c (struct dwarf2_debug): Add sec_vma field.
(place_sections): Do not modify VMA of sections when called from
linker after sections have been placed in output sections. Short
circuit single section case.
(save_section_vma, section_vma_same): New functions.
(_bfd_dwarf2_slurp_debug_info): Throw away stash if section VMAs
change.
* reloc.c (bfd_perform_relocation): Do not modify reloc addend
when non-relocatable.
2014-04-23 06:56:19 +02:00
|
|
|
_bfd_dwarf2_cleanup_debug_info (abfd, pinfo);
|
|
|
|
memset (stash, 0, amt);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
stash = (struct dwarf2_debug *) bfd_zalloc (abfd, amt);
|
|
|
|
if (! stash)
|
|
|
|
return FALSE;
|
|
|
|
}
|
bfd/dwarf: Improve use of previously loaded dwarf information
When parsing DWARF data in order to report file/line type error messages
we perform section placement to make section addresses unique within
relocatable object files.
Currently, if we reuse previously loaded (and cached) dwarf data then we
neglect to perform section placement, the result is that the section
addresses will not be unique, and we might, incorrectly associate an
address with the wrong debug information, and so report an incorrect
file and line number.
Further we neglect to check that that bfd for which we are looking up
debug information is actually the bfd for which the previous debug
information was loaded, it is possible that we will reuse previously
loaded debug information for a different bfd.
And finally, due to following of gnu_debuglink links in one bfd to
another, the process of checking that the cached debug information is
valid requires us to track the original bfd in the cached debug
information. The original debug information here is either the bfd that
we're interested in, not the bfd we finally load the debug information
from.
bfd/ChangeLog:
* dwarf2.c (struct dwarf2_debug): Add orig_bfd member.
(_bfd_dwarf2_slurp_debug_info): If stashed debug information does
not match current bfd, then reload debug information. Record bfd
we're loading debug info for in the stash. If we have debug
informatin in the cache then perform section placement before
returning.
ld/ChangeLog:
* testsuite/ld-elf/dwarf.exp (build_tests): Add new tests.
* testsuite/ld-elf/dwarf2.err: New file.
* testsuite/ld-elf/dwarf2a.c: New file.
* testsuite/ld-elf/dwarf2b.c: New file.
* testsuite/ld-elf/dwarf3.c: New file.
* testsuite/ld-elf/dwarf3.err: New file.
2016-12-15 16:22:49 +01:00
|
|
|
stash->orig_bfd = abfd;
|
2012-01-04 09:44:04 +01:00
|
|
|
stash->debug_sections = debug_sections;
|
2012-08-01 03:29:12 +02:00
|
|
|
stash->syms = symbols;
|
PR ld/16787, stale dwarf2 stash
Throw away the dwarf2 stash if it becomes invalid due to section
VMAs changing. It would be nice to reclaim all the bfd_alloc
memory here when we throw away the stash, perhaps by putting
everything we alloc on a private dwarf2 objalloc, but I haven't done
that with this patch.
I've also fixed a problem with bfd_perform_relocation losing reloc
addends, which meant a second or subsequent look at debug info
sections did not properly relocate the sections. I can't see why
bfd_perform_relocation should need to change addends except for ld -r,
and the history (985fca12, e98e6ec1) doesn't help much.
Finally, the patch tweaks place_sections to avoid unnecessary work.
If we've mapped input to output sections, then input section VMA
isn't used so there's not much point in adjusting it. Incidentally,
this also means place_sections isn't effective in all cases.
PR ld/16787
* dwarf2.c (struct dwarf2_debug): Add sec_vma field.
(place_sections): Do not modify VMA of sections when called from
linker after sections have been placed in output sections. Short
circuit single section case.
(save_section_vma, section_vma_same): New functions.
(_bfd_dwarf2_slurp_debug_info): Throw away stash if section VMAs
change.
* reloc.c (bfd_perform_relocation): Do not modify reloc addend
when non-relocatable.
2014-04-23 06:56:19 +02:00
|
|
|
if (!save_section_vma (abfd, stash))
|
|
|
|
return FALSE;
|
2012-01-04 09:44:04 +01:00
|
|
|
|
|
|
|
*pinfo = stash;
|
|
|
|
|
|
|
|
if (debug_bfd == NULL)
|
|
|
|
debug_bfd = abfd;
|
|
|
|
|
|
|
|
msec = find_debug_info (debug_bfd, debug_sections, NULL);
|
|
|
|
if (msec == NULL && abfd == debug_bfd)
|
|
|
|
{
|
2017-01-12 17:56:54 +01:00
|
|
|
char * debug_filename;
|
|
|
|
|
|
|
|
debug_filename = bfd_follow_build_id_debuglink (abfd, DEBUGDIR);
|
|
|
|
if (debug_filename == NULL)
|
|
|
|
debug_filename = bfd_follow_gnu_debuglink (abfd, DEBUGDIR);
|
2012-01-04 09:44:04 +01:00
|
|
|
|
|
|
|
if (debug_filename == NULL)
|
|
|
|
/* No dwarf2 info, and no gnu_debuglink to follow.
|
|
|
|
Note that at this point the stash has been allocated, but
|
|
|
|
contains zeros. This lets future calls to this function
|
|
|
|
fail more quickly. */
|
|
|
|
return FALSE;
|
|
|
|
|
2016-01-28 22:29:53 +01:00
|
|
|
/* Set BFD_DECOMPRESS to decompress debug sections. */
|
2012-01-04 09:44:04 +01:00
|
|
|
if ((debug_bfd = bfd_openr (debug_filename, NULL)) == NULL
|
2016-01-28 22:29:53 +01:00
|
|
|
|| !(debug_bfd->flags |= BFD_DECOMPRESS,
|
|
|
|
bfd_check_format (debug_bfd, bfd_object))
|
2012-01-04 09:44:04 +01:00
|
|
|
|| (msec = find_debug_info (debug_bfd,
|
2014-04-24 14:29:56 +02:00
|
|
|
debug_sections, NULL)) == NULL
|
|
|
|
|| !bfd_generic_link_read_symbols (debug_bfd))
|
2012-01-04 09:44:04 +01:00
|
|
|
{
|
|
|
|
if (debug_bfd)
|
|
|
|
bfd_close (debug_bfd);
|
|
|
|
/* FIXME: Should we report our failure to follow the debuglink ? */
|
|
|
|
free (debug_filename);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2014-04-24 14:29:56 +02:00
|
|
|
|
|
|
|
symbols = bfd_get_outsymbols (debug_bfd);
|
|
|
|
stash->syms = symbols;
|
2012-08-01 03:29:12 +02:00
|
|
|
stash->close_on_cleanup = TRUE;
|
2012-01-04 09:44:04 +01:00
|
|
|
}
|
2012-08-01 03:29:12 +02:00
|
|
|
stash->bfd_ptr = debug_bfd;
|
2012-01-04 09:44:04 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
if (do_place
|
|
|
|
&& !place_sections (abfd, stash))
|
|
|
|
return FALSE;
|
|
|
|
|
2012-01-04 09:44:04 +01:00
|
|
|
/* There can be more than one DWARF2 info section in a BFD these
|
|
|
|
days. First handle the easy case when there's only one. If
|
|
|
|
there's more than one, try case two: none of the sections is
|
|
|
|
compressed. In that case, read them all in and produce one
|
|
|
|
large stash. We do this in two passes - in the first pass we
|
|
|
|
just accumulate the section sizes, and in the second pass we
|
|
|
|
read in the section's contents. (The allows us to avoid
|
|
|
|
reallocing the data as we add sections to the stash.) If
|
|
|
|
some or all sections are compressed, then do things the slow
|
|
|
|
way, with a bunch of reallocs. */
|
|
|
|
|
|
|
|
if (! find_debug_info (debug_bfd, debug_sections, msec))
|
|
|
|
{
|
|
|
|
/* Case 1: only one info section. */
|
|
|
|
total_size = msec->size;
|
|
|
|
if (! read_section (debug_bfd, &stash->debug_sections[debug_info],
|
|
|
|
symbols, 0,
|
|
|
|
&stash->info_ptr_memory, &total_size))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Case 2: multiple sections. */
|
|
|
|
for (total_size = 0;
|
|
|
|
msec;
|
|
|
|
msec = find_debug_info (debug_bfd, debug_sections, msec))
|
|
|
|
total_size += msec->size;
|
|
|
|
|
|
|
|
stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size);
|
|
|
|
if (stash->info_ptr_memory == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
total_size = 0;
|
|
|
|
for (msec = find_debug_info (debug_bfd, debug_sections, NULL);
|
|
|
|
msec;
|
|
|
|
msec = find_debug_info (debug_bfd, debug_sections, msec))
|
|
|
|
{
|
|
|
|
bfd_size_type size;
|
|
|
|
|
|
|
|
size = msec->size;
|
|
|
|
if (size == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!(bfd_simple_get_relocated_section_contents
|
|
|
|
(debug_bfd, msec, stash->info_ptr_memory + total_size,
|
|
|
|
symbols)))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
total_size += size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
stash->info_ptr = stash->info_ptr_memory;
|
|
|
|
stash->info_ptr_end = stash->info_ptr + total_size;
|
|
|
|
stash->sec = find_debug_info (debug_bfd, debug_sections, NULL);
|
|
|
|
stash->sec_info_ptr = stash->info_ptr;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2015-03-05 13:14:26 +01:00
|
|
|
/* Scan the debug information in PINFO looking for a DW_TAG_subprogram
|
|
|
|
abbrev with a DW_AT_low_pc attached to it. Then lookup that same
|
|
|
|
symbol in SYMBOLS and return the difference between the low_pc and
|
|
|
|
the symbol's address. Returns 0 if no suitable symbol could be found. */
|
|
|
|
|
|
|
|
bfd_signed_vma
|
|
|
|
_bfd_dwarf2_find_symbol_bias (asymbol ** symbols, void ** pinfo)
|
|
|
|
{
|
|
|
|
struct dwarf2_debug *stash;
|
|
|
|
struct comp_unit * unit;
|
|
|
|
|
|
|
|
stash = (struct dwarf2_debug *) *pinfo;
|
|
|
|
|
|
|
|
if (stash == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (unit = stash->all_comp_units; unit; unit = unit->next_unit)
|
|
|
|
{
|
|
|
|
struct funcinfo * func;
|
|
|
|
|
|
|
|
if (unit->function_table == NULL)
|
|
|
|
{
|
|
|
|
if (unit->line_table == NULL)
|
|
|
|
unit->line_table = decode_line_info (unit, stash);
|
|
|
|
if (unit->line_table != NULL)
|
|
|
|
scan_unit_for_symbols (unit);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (func = unit->function_table; func != NULL; func = func->prev_func)
|
|
|
|
if (func->name && func->arange.low)
|
|
|
|
{
|
|
|
|
asymbol ** psym;
|
|
|
|
|
|
|
|
/* FIXME: Do we need to scan the aranges looking for the lowest pc value ? */
|
|
|
|
|
|
|
|
for (psym = symbols; * psym != NULL; psym++)
|
|
|
|
{
|
|
|
|
asymbol * sym = * psym;
|
|
|
|
|
|
|
|
if (sym->flags & BSF_FUNCTION
|
|
|
|
&& sym->section != NULL
|
|
|
|
&& strcmp (sym->name, func->name) == 0)
|
|
|
|
return ((bfd_signed_vma) func->arange.low) -
|
|
|
|
((bfd_signed_vma) (sym->value + sym->section->vma));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-26 16:28:13 +02:00
|
|
|
/* Find the source code location of SYMBOL. If SYMBOL is NULL
|
|
|
|
then find the nearest source code location corresponding to
|
|
|
|
the address SECTION + OFFSET.
|
|
|
|
Returns TRUE if the line is found without error and fills in
|
|
|
|
FILENAME_PTR and LINENUMBER_PTR. In the case where SYMBOL was
|
|
|
|
NULL the FUNCTIONNAME_PTR is also filled in.
|
|
|
|
SYMBOLS contains the symbol table for ABFD.
|
2011-09-30 12:39:45 +02:00
|
|
|
DEBUG_SECTIONS contains the name of the dwarf debug sections.
|
2007-06-26 16:28:13 +02:00
|
|
|
ADDR_SIZE is the number of bytes in the initial .debug_info length
|
|
|
|
field and in the abbreviation offset, or zero to indicate that the
|
|
|
|
default value should be used. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
Merge bfd_find_nearest_line variants
When bfd_find_nearest_line_discriminator was added, not enough care
was taken to ensure all targets had a proper definition of the function.
This patch cures that by merging bfd_find_nearest_line_discriminator
and bfd_find_nearest_line target implementations.
PR 17481
* aoutx.h (NAME (aout, find_nearest_line)): Add "discriminator_ptr"
param, group "section" and "offset" params. Zero discriminator.
* bfd.c (bfd_find_nearest_line): Implement with new
_bfd_find_nearest_line.
(bfd_find_nearest_line_discriminator): Likewise.
* coff-i386.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff-rs6000.c (xcoff_find_nearest_line,
xcoff_find_nearest_line_discriminator): Delete.
(_bfd_xcoff_find_nearest_line): Don't define.
(_bfd_xcoff_find_nearest_line): Define as coff_find_nearest_line.
* coff-x86_64.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff64-rs6000.c (rs6000_xcoff64_vec, rs6000_xcoff64_aix_vec): Adjust.
* coffgen.c (coff_find_nearest_line_with_names): Reorder params,
adjust _bfd_dwarf2_find_nearest_line call.
(coff_find_nearest_line): Add "discriminator_ptr" param, reorder
others. Set discriminator. Adjust call.
(coff_find_nearest_line_discriminator): Delete.
* dwarf1.c (_bfd_dwarf1_find_nearest_line): Reorder params.
* dwarf2.c (find_line): Rename to..
(_bfd_dwarf2_find_nearest_line): ..this, reordering params.
Simplify setting of do_line. Delete old function.
(_bfd_dwarf2_find_line): Delete.
* ecoff.c (_bfd_ecoff_find_nearest_line): Reorder params, add
discriminator_ptr and set it.
* elf-bfd.h (_bfd_elf_find_nearest_line): Update prototype.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
* elf.c (elf_find_function): Reorder params.
(_bfd_elf_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line): Adjust call.
* elf32-arm.c (arm_elf_find_function): Reorder params.
(elf32_arm_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
* elf64-alpha.c (elf64_alpha_find_nearest_line): Similarly.
* elfnn-aarch64.c (aarch64_elf_find_function): Reorder params.
(elfNN_aarch64_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* elfxx-mips.c (_bfd_mips_elf_find_nearest_line): Similarly.
* elfxx-mips.h (_bfd_mips_elf_find_nearest_line): Update prototype.
* libaout.h (NAME (aout, find_nearest_line)): Update prototype.
* libbfd-in.h (_bfd_nosymbols_find_nearest_line): Update.
(_bfd_dwarf1_find_nearest_line): Likewise.
(_bfd_dwarf2_find_nearest_line): Likewise.
(_bfd_dwarf2_find_line): Delete.
(_bfd_generic_find_nearest_line_discriminator): Delete.
* libbfd.c (_bfd_generic_find_nearest_line_discriminator): Delete.
* libcoff-in.h (coff_find_nearest_line): Update prototype.
(coff_find_nearest_line_discriminator): Delete.
(coff_find_nearest_line_with_names): Update prototype.
* libecoff.h (_bfd_ecoff_find_nearest_line): Update prototype.
* mach-o.c (bfd_mach_o_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* mach-o.h (bfd_mach_o_find_nearest_line): Update prototype.
* pdp11.c (NAME (aout, find_nearest_line)): Reorder params, add
discriminator_ptr and set.
* som.c (som_find_nearest_line): Similarly.
* targets.c (BFD_JUMP_TABLE_SYMBOLS): Delete entry for
_bfd_find_nearest_line_discriminator.
(struct bfd_target <_bfd_find_nearest_line>): Adjust prototype.
(struct bfd_target <_bfd_find_nearest_line_discriminator>): Delete.
* vms-alpha.c (_bfd_vms_find_nearest_dst_line): Rename to..
(_bfd_vms_find_nearest_line): ..this. Reorder params, add
"discriminator" and set.
(_bfd_vms_find_nearest_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
(alpha_vms_find_nearest_line): Update define.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
2014-10-15 13:22:20 +02:00
|
|
|
bfd_boolean
|
|
|
|
_bfd_dwarf2_find_nearest_line (bfd *abfd,
|
|
|
|
asymbol **symbols,
|
|
|
|
asymbol *symbol,
|
|
|
|
asection *section,
|
|
|
|
bfd_vma offset,
|
|
|
|
const char **filename_ptr,
|
|
|
|
const char **functionname_ptr,
|
|
|
|
unsigned int *linenumber_ptr,
|
|
|
|
unsigned int *discriminator_ptr,
|
|
|
|
const struct dwarf_debug_section *debug_sections,
|
|
|
|
unsigned int addr_size,
|
|
|
|
void **pinfo)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
/* Read each compilation unit from the section .debug_info, and check
|
|
|
|
to see if it contains the address we are searching for. If yes,
|
|
|
|
lookup the address, and return the line number info. If no, go
|
2000-11-16 20:29:48 +01:00
|
|
|
on to the next compilation unit.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
We keep a list of all the previously read compilation units, and
|
2000-11-16 20:29:48 +01:00
|
|
|
a pointer to the next un-read compilation unit. Check the
|
2000-09-02 22:21:40 +02:00
|
|
|
previously read units before reading more. */
|
2004-09-24 09:07:22 +02:00
|
|
|
struct dwarf2_debug *stash;
|
2000-09-02 22:21:40 +02:00
|
|
|
/* What address are we looking for? */
|
2004-09-24 09:07:22 +02:00
|
|
|
bfd_vma addr;
|
1999-05-03 09:29:11 +02:00
|
|
|
struct comp_unit* each;
|
2014-12-10 00:21:56 +01:00
|
|
|
struct funcinfo *function = NULL;
|
2013-10-25 10:32:43 +02:00
|
|
|
bfd_boolean found = FALSE;
|
2007-06-26 16:28:13 +02:00
|
|
|
bfd_boolean do_line;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2012-01-04 09:44:04 +01:00
|
|
|
*filename_ptr = NULL;
|
|
|
|
if (functionname_ptr != NULL)
|
|
|
|
*functionname_ptr = NULL;
|
|
|
|
*linenumber_ptr = 0;
|
2012-07-26 20:20:39 +02:00
|
|
|
if (discriminator_ptr)
|
|
|
|
*discriminator_ptr = 0;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2014-04-24 14:29:56 +02:00
|
|
|
if (! _bfd_dwarf2_slurp_debug_info (abfd, NULL, debug_sections,
|
|
|
|
symbols, pinfo,
|
|
|
|
(abfd->flags & (EXEC_P | DYNAMIC)) == 0))
|
2012-01-04 09:44:04 +01:00
|
|
|
return FALSE;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
2012-01-04 09:44:04 +01:00
|
|
|
stash = (struct dwarf2_debug *) *pinfo;
|
2006-03-06 02:36:52 +01:00
|
|
|
|
Merge bfd_find_nearest_line variants
When bfd_find_nearest_line_discriminator was added, not enough care
was taken to ensure all targets had a proper definition of the function.
This patch cures that by merging bfd_find_nearest_line_discriminator
and bfd_find_nearest_line target implementations.
PR 17481
* aoutx.h (NAME (aout, find_nearest_line)): Add "discriminator_ptr"
param, group "section" and "offset" params. Zero discriminator.
* bfd.c (bfd_find_nearest_line): Implement with new
_bfd_find_nearest_line.
(bfd_find_nearest_line_discriminator): Likewise.
* coff-i386.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff-rs6000.c (xcoff_find_nearest_line,
xcoff_find_nearest_line_discriminator): Delete.
(_bfd_xcoff_find_nearest_line): Don't define.
(_bfd_xcoff_find_nearest_line): Define as coff_find_nearest_line.
* coff-x86_64.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff64-rs6000.c (rs6000_xcoff64_vec, rs6000_xcoff64_aix_vec): Adjust.
* coffgen.c (coff_find_nearest_line_with_names): Reorder params,
adjust _bfd_dwarf2_find_nearest_line call.
(coff_find_nearest_line): Add "discriminator_ptr" param, reorder
others. Set discriminator. Adjust call.
(coff_find_nearest_line_discriminator): Delete.
* dwarf1.c (_bfd_dwarf1_find_nearest_line): Reorder params.
* dwarf2.c (find_line): Rename to..
(_bfd_dwarf2_find_nearest_line): ..this, reordering params.
Simplify setting of do_line. Delete old function.
(_bfd_dwarf2_find_line): Delete.
* ecoff.c (_bfd_ecoff_find_nearest_line): Reorder params, add
discriminator_ptr and set it.
* elf-bfd.h (_bfd_elf_find_nearest_line): Update prototype.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
* elf.c (elf_find_function): Reorder params.
(_bfd_elf_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line): Adjust call.
* elf32-arm.c (arm_elf_find_function): Reorder params.
(elf32_arm_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
* elf64-alpha.c (elf64_alpha_find_nearest_line): Similarly.
* elfnn-aarch64.c (aarch64_elf_find_function): Reorder params.
(elfNN_aarch64_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* elfxx-mips.c (_bfd_mips_elf_find_nearest_line): Similarly.
* elfxx-mips.h (_bfd_mips_elf_find_nearest_line): Update prototype.
* libaout.h (NAME (aout, find_nearest_line)): Update prototype.
* libbfd-in.h (_bfd_nosymbols_find_nearest_line): Update.
(_bfd_dwarf1_find_nearest_line): Likewise.
(_bfd_dwarf2_find_nearest_line): Likewise.
(_bfd_dwarf2_find_line): Delete.
(_bfd_generic_find_nearest_line_discriminator): Delete.
* libbfd.c (_bfd_generic_find_nearest_line_discriminator): Delete.
* libcoff-in.h (coff_find_nearest_line): Update prototype.
(coff_find_nearest_line_discriminator): Delete.
(coff_find_nearest_line_with_names): Update prototype.
* libecoff.h (_bfd_ecoff_find_nearest_line): Update prototype.
* mach-o.c (bfd_mach_o_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* mach-o.h (bfd_mach_o_find_nearest_line): Update prototype.
* pdp11.c (NAME (aout, find_nearest_line)): Reorder params, add
discriminator_ptr and set.
* som.c (som_find_nearest_line): Similarly.
* targets.c (BFD_JUMP_TABLE_SYMBOLS): Delete entry for
_bfd_find_nearest_line_discriminator.
(struct bfd_target <_bfd_find_nearest_line>): Adjust prototype.
(struct bfd_target <_bfd_find_nearest_line_discriminator>): Delete.
* vms-alpha.c (_bfd_vms_find_nearest_dst_line): Rename to..
(_bfd_vms_find_nearest_line): ..this. Reorder params, add
"discriminator" and set.
(_bfd_vms_find_nearest_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
(alpha_vms_find_nearest_line): Update define.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
2014-10-15 13:22:20 +02:00
|
|
|
do_line = symbol != NULL;
|
2007-06-26 16:28:13 +02:00
|
|
|
if (do_line)
|
|
|
|
{
|
Merge bfd_find_nearest_line variants
When bfd_find_nearest_line_discriminator was added, not enough care
was taken to ensure all targets had a proper definition of the function.
This patch cures that by merging bfd_find_nearest_line_discriminator
and bfd_find_nearest_line target implementations.
PR 17481
* aoutx.h (NAME (aout, find_nearest_line)): Add "discriminator_ptr"
param, group "section" and "offset" params. Zero discriminator.
* bfd.c (bfd_find_nearest_line): Implement with new
_bfd_find_nearest_line.
(bfd_find_nearest_line_discriminator): Likewise.
* coff-i386.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff-rs6000.c (xcoff_find_nearest_line,
xcoff_find_nearest_line_discriminator): Delete.
(_bfd_xcoff_find_nearest_line): Don't define.
(_bfd_xcoff_find_nearest_line): Define as coff_find_nearest_line.
* coff-x86_64.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff64-rs6000.c (rs6000_xcoff64_vec, rs6000_xcoff64_aix_vec): Adjust.
* coffgen.c (coff_find_nearest_line_with_names): Reorder params,
adjust _bfd_dwarf2_find_nearest_line call.
(coff_find_nearest_line): Add "discriminator_ptr" param, reorder
others. Set discriminator. Adjust call.
(coff_find_nearest_line_discriminator): Delete.
* dwarf1.c (_bfd_dwarf1_find_nearest_line): Reorder params.
* dwarf2.c (find_line): Rename to..
(_bfd_dwarf2_find_nearest_line): ..this, reordering params.
Simplify setting of do_line. Delete old function.
(_bfd_dwarf2_find_line): Delete.
* ecoff.c (_bfd_ecoff_find_nearest_line): Reorder params, add
discriminator_ptr and set it.
* elf-bfd.h (_bfd_elf_find_nearest_line): Update prototype.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
* elf.c (elf_find_function): Reorder params.
(_bfd_elf_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line): Adjust call.
* elf32-arm.c (arm_elf_find_function): Reorder params.
(elf32_arm_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
* elf64-alpha.c (elf64_alpha_find_nearest_line): Similarly.
* elfnn-aarch64.c (aarch64_elf_find_function): Reorder params.
(elfNN_aarch64_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* elfxx-mips.c (_bfd_mips_elf_find_nearest_line): Similarly.
* elfxx-mips.h (_bfd_mips_elf_find_nearest_line): Update prototype.
* libaout.h (NAME (aout, find_nearest_line)): Update prototype.
* libbfd-in.h (_bfd_nosymbols_find_nearest_line): Update.
(_bfd_dwarf1_find_nearest_line): Likewise.
(_bfd_dwarf2_find_nearest_line): Likewise.
(_bfd_dwarf2_find_line): Delete.
(_bfd_generic_find_nearest_line_discriminator): Delete.
* libbfd.c (_bfd_generic_find_nearest_line_discriminator): Delete.
* libcoff-in.h (coff_find_nearest_line): Update prototype.
(coff_find_nearest_line_discriminator): Delete.
(coff_find_nearest_line_with_names): Update prototype.
* libecoff.h (_bfd_ecoff_find_nearest_line): Update prototype.
* mach-o.c (bfd_mach_o_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* mach-o.h (bfd_mach_o_find_nearest_line): Update prototype.
* pdp11.c (NAME (aout, find_nearest_line)): Reorder params, add
discriminator_ptr and set.
* som.c (som_find_nearest_line): Similarly.
* targets.c (BFD_JUMP_TABLE_SYMBOLS): Delete entry for
_bfd_find_nearest_line_discriminator.
(struct bfd_target <_bfd_find_nearest_line>): Adjust prototype.
(struct bfd_target <_bfd_find_nearest_line_discriminator>): Delete.
* vms-alpha.c (_bfd_vms_find_nearest_dst_line): Rename to..
(_bfd_vms_find_nearest_line): ..this. Reorder params, add
"discriminator" and set.
(_bfd_vms_find_nearest_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
(alpha_vms_find_nearest_line): Update define.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
2014-10-15 13:22:20 +02:00
|
|
|
BFD_ASSERT (section == NULL && offset == 0 && functionname_ptr == NULL);
|
2007-06-26 16:28:13 +02:00
|
|
|
section = bfd_get_section (symbol);
|
Merge bfd_find_nearest_line variants
When bfd_find_nearest_line_discriminator was added, not enough care
was taken to ensure all targets had a proper definition of the function.
This patch cures that by merging bfd_find_nearest_line_discriminator
and bfd_find_nearest_line target implementations.
PR 17481
* aoutx.h (NAME (aout, find_nearest_line)): Add "discriminator_ptr"
param, group "section" and "offset" params. Zero discriminator.
* bfd.c (bfd_find_nearest_line): Implement with new
_bfd_find_nearest_line.
(bfd_find_nearest_line_discriminator): Likewise.
* coff-i386.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff-rs6000.c (xcoff_find_nearest_line,
xcoff_find_nearest_line_discriminator): Delete.
(_bfd_xcoff_find_nearest_line): Don't define.
(_bfd_xcoff_find_nearest_line): Define as coff_find_nearest_line.
* coff-x86_64.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff64-rs6000.c (rs6000_xcoff64_vec, rs6000_xcoff64_aix_vec): Adjust.
* coffgen.c (coff_find_nearest_line_with_names): Reorder params,
adjust _bfd_dwarf2_find_nearest_line call.
(coff_find_nearest_line): Add "discriminator_ptr" param, reorder
others. Set discriminator. Adjust call.
(coff_find_nearest_line_discriminator): Delete.
* dwarf1.c (_bfd_dwarf1_find_nearest_line): Reorder params.
* dwarf2.c (find_line): Rename to..
(_bfd_dwarf2_find_nearest_line): ..this, reordering params.
Simplify setting of do_line. Delete old function.
(_bfd_dwarf2_find_line): Delete.
* ecoff.c (_bfd_ecoff_find_nearest_line): Reorder params, add
discriminator_ptr and set it.
* elf-bfd.h (_bfd_elf_find_nearest_line): Update prototype.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
* elf.c (elf_find_function): Reorder params.
(_bfd_elf_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line): Adjust call.
* elf32-arm.c (arm_elf_find_function): Reorder params.
(elf32_arm_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
* elf64-alpha.c (elf64_alpha_find_nearest_line): Similarly.
* elfnn-aarch64.c (aarch64_elf_find_function): Reorder params.
(elfNN_aarch64_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* elfxx-mips.c (_bfd_mips_elf_find_nearest_line): Similarly.
* elfxx-mips.h (_bfd_mips_elf_find_nearest_line): Update prototype.
* libaout.h (NAME (aout, find_nearest_line)): Update prototype.
* libbfd-in.h (_bfd_nosymbols_find_nearest_line): Update.
(_bfd_dwarf1_find_nearest_line): Likewise.
(_bfd_dwarf2_find_nearest_line): Likewise.
(_bfd_dwarf2_find_line): Delete.
(_bfd_generic_find_nearest_line_discriminator): Delete.
* libbfd.c (_bfd_generic_find_nearest_line_discriminator): Delete.
* libcoff-in.h (coff_find_nearest_line): Update prototype.
(coff_find_nearest_line_discriminator): Delete.
(coff_find_nearest_line_with_names): Update prototype.
* libecoff.h (_bfd_ecoff_find_nearest_line): Update prototype.
* mach-o.c (bfd_mach_o_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* mach-o.h (bfd_mach_o_find_nearest_line): Update prototype.
* pdp11.c (NAME (aout, find_nearest_line)): Reorder params, add
discriminator_ptr and set.
* som.c (som_find_nearest_line): Similarly.
* targets.c (BFD_JUMP_TABLE_SYMBOLS): Delete entry for
_bfd_find_nearest_line_discriminator.
(struct bfd_target <_bfd_find_nearest_line>): Adjust prototype.
(struct bfd_target <_bfd_find_nearest_line_discriminator>): Delete.
* vms-alpha.c (_bfd_vms_find_nearest_dst_line): Rename to..
(_bfd_vms_find_nearest_line): ..this. Reorder params, add
"discriminator" and set.
(_bfd_vms_find_nearest_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
(alpha_vms_find_nearest_line): Update define.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
2014-10-15 13:22:20 +02:00
|
|
|
addr = symbol->value;
|
2007-06-26 16:28:13 +02:00
|
|
|
}
|
|
|
|
else
|
Merge bfd_find_nearest_line variants
When bfd_find_nearest_line_discriminator was added, not enough care
was taken to ensure all targets had a proper definition of the function.
This patch cures that by merging bfd_find_nearest_line_discriminator
and bfd_find_nearest_line target implementations.
PR 17481
* aoutx.h (NAME (aout, find_nearest_line)): Add "discriminator_ptr"
param, group "section" and "offset" params. Zero discriminator.
* bfd.c (bfd_find_nearest_line): Implement with new
_bfd_find_nearest_line.
(bfd_find_nearest_line_discriminator): Likewise.
* coff-i386.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff-rs6000.c (xcoff_find_nearest_line,
xcoff_find_nearest_line_discriminator): Delete.
(_bfd_xcoff_find_nearest_line): Don't define.
(_bfd_xcoff_find_nearest_line): Define as coff_find_nearest_line.
* coff-x86_64.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff64-rs6000.c (rs6000_xcoff64_vec, rs6000_xcoff64_aix_vec): Adjust.
* coffgen.c (coff_find_nearest_line_with_names): Reorder params,
adjust _bfd_dwarf2_find_nearest_line call.
(coff_find_nearest_line): Add "discriminator_ptr" param, reorder
others. Set discriminator. Adjust call.
(coff_find_nearest_line_discriminator): Delete.
* dwarf1.c (_bfd_dwarf1_find_nearest_line): Reorder params.
* dwarf2.c (find_line): Rename to..
(_bfd_dwarf2_find_nearest_line): ..this, reordering params.
Simplify setting of do_line. Delete old function.
(_bfd_dwarf2_find_line): Delete.
* ecoff.c (_bfd_ecoff_find_nearest_line): Reorder params, add
discriminator_ptr and set it.
* elf-bfd.h (_bfd_elf_find_nearest_line): Update prototype.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
* elf.c (elf_find_function): Reorder params.
(_bfd_elf_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line): Adjust call.
* elf32-arm.c (arm_elf_find_function): Reorder params.
(elf32_arm_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
* elf64-alpha.c (elf64_alpha_find_nearest_line): Similarly.
* elfnn-aarch64.c (aarch64_elf_find_function): Reorder params.
(elfNN_aarch64_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* elfxx-mips.c (_bfd_mips_elf_find_nearest_line): Similarly.
* elfxx-mips.h (_bfd_mips_elf_find_nearest_line): Update prototype.
* libaout.h (NAME (aout, find_nearest_line)): Update prototype.
* libbfd-in.h (_bfd_nosymbols_find_nearest_line): Update.
(_bfd_dwarf1_find_nearest_line): Likewise.
(_bfd_dwarf2_find_nearest_line): Likewise.
(_bfd_dwarf2_find_line): Delete.
(_bfd_generic_find_nearest_line_discriminator): Delete.
* libbfd.c (_bfd_generic_find_nearest_line_discriminator): Delete.
* libcoff-in.h (coff_find_nearest_line): Update prototype.
(coff_find_nearest_line_discriminator): Delete.
(coff_find_nearest_line_with_names): Update prototype.
* libecoff.h (_bfd_ecoff_find_nearest_line): Update prototype.
* mach-o.c (bfd_mach_o_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* mach-o.h (bfd_mach_o_find_nearest_line): Update prototype.
* pdp11.c (NAME (aout, find_nearest_line)): Reorder params, add
discriminator_ptr and set.
* som.c (som_find_nearest_line): Similarly.
* targets.c (BFD_JUMP_TABLE_SYMBOLS): Delete entry for
_bfd_find_nearest_line_discriminator.
(struct bfd_target <_bfd_find_nearest_line>): Adjust prototype.
(struct bfd_target <_bfd_find_nearest_line_discriminator>): Delete.
* vms-alpha.c (_bfd_vms_find_nearest_dst_line): Rename to..
(_bfd_vms_find_nearest_line): ..this. Reorder params, add
"discriminator" and set.
(_bfd_vms_find_nearest_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
(alpha_vms_find_nearest_line): Update define.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
2014-10-15 13:22:20 +02:00
|
|
|
{
|
|
|
|
BFD_ASSERT (section != NULL && functionname_ptr != NULL);
|
|
|
|
addr = offset;
|
2016-12-19 16:27:59 +01:00
|
|
|
|
|
|
|
/* If we have no SYMBOL but the section we're looking at is not a
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
code section, then take a look through the list of symbols to see
|
|
|
|
if we have a symbol at the address we're looking for. If we do
|
|
|
|
then use this to look up line information. This will allow us to
|
|
|
|
give file and line results for data symbols. We exclude code
|
|
|
|
symbols here, if we look up a function symbol and then look up the
|
|
|
|
line information we'll actually return the line number for the
|
|
|
|
opening '{' rather than the function definition line. This is
|
|
|
|
because looking up by symbol uses the line table, in which the
|
|
|
|
first line for a function is usually the opening '{', while
|
|
|
|
looking up the function by section + offset uses the
|
|
|
|
DW_AT_decl_line from the function DW_TAG_subprogram for the line,
|
|
|
|
which will be the line of the function name. */
|
2017-04-23 06:25:49 +02:00
|
|
|
if (symbols != NULL && (section->flags & SEC_CODE) == 0)
|
2016-12-19 16:27:59 +01:00
|
|
|
{
|
|
|
|
asymbol **tmp;
|
|
|
|
|
|
|
|
for (tmp = symbols; (*tmp) != NULL; ++tmp)
|
|
|
|
if ((*tmp)->the_bfd == abfd
|
|
|
|
&& (*tmp)->section == section
|
|
|
|
&& (*tmp)->value == offset
|
|
|
|
&& ((*tmp)->flags & BSF_SECTION_SYM) == 0)
|
|
|
|
{
|
|
|
|
symbol = *tmp;
|
|
|
|
do_line = TRUE;
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
/* For local symbols, keep going in the hope we find a
|
|
|
|
global. */
|
|
|
|
if ((symbol->flags & BSF_GLOBAL) != 0)
|
|
|
|
break;
|
2016-12-19 16:27:59 +01:00
|
|
|
}
|
|
|
|
}
|
Merge bfd_find_nearest_line variants
When bfd_find_nearest_line_discriminator was added, not enough care
was taken to ensure all targets had a proper definition of the function.
This patch cures that by merging bfd_find_nearest_line_discriminator
and bfd_find_nearest_line target implementations.
PR 17481
* aoutx.h (NAME (aout, find_nearest_line)): Add "discriminator_ptr"
param, group "section" and "offset" params. Zero discriminator.
* bfd.c (bfd_find_nearest_line): Implement with new
_bfd_find_nearest_line.
(bfd_find_nearest_line_discriminator): Likewise.
* coff-i386.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff-rs6000.c (xcoff_find_nearest_line,
xcoff_find_nearest_line_discriminator): Delete.
(_bfd_xcoff_find_nearest_line): Don't define.
(_bfd_xcoff_find_nearest_line): Define as coff_find_nearest_line.
* coff-x86_64.c (_bfd_generic_find_nearest_line_discriminator): Don't
define.
* coff64-rs6000.c (rs6000_xcoff64_vec, rs6000_xcoff64_aix_vec): Adjust.
* coffgen.c (coff_find_nearest_line_with_names): Reorder params,
adjust _bfd_dwarf2_find_nearest_line call.
(coff_find_nearest_line): Add "discriminator_ptr" param, reorder
others. Set discriminator. Adjust call.
(coff_find_nearest_line_discriminator): Delete.
* dwarf1.c (_bfd_dwarf1_find_nearest_line): Reorder params.
* dwarf2.c (find_line): Rename to..
(_bfd_dwarf2_find_nearest_line): ..this, reordering params.
Simplify setting of do_line. Delete old function.
(_bfd_dwarf2_find_line): Delete.
* ecoff.c (_bfd_ecoff_find_nearest_line): Reorder params, add
discriminator_ptr and set it.
* elf-bfd.h (_bfd_elf_find_nearest_line): Update prototype.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
* elf.c (elf_find_function): Reorder params.
(_bfd_elf_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
(_bfd_elf_find_nearest_line_discriminator): Delete.
(_bfd_elf_find_line): Adjust call.
* elf32-arm.c (arm_elf_find_function): Reorder params.
(elf32_arm_find_nearest_line): Reorder params, add discriminator_ptr.
Adjust calls.
* elf64-alpha.c (elf64_alpha_find_nearest_line): Similarly.
* elfnn-aarch64.c (aarch64_elf_find_function): Reorder params.
(elfNN_aarch64_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* elfxx-mips.c (_bfd_mips_elf_find_nearest_line): Similarly.
* elfxx-mips.h (_bfd_mips_elf_find_nearest_line): Update prototype.
* libaout.h (NAME (aout, find_nearest_line)): Update prototype.
* libbfd-in.h (_bfd_nosymbols_find_nearest_line): Update.
(_bfd_dwarf1_find_nearest_line): Likewise.
(_bfd_dwarf2_find_nearest_line): Likewise.
(_bfd_dwarf2_find_line): Delete.
(_bfd_generic_find_nearest_line_discriminator): Delete.
* libbfd.c (_bfd_generic_find_nearest_line_discriminator): Delete.
* libcoff-in.h (coff_find_nearest_line): Update prototype.
(coff_find_nearest_line_discriminator): Delete.
(coff_find_nearest_line_with_names): Update prototype.
* libecoff.h (_bfd_ecoff_find_nearest_line): Update prototype.
* mach-o.c (bfd_mach_o_find_nearest_line): Reorder params, add
discriminator_ptr. Adjust calls.
* mach-o.h (bfd_mach_o_find_nearest_line): Update prototype.
* pdp11.c (NAME (aout, find_nearest_line)): Reorder params, add
discriminator_ptr and set.
* som.c (som_find_nearest_line): Similarly.
* targets.c (BFD_JUMP_TABLE_SYMBOLS): Delete entry for
_bfd_find_nearest_line_discriminator.
(struct bfd_target <_bfd_find_nearest_line>): Adjust prototype.
(struct bfd_target <_bfd_find_nearest_line_discriminator>): Delete.
* vms-alpha.c (_bfd_vms_find_nearest_dst_line): Rename to..
(_bfd_vms_find_nearest_line): ..this. Reorder params, add
"discriminator" and set.
(_bfd_vms_find_nearest_line_discriminator): Delete.
(_bfd_generic_find_nearest_line_discriminator): Don't define.
(alpha_vms_find_nearest_line): Update define.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
2014-10-15 13:22:20 +02:00
|
|
|
}
|
2007-06-26 16:28:13 +02:00
|
|
|
|
2004-09-24 09:07:22 +02:00
|
|
|
if (section->output_section)
|
2006-01-17 18:12:58 +01:00
|
|
|
addr += section->output_section->vma + section->output_offset;
|
2004-09-24 09:07:22 +02:00
|
|
|
else
|
2006-01-17 18:12:58 +01:00
|
|
|
addr += section->vma;
|
2000-09-02 22:21:40 +02:00
|
|
|
|
2000-11-16 20:29:48 +01:00
|
|
|
/* A null info_ptr indicates that there is no dwarf2 info
|
2000-09-02 22:21:40 +02:00
|
|
|
(or that an error occured while setting up the stash). */
|
1999-05-03 09:29:11 +02:00
|
|
|
if (! stash->info_ptr)
|
2012-01-04 09:44:04 +01:00
|
|
|
return FALSE;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2005-05-23 19:44:55 +02:00
|
|
|
stash->inliner_chain = NULL;
|
|
|
|
|
2000-09-02 22:21:40 +02:00
|
|
|
/* Check the previously read comp. units first. */
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
if (do_line)
|
|
|
|
{
|
|
|
|
/* The info hash tables use quite a bit of memory. We may not want to
|
|
|
|
always use them. We use some heuristics to decide if and when to
|
|
|
|
turn it on. */
|
|
|
|
if (stash->info_hash_status == STASH_INFO_HASH_OFF)
|
|
|
|
stash_maybe_enable_info_hash_tables (abfd, stash);
|
|
|
|
|
|
|
|
/* Keep info hash table up to date if they are available. Note that we
|
2016-11-08 13:01:58 +01:00
|
|
|
may disable the hash tables if there is any error duing update. */
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
if (stash->info_hash_status == STASH_INFO_HASH_ON)
|
|
|
|
stash_maybe_update_info_hash_tables (stash);
|
|
|
|
|
|
|
|
if (stash->info_hash_status == STASH_INFO_HASH_ON)
|
|
|
|
{
|
|
|
|
found = stash_find_line_fast (stash, symbol, addr, filename_ptr,
|
|
|
|
linenumber_ptr);
|
|
|
|
if (found)
|
|
|
|
goto done;
|
|
|
|
}
|
2007-06-22 10:13:12 +02:00
|
|
|
else
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
{
|
|
|
|
/* Check the previously read comp. units first. */
|
|
|
|
for (each = stash->all_comp_units; each; each = each->next_unit)
|
|
|
|
if ((symbol->flags & BSF_FUNCTION) == 0
|
2012-05-16 15:57:11 +02:00
|
|
|
|| each->arange.high == 0
|
Speed up bfd_dwarf2_find_line.
* dwarf2.c (struct dwarf2_debug): Add new fields to support function and variable info hash tables. Add last_comp_unit, info_hash_count, funcinfo_hash_table, varinfo_hash_table, hash_units_head.
(struct comp_unit): Add prev_unit, cached.
(struct info_list_node, struct info_hash_entry, struct info_hash_table): New.
(info_hash_table_newfunc, create_info_hash_table, insert_info_hash_table, lookup_info_hash_table): New functions implementing function and variable info hash tables.
(scan_unit_for_symbols): Add checks to make sure hash tables are consistent with compilation units.
(comp_unit_maybe_decode_line_info): New function.
(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info, info_hash_lookup_funcinfo, info_hash_lookup_varinfo, stash_maybe_update_info_hash_table, stash_verify_info_hash_table, stash_maybe_enable_info_hash_tables, stash_find_line_fast): New functions. Make use of info hash tables to speed up bfd_dwarf2_find_line.
(find_line): Use hash table for faster lookup if it is turned on.
Also add code to maintain bi-directional link in comp units.
2007-07-26 10:31:03 +02:00
|
|
|
|| comp_unit_contains_address (each, addr))
|
|
|
|
{
|
|
|
|
found = comp_unit_find_line (each, symbol, addr, filename_ptr,
|
|
|
|
linenumber_ptr, stash);
|
|
|
|
if (found)
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-10-25 10:32:43 +02:00
|
|
|
bfd_vma min_range = (bfd_vma) -1;
|
|
|
|
const char * local_filename = NULL;
|
2014-12-10 00:21:56 +01:00
|
|
|
struct funcinfo *local_function = NULL;
|
2013-10-25 10:32:43 +02:00
|
|
|
unsigned int local_linenumber = 0;
|
|
|
|
unsigned int local_discriminator = 0;
|
2013-10-25 10:33:59 +02:00
|
|
|
|
2008-02-12 01:26:00 +01:00
|
|
|
for (each = stash->all_comp_units; each; each = each->next_unit)
|
|
|
|
{
|
2013-10-25 10:32:43 +02:00
|
|
|
bfd_vma range = (bfd_vma) -1;
|
|
|
|
|
2012-05-16 15:57:11 +02:00
|
|
|
found = ((each->arange.high == 0
|
|
|
|
|| comp_unit_contains_address (each, addr))
|
2013-10-25 10:32:43 +02:00
|
|
|
&& (range = comp_unit_find_nearest_line (each, addr,
|
|
|
|
& local_filename,
|
2014-12-10 00:21:56 +01:00
|
|
|
& local_function,
|
2013-10-25 10:32:43 +02:00
|
|
|
& local_linenumber,
|
|
|
|
& local_discriminator,
|
|
|
|
stash)) != 0);
|
2008-02-12 01:26:00 +01:00
|
|
|
if (found)
|
2013-10-25 10:32:43 +02:00
|
|
|
{
|
|
|
|
/* PRs 15935 15994: Bogus debug information may have provided us
|
|
|
|
with an erroneous match. We attempt to counter this by
|
|
|
|
selecting the match that has the smallest address range
|
|
|
|
associated with it. (We are assuming that corrupt debug info
|
|
|
|
will tend to result in extra large address ranges rather than
|
|
|
|
extra small ranges).
|
|
|
|
|
|
|
|
This does mean that we scan through all of the CUs associated
|
|
|
|
with the bfd each time this function is called. But this does
|
|
|
|
have the benefit of producing consistent results every time the
|
|
|
|
function is called. */
|
|
|
|
if (range <= min_range)
|
|
|
|
{
|
|
|
|
if (filename_ptr && local_filename)
|
|
|
|
* filename_ptr = local_filename;
|
2014-12-10 00:21:56 +01:00
|
|
|
if (local_function)
|
|
|
|
function = local_function;
|
2013-10-25 10:32:43 +02:00
|
|
|
if (discriminator_ptr && local_discriminator)
|
|
|
|
* discriminator_ptr = local_discriminator;
|
|
|
|
if (local_linenumber)
|
|
|
|
* linenumber_ptr = local_linenumber;
|
|
|
|
min_range = range;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (* linenumber_ptr)
|
|
|
|
{
|
|
|
|
found = TRUE;
|
|
|
|
goto done;
|
2008-02-12 01:26:00 +01:00
|
|
|
}
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The DWARF2 spec says that the initial length field, and the
|
|
|
|
offset of the abbreviation table, should both be 4-byte values.
|
|
|
|
However, some compilers do things differently. */
|
|
|
|
if (addr_size == 0)
|
|
|
|
addr_size = 4;
|
|
|
|
BFD_ASSERT (addr_size == 4 || addr_size == 8);
|
|
|
|
|
|
|
|
/* Read each remaining comp. units checking each as they are read. */
|
|
|
|
while (stash->info_ptr < stash->info_ptr_end)
|
|
|
|
{
|
|
|
|
bfd_vma length;
|
|
|
|
unsigned int offset_size = addr_size;
|
|
|
|
bfd_byte *info_ptr_unit = stash->info_ptr;
|
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
length = read_4_bytes (stash->bfd_ptr, stash->info_ptr, stash->info_ptr_end);
|
2007-06-26 16:28:13 +02:00
|
|
|
/* A 0xffffff length is the DWARF3 way of indicating
|
|
|
|
we use 64-bit offsets, instead of 32-bit offsets. */
|
2005-06-06 16:28:31 +02:00
|
|
|
if (length == 0xffffffff)
|
|
|
|
{
|
|
|
|
offset_size = 8;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
length = read_8_bytes (stash->bfd_ptr, stash->info_ptr + 4, stash->info_ptr_end);
|
2005-06-06 16:28:31 +02:00
|
|
|
stash->info_ptr += 12;
|
|
|
|
}
|
|
|
|
/* A zero length is the IRIX way of indicating 64-bit offsets,
|
|
|
|
mostly because the 64-bit length will generally fit in 32
|
|
|
|
bits, and the endianness helps. */
|
|
|
|
else if (length == 0)
|
|
|
|
{
|
|
|
|
offset_size = 8;
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
length = read_4_bytes (stash->bfd_ptr, stash->info_ptr + 4, stash->info_ptr_end);
|
2005-06-06 16:28:31 +02:00
|
|
|
stash->info_ptr += 8;
|
|
|
|
}
|
2007-02-23 18:38:07 +01:00
|
|
|
/* In the absence of the hints above, we assume 32-bit DWARF2
|
|
|
|
offsets even for targets with 64-bit addresses, because:
|
|
|
|
a) most of the time these targets will not have generated
|
|
|
|
more than 2Gb of debug info and so will not need 64-bit
|
|
|
|
offsets,
|
|
|
|
and
|
|
|
|
b) if they do use 64-bit offsets but they are not using
|
|
|
|
the size hints that are tested for above then they are
|
|
|
|
not conforming to the DWARF3 standard anyway. */
|
2005-06-06 16:28:31 +02:00
|
|
|
else if (addr_size == 8)
|
|
|
|
{
|
2007-02-23 18:38:07 +01:00
|
|
|
offset_size = 4;
|
2008-09-05 19:48:08 +02:00
|
|
|
stash->info_ptr += 4;
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
stash->info_ptr += 4;
|
|
|
|
|
|
|
|
if (length > 0)
|
|
|
|
{
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
bfd_byte * new_ptr;
|
|
|
|
|
2017-02-13 18:51:27 +01:00
|
|
|
/* PR 21151 */
|
|
|
|
if (stash->info_ptr + length > stash->info_ptr_end)
|
|
|
|
return FALSE;
|
|
|
|
|
2007-06-22 10:13:12 +02:00
|
|
|
each = parse_comp_unit (stash, length, info_ptr_unit,
|
2005-06-06 16:28:31 +02:00
|
|
|
offset_size);
|
2008-02-16 11:51:38 +01:00
|
|
|
if (!each)
|
|
|
|
/* The dwarf information is damaged, don't trust it any
|
|
|
|
more. */
|
|
|
|
break;
|
2005-06-06 16:28:31 +02:00
|
|
|
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
new_ptr = stash->info_ptr + length;
|
|
|
|
/* PR 17512: file: 1500698c. */
|
|
|
|
if (new_ptr < stash->info_ptr)
|
|
|
|
{
|
|
|
|
/* A corrupt length value - do not trust the info any more. */
|
|
|
|
found = FALSE;
|
|
|
|
break;
|
|
|
|
}
|
2015-02-15 09:32:46 +01:00
|
|
|
else
|
Fix memory access violations triggered by running addr2line on fuzzed binaries.
PR binutils/17512
* dwarf.c (read_1_byte, read_1_signed_byte, read_2_bytes)
(read_4_bytes, read_8_bytes, read_n_bytes, read_string)
(read_indirect_string, read_alt_indirect_string)
(read_alt_indirect_ref, read_address, read_abbrevs)
(read_attribute_value, read_attribute, decode_line_info)
(find_abstract_instance_name, read_rangelist)
(scan_unit_for_symbols, parse_comp_unit)
(_bfd_dwarf2_find_nearest_line): Harden DWARF reading code. Pass
end pointers to reading functions and check for offsets taking
pointers out of range. Replace calls to read_*_leb128 with calls
to safe_read_leb128.
(* elf64-ppc.c (opd_entry_value): Add a check for an overlarge
offset.
* syms.c (_bfd_stab_section_find_nearest_line): Add checks for
computed file_name address being before the start of the string
table.
2015-02-12 17:45:11 +01:00
|
|
|
stash->info_ptr = new_ptr;
|
2015-02-15 09:32:46 +01:00
|
|
|
|
2008-02-16 11:51:38 +01:00
|
|
|
if (stash->all_comp_units)
|
|
|
|
stash->all_comp_units->prev_unit = each;
|
|
|
|
else
|
|
|
|
stash->last_comp_unit = each;
|
2013-01-10 21:03:55 +01:00
|
|
|
|
2008-02-16 11:51:38 +01:00
|
|
|
each->next_unit = stash->all_comp_units;
|
|
|
|
stash->all_comp_units = each;
|
2013-01-10 21:03:55 +01:00
|
|
|
|
2008-02-16 11:51:38 +01:00
|
|
|
/* DW_AT_low_pc and DW_AT_high_pc are optional for
|
|
|
|
compilation units. If we don't have them (i.e.,
|
|
|
|
unit->high == 0), we need to consult the line info table
|
|
|
|
to see if a compilation unit contains the given
|
|
|
|
address. */
|
|
|
|
if (do_line)
|
|
|
|
found = (((symbol->flags & BSF_FUNCTION) == 0
|
|
|
|
|| each->arange.high == 0
|
|
|
|
|| comp_unit_contains_address (each, addr))
|
|
|
|
&& comp_unit_find_line (each, symbol, addr,
|
|
|
|
filename_ptr,
|
|
|
|
linenumber_ptr,
|
|
|
|
stash));
|
|
|
|
else
|
|
|
|
found = ((each->arange.high == 0
|
|
|
|
|| comp_unit_contains_address (each, addr))
|
|
|
|
&& comp_unit_find_nearest_line (each, addr,
|
|
|
|
filename_ptr,
|
2014-12-10 00:21:56 +01:00
|
|
|
&function,
|
2008-02-16 11:51:38 +01:00
|
|
|
linenumber_ptr,
|
2012-07-24 23:06:58 +02:00
|
|
|
discriminator_ptr,
|
2014-12-10 04:36:42 +01:00
|
|
|
stash) != 0);
|
2009-01-22 09:54:20 +01:00
|
|
|
|
|
|
|
if ((bfd_vma) (stash->info_ptr - stash->sec_info_ptr)
|
|
|
|
== stash->sec->size)
|
|
|
|
{
|
2011-09-30 12:39:45 +02:00
|
|
|
stash->sec = find_debug_info (stash->bfd_ptr, debug_sections,
|
2014-04-24 14:29:56 +02:00
|
|
|
stash->sec);
|
2009-01-22 09:54:20 +01:00
|
|
|
stash->sec_info_ptr = stash->info_ptr;
|
|
|
|
}
|
|
|
|
|
2008-02-16 11:51:38 +01:00
|
|
|
if (found)
|
|
|
|
goto done;
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-16 15:57:11 +02:00
|
|
|
done:
|
2014-12-10 00:21:56 +01:00
|
|
|
if (function)
|
|
|
|
{
|
2015-12-02 06:16:48 +01:00
|
|
|
if (!function->is_linkage)
|
2014-12-10 00:21:56 +01:00
|
|
|
{
|
2015-12-02 06:16:48 +01:00
|
|
|
asymbol *fun;
|
|
|
|
bfd_vma sec_vma;
|
|
|
|
|
|
|
|
fun = _bfd_elf_find_function (abfd, symbols, section, offset,
|
|
|
|
*filename_ptr ? NULL : filename_ptr,
|
|
|
|
functionname_ptr);
|
|
|
|
sec_vma = section->vma;
|
|
|
|
if (section->output_section != NULL)
|
|
|
|
sec_vma = section->output_section->vma + section->output_offset;
|
|
|
|
if (fun != NULL
|
|
|
|
&& fun->value + sec_vma == function->arange.low)
|
|
|
|
function->name = *functionname_ptr;
|
|
|
|
/* Even if we didn't find a linkage name, say that we have
|
|
|
|
to stop a repeated search of symbols. */
|
2014-12-10 00:21:56 +01:00
|
|
|
function->is_linkage = TRUE;
|
|
|
|
}
|
2015-12-02 06:16:48 +01:00
|
|
|
*functionname_ptr = function->name;
|
2014-12-10 00:21:56 +01:00
|
|
|
}
|
2006-03-06 02:36:52 +01:00
|
|
|
if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
|
|
|
|
unset_sections (stash);
|
|
|
|
|
|
|
|
return found;
|
2005-06-06 16:28:31 +02:00
|
|
|
}
|
|
|
|
|
2005-05-23 19:44:55 +02:00
|
|
|
bfd_boolean
|
|
|
|
_bfd_dwarf2_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED,
|
|
|
|
const char **filename_ptr,
|
|
|
|
const char **functionname_ptr,
|
|
|
|
unsigned int *linenumber_ptr,
|
|
|
|
void **pinfo)
|
|
|
|
{
|
|
|
|
struct dwarf2_debug *stash;
|
|
|
|
|
2009-09-09 23:38:59 +02:00
|
|
|
stash = (struct dwarf2_debug *) *pinfo;
|
2005-05-23 19:44:55 +02:00
|
|
|
if (stash)
|
|
|
|
{
|
|
|
|
struct funcinfo *func = stash->inliner_chain;
|
2007-06-26 16:28:13 +02:00
|
|
|
|
2005-05-23 19:44:55 +02:00
|
|
|
if (func && func->caller_func)
|
|
|
|
{
|
|
|
|
*filename_ptr = func->caller_file;
|
|
|
|
*functionname_ptr = func->caller_func->name;
|
|
|
|
*linenumber_ptr = func->caller_line;
|
|
|
|
stash->inliner_chain = func->caller_func;
|
2007-06-26 16:28:13 +02:00
|
|
|
return TRUE;
|
2005-05-23 19:44:55 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-26 16:28:13 +02:00
|
|
|
return FALSE;
|
2005-05-23 19:44:55 +02:00
|
|
|
}
|
|
|
|
|
2005-05-05 16:25:23 +02:00
|
|
|
void
|
2011-12-13 15:02:20 +01:00
|
|
|
_bfd_dwarf2_cleanup_debug_info (bfd *abfd, void **pinfo)
|
2005-05-05 16:25:23 +02:00
|
|
|
{
|
2012-11-09 09:29:34 +01:00
|
|
|
struct dwarf2_debug *stash = (struct dwarf2_debug *) *pinfo;
|
2005-05-05 16:25:23 +02:00
|
|
|
struct comp_unit *each;
|
|
|
|
|
2011-12-13 15:02:20 +01:00
|
|
|
if (abfd == NULL || stash == NULL)
|
2005-05-05 16:25:23 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
for (each = stash->all_comp_units; each; each = each->next_unit)
|
|
|
|
{
|
2008-02-22 16:27:38 +01:00
|
|
|
struct abbrev_info **abbrevs = each->abbrevs;
|
2008-05-21 13:46:42 +02:00
|
|
|
struct funcinfo *function_table = each->function_table;
|
|
|
|
struct varinfo *variable_table = each->variable_table;
|
2008-02-22 16:27:38 +01:00
|
|
|
size_t i;
|
2005-05-05 16:25:23 +02:00
|
|
|
|
2008-02-22 16:27:38 +01:00
|
|
|
for (i = 0; i < ABBREV_HASH_SIZE; i++)
|
2006-03-06 05:52:03 +01:00
|
|
|
{
|
2008-02-22 16:27:38 +01:00
|
|
|
struct abbrev_info *abbrev = abbrevs[i];
|
2005-05-05 16:25:23 +02:00
|
|
|
|
2008-02-22 16:27:38 +01:00
|
|
|
while (abbrev)
|
2006-03-06 05:52:03 +01:00
|
|
|
{
|
2008-02-22 16:27:38 +01:00
|
|
|
free (abbrev->attrs);
|
|
|
|
abbrev = abbrev->next;
|
2006-03-06 05:52:03 +01:00
|
|
|
}
|
|
|
|
}
|
2005-05-05 16:25:23 +02:00
|
|
|
|
|
|
|
if (each->line_table)
|
2006-03-06 05:52:03 +01:00
|
|
|
{
|
2008-02-22 16:27:38 +01:00
|
|
|
free (each->line_table->dirs);
|
|
|
|
free (each->line_table->files);
|
2006-03-06 05:52:03 +01:00
|
|
|
}
|
2008-05-21 13:46:42 +02:00
|
|
|
|
|
|
|
while (function_table)
|
|
|
|
{
|
|
|
|
if (function_table->file)
|
|
|
|
{
|
|
|
|
free (function_table->file);
|
|
|
|
function_table->file = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (function_table->caller_file)
|
|
|
|
{
|
|
|
|
free (function_table->caller_file);
|
|
|
|
function_table->caller_file = NULL;
|
|
|
|
}
|
|
|
|
function_table = function_table->prev_func;
|
|
|
|
}
|
|
|
|
|
2016-11-08 13:01:58 +01:00
|
|
|
if (each->lookup_funcinfo_table)
|
|
|
|
{
|
|
|
|
free (each->lookup_funcinfo_table);
|
|
|
|
each->lookup_funcinfo_table = NULL;
|
|
|
|
}
|
|
|
|
|
2008-05-21 13:46:42 +02:00
|
|
|
while (variable_table)
|
|
|
|
{
|
|
|
|
if (variable_table->file)
|
|
|
|
{
|
|
|
|
free (variable_table->file);
|
|
|
|
variable_table->file = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
variable_table = variable_table->prev_var;
|
|
|
|
}
|
2005-05-05 16:25:23 +02:00
|
|
|
}
|
|
|
|
|
2017-10-09 04:51:44 +02:00
|
|
|
if (stash->funcinfo_hash_table)
|
|
|
|
bfd_hash_table_free (&stash->funcinfo_hash_table->base);
|
|
|
|
if (stash->varinfo_hash_table)
|
|
|
|
bfd_hash_table_free (&stash->varinfo_hash_table->base);
|
2008-11-11 00:39:19 +01:00
|
|
|
if (stash->dwarf_abbrev_buffer)
|
|
|
|
free (stash->dwarf_abbrev_buffer);
|
|
|
|
if (stash->dwarf_line_buffer)
|
|
|
|
free (stash->dwarf_line_buffer);
|
|
|
|
if (stash->dwarf_str_buffer)
|
|
|
|
free (stash->dwarf_str_buffer);
|
2017-07-04 10:09:27 +02:00
|
|
|
if (stash->dwarf_line_str_buffer)
|
|
|
|
free (stash->dwarf_line_str_buffer);
|
2008-11-11 00:39:19 +01:00
|
|
|
if (stash->dwarf_ranges_buffer)
|
|
|
|
free (stash->dwarf_ranges_buffer);
|
|
|
|
if (stash->info_ptr_memory)
|
|
|
|
free (stash->info_ptr_memory);
|
2012-08-01 03:29:12 +02:00
|
|
|
if (stash->close_on_cleanup)
|
|
|
|
bfd_close (stash->bfd_ptr);
|
2013-05-29 16:58:35 +02:00
|
|
|
if (stash->alt_dwarf_str_buffer)
|
|
|
|
free (stash->alt_dwarf_str_buffer);
|
|
|
|
if (stash->alt_dwarf_info_buffer)
|
|
|
|
free (stash->alt_dwarf_info_buffer);
|
PR ld/16787, stale dwarf2 stash
Throw away the dwarf2 stash if it becomes invalid due to section
VMAs changing. It would be nice to reclaim all the bfd_alloc
memory here when we throw away the stash, perhaps by putting
everything we alloc on a private dwarf2 objalloc, but I haven't done
that with this patch.
I've also fixed a problem with bfd_perform_relocation losing reloc
addends, which meant a second or subsequent look at debug info
sections did not properly relocate the sections. I can't see why
bfd_perform_relocation should need to change addends except for ld -r,
and the history (985fca12, e98e6ec1) doesn't help much.
Finally, the patch tweaks place_sections to avoid unnecessary work.
If we've mapped input to output sections, then input section VMA
isn't used so there's not much point in adjusting it. Incidentally,
this also means place_sections isn't effective in all cases.
PR ld/16787
* dwarf2.c (struct dwarf2_debug): Add sec_vma field.
(place_sections): Do not modify VMA of sections when called from
linker after sections have been placed in output sections. Short
circuit single section case.
(save_section_vma, section_vma_same): New functions.
(_bfd_dwarf2_slurp_debug_info): Throw away stash if section VMAs
change.
* reloc.c (bfd_perform_relocation): Do not modify reloc addend
when non-relocatable.
2014-04-23 06:56:19 +02:00
|
|
|
if (stash->sec_vma)
|
|
|
|
free (stash->sec_vma);
|
2014-04-24 14:29:56 +02:00
|
|
|
if (stash->adjusted_sections)
|
|
|
|
free (stash->adjusted_sections);
|
2013-05-29 16:58:35 +02:00
|
|
|
if (stash->alt_bfd_ptr)
|
|
|
|
bfd_close (stash->alt_bfd_ptr);
|
2005-05-05 16:25:23 +02:00
|
|
|
}
|
2014-12-10 00:21:56 +01:00
|
|
|
|
|
|
|
/* Find the function to a particular section and offset,
|
|
|
|
for error reporting. */
|
|
|
|
|
2015-12-02 06:16:48 +01:00
|
|
|
asymbol *
|
2014-12-10 00:21:56 +01:00
|
|
|
_bfd_elf_find_function (bfd *abfd,
|
|
|
|
asymbol **symbols,
|
|
|
|
asection *section,
|
|
|
|
bfd_vma offset,
|
|
|
|
const char **filename_ptr,
|
|
|
|
const char **functionname_ptr)
|
|
|
|
{
|
|
|
|
struct elf_find_function_cache
|
|
|
|
{
|
|
|
|
asection *last_section;
|
|
|
|
asymbol *func;
|
|
|
|
const char *filename;
|
|
|
|
bfd_size_type func_size;
|
|
|
|
} *cache;
|
|
|
|
|
|
|
|
if (symbols == NULL)
|
2015-12-02 06:16:48 +01:00
|
|
|
return NULL;
|
2014-12-10 00:21:56 +01:00
|
|
|
|
|
|
|
if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
|
2015-12-02 06:16:48 +01:00
|
|
|
return NULL;
|
2014-12-10 00:21:56 +01:00
|
|
|
|
|
|
|
cache = elf_tdata (abfd)->elf_find_function_cache;
|
|
|
|
if (cache == NULL)
|
|
|
|
{
|
|
|
|
cache = bfd_zalloc (abfd, sizeof (*cache));
|
|
|
|
elf_tdata (abfd)->elf_find_function_cache = cache;
|
|
|
|
if (cache == NULL)
|
2015-12-02 06:16:48 +01:00
|
|
|
return NULL;
|
2014-12-10 00:21:56 +01:00
|
|
|
}
|
|
|
|
if (cache->last_section != section
|
|
|
|
|| cache->func == NULL
|
|
|
|
|| offset < cache->func->value
|
|
|
|
|| offset >= cache->func->value + cache->func_size)
|
|
|
|
{
|
|
|
|
asymbol *file;
|
|
|
|
bfd_vma low_func;
|
|
|
|
asymbol **p;
|
|
|
|
/* ??? Given multiple file symbols, it is impossible to reliably
|
|
|
|
choose the right file name for global symbols. File symbols are
|
|
|
|
local symbols, and thus all file symbols must sort before any
|
|
|
|
global symbols. The ELF spec may be interpreted to say that a
|
|
|
|
file symbol must sort before other local symbols, but currently
|
|
|
|
ld -r doesn't do this. So, for ld -r output, it is possible to
|
|
|
|
make a better choice of file name for local symbols by ignoring
|
|
|
|
file symbols appearing after a given local symbol. */
|
|
|
|
enum { nothing_seen, symbol_seen, file_after_symbol_seen } state;
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
|
|
|
|
|
|
|
file = NULL;
|
|
|
|
low_func = 0;
|
|
|
|
state = nothing_seen;
|
|
|
|
cache->filename = NULL;
|
|
|
|
cache->func = NULL;
|
|
|
|
cache->func_size = 0;
|
|
|
|
cache->last_section = section;
|
|
|
|
|
|
|
|
for (p = symbols; *p != NULL; p++)
|
|
|
|
{
|
|
|
|
asymbol *sym = *p;
|
|
|
|
bfd_vma code_off;
|
|
|
|
bfd_size_type size;
|
|
|
|
|
|
|
|
if ((sym->flags & BSF_FILE) != 0)
|
|
|
|
{
|
|
|
|
file = sym;
|
|
|
|
if (state == symbol_seen)
|
|
|
|
state = file_after_symbol_seen;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
size = bed->maybe_function_sym (sym, section, &code_off);
|
|
|
|
if (size != 0
|
|
|
|
&& code_off <= offset
|
|
|
|
&& (code_off > low_func
|
|
|
|
|| (code_off == low_func
|
|
|
|
&& size > cache->func_size)))
|
|
|
|
{
|
|
|
|
cache->func = sym;
|
|
|
|
cache->func_size = size;
|
|
|
|
cache->filename = NULL;
|
|
|
|
low_func = code_off;
|
|
|
|
if (file != NULL
|
|
|
|
&& ((sym->flags & BSF_LOCAL) != 0
|
|
|
|
|| state != file_after_symbol_seen))
|
|
|
|
cache->filename = bfd_asymbol_name (file);
|
|
|
|
}
|
|
|
|
if (state == nothing_seen)
|
|
|
|
state = symbol_seen;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cache->func == NULL)
|
2015-12-02 06:16:48 +01:00
|
|
|
return NULL;
|
2014-12-10 00:21:56 +01:00
|
|
|
|
|
|
|
if (filename_ptr)
|
|
|
|
*filename_ptr = cache->filename;
|
|
|
|
if (functionname_ptr)
|
|
|
|
*functionname_ptr = bfd_asymbol_name (cache->func);
|
|
|
|
|
2015-12-02 06:16:48 +01:00
|
|
|
return cache->func;
|
2014-12-10 00:21:56 +01:00
|
|
|
}
|