diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2012-06-01 01:04:29 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2012-06-01 01:04:29 +0000 |
| commit | 459086eec74e179dc57e06fcaf1fe990d4e6c412 (patch) | |
| tree | 124beaaa45676b0d82c2594774c6ae738608065a /binutils/addr2line.c | |
| parent | 150b2fd443e810b9288a95efb579f4e79eb496d4 (diff) | |
| download | binutils-redhat-459086eec74e179dc57e06fcaf1fe990d4e6c412.tar.gz | |
* addr2line.c (translate_addresses): Truncate input addresses to
arch_size bits. Avoid undefined shift. Print '?' for zero line.
Diffstat (limited to 'binutils/addr2line.c')
| -rw-r--r-- | binutils/addr2line.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/binutils/addr2line.c b/binutils/addr2line.c index d0f45671cb..663da4570e 100644 --- a/binutils/addr2line.c +++ b/binutils/addr2line.c @@ -196,8 +196,6 @@ find_offset_in_section (bfd *abfd, asection *section) static void translate_addresses (bfd *abfd, asection *section) { - const struct elf_backend_data * bed; - int read_stdin = (naddr == 0); for (;;) @@ -218,11 +216,15 @@ translate_addresses (bfd *abfd, asection *section) pc = bfd_scan_vma (*addr++, NULL, 16); } - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour - && (bed = get_elf_backend_data (abfd)) != NULL - && bed->sign_extend_vma - && (pc & (bfd_vma) 1 << (bed->s->arch_size - 1))) - pc |= ((bfd_vma) -1) << bed->s->arch_size; + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) + { + const struct elf_backend_data *bed = get_elf_backend_data (abfd); + bfd_vma sign = (bfd_vma) 1 << (bed->s->arch_size - 1); + + pc &= (sign << 1) - 1; + if (bed->sign_extend_vma) + pc = (pc ^ sign) - sign; + } if (with_addresses) { @@ -290,7 +292,11 @@ translate_addresses (bfd *abfd, asection *section) filename = h + 1; } - printf ("%s:%u\n", filename ? filename : "??", line); + printf ("%s:", filename ? filename : "??"); + if (line != 0) + printf ("%u\n", line); + else + printf ("?\n"); if (!unwind_inlines) found = FALSE; else |