From 7fb934b2c2476d834a22afa24d4e5c4e9133966d Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sat, 27 Oct 2012 20:50:21 +0200 Subject: libdwfl/ * dwfl_report_elf.c (__libdwfl_report_elf): Remove BASE aligning. tests/ * Makefile.am (check_PROGRAMS): Add dwfl-report-elf-align. (TESTS): Add run-dwfl-report-elf-align.sh. (EXTRA_DIST): Add run-dwfl-report-elf-align.sh and testfile-dwfl-report-elf-align-shlib.so.bz2 . (dwfl_report_elf_align_LDADD): New. * dwfl-report-elf-align.c: New file. * run-dwfl-report-elf-align.sh: New file. * testfile-dwfl-report-elf-align-shlib.so.bz2: New file. Signed-off-by: Jan Kratochvil --- libdwfl/ChangeLog | 4 ++ libdwfl/dwfl_report_elf.c | 2 - tests/ChangeLog | 11 ++++ tests/Makefile.am | 9 ++- tests/dwfl-report-elf-align.c | 72 ++++++++++++++++++++++ tests/run-dwfl-report-elf-align.sh | 34 ++++++++++ tests/testfile-dwfl-report-elf-align-shlib.so.bz2 | Bin 0 -> 1546 bytes 7 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 tests/dwfl-report-elf-align.c create mode 100755 tests/run-dwfl-report-elf-align.sh create mode 100755 tests/testfile-dwfl-report-elf-align-shlib.so.bz2 diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 83bdf46b..cdf539e3 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,7 @@ +2012-10-27 Jan Kratochvil + + * dwfl_report_elf.c (__libdwfl_report_elf): Remove BASE aligning. + 2012-10-27 Jan Kratochvil * dwfl_report_elf.c (__libdwfl_report_elf): Simplify START and BIAS diff --git a/libdwfl/dwfl_report_elf.c b/libdwfl/dwfl_report_elf.c index 174ce7ce..d7061704 100644 --- a/libdwfl/dwfl_report_elf.c +++ b/libdwfl/dwfl_report_elf.c @@ -181,8 +181,6 @@ __libdwfl_report_elf (Dwfl *dwfl, const char *name, const char *file_name, { vaddr = ph->p_vaddr & -ph->p_align; address_sync = ph->p_vaddr + ph->p_memsz; - if ((base & (ph->p_align - 1)) != 0) - base = (base + ph->p_align - 1) & -ph->p_align; start = base + vaddr; break; } diff --git a/tests/ChangeLog b/tests/ChangeLog index edb82b48..896105da 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,14 @@ +2012-10-27 Jan Kratochvil + + * Makefile.am (check_PROGRAMS): Add dwfl-report-elf-align. + (TESTS): Add run-dwfl-report-elf-align.sh. + (EXTRA_DIST): Add run-dwfl-report-elf-align.sh and + testfile-dwfl-report-elf-align-shlib.so.bz2 . + (dwfl_report_elf_align_LDADD): New. + * dwfl-report-elf-align.c: New file. + * run-dwfl-report-elf-align.sh: New file. + * testfile-dwfl-report-elf-align-shlib.so.bz2: New file. + 2012-10-27 Jan Kratochvil * Makefile.am (EXTRA_DIST): Add testfile64.bz2, testfile65.bz2, diff --git a/tests/Makefile.am b/tests/Makefile.am index f2d2484a..a1ed2841 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -51,7 +51,7 @@ check_PROGRAMS = arextract arsymtest newfile saridx scnnames sectiondump \ dwfl-bug-getmodules dwarf-getmacros addrcfi \ test-flag-nobits dwarf-getstring rerequest_tag \ alldts md5-sha1-test typeiter low_high_pc \ - test-elf_cntl_gelf_getshdr + test-elf_cntl_gelf_getshdr dwfl-report-elf-align asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \ asm-tst6 asm-tst7 asm-tst8 asm-tst9 @@ -85,7 +85,7 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \ run-readelf-d.sh run-readelf-gdb_index.sh run-unstrip-n.sh \ run-low_high_pc.sh run-macro-test.sh run-elf_cntl_gelf_getshdr.sh \ run-test-archive64.sh run-readelf-vmcoreinfo.sh \ - run-readelf-mixed-corenote.sh + run-readelf-mixed-corenote.sh run-dwfl-report-elf-align.sh if !STANDALONE check_PROGRAMS += msg_tst md5-sha1-test @@ -180,7 +180,9 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \ testfile60.bz2 testfile61.bz2 \ run-readelf-vmcoreinfo.sh testfile62.bz2 \ run-readelf-mixed-corenote.sh testfile63.bz2 testfile64.bz2 \ - testfile65.bz2 testfile69.core.bz2 testfile69.so.bz2 + testfile65.bz2 testfile69.core.bz2 testfile69.so.bz2 \ + run-dwfl-report-elf-align.sh \ + testfile-dwfl-report-elf-align-shlib.so.bz2 if USE_VALGRIND valgrind_cmd="valgrind -q --trace-children=yes --error-exitcode=1" @@ -287,6 +289,7 @@ md5_sha1_test_LDADD = $(libeu) typeiter_LDADD = $(libdw) $(libelf) $(libmudflap) low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap) test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap) +dwfl_report_elf_align_LDADD = $(libdw) $(libmudflap) if GCOV check: check-am coverage diff --git a/tests/dwfl-report-elf-align.c b/tests/dwfl-report-elf-align.c new file mode 100644 index 00000000..494ab65b --- /dev/null +++ b/tests/dwfl-report-elf-align.c @@ -0,0 +1,72 @@ +/* Test program for dwfl_report_elf incorrect BASE alignment. + Copyright (C) 2012 Red Hat, Inc. + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + elfutils is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include ELFUTILS_HEADER(dwfl) + + +static const Dwfl_Callbacks offline_callbacks = + { + .find_debuginfo = INTUSE(dwfl_standard_find_debuginfo), + .section_address = INTUSE(dwfl_offline_section_address), + }; + + +int +main (int argc, char **argv) +{ + /* We use no threads here which can interfere with handling a stream. */ + (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER); + + /* Set locale. */ + (void) setlocale (LC_ALL, ""); + + if (argc != 5) + error (1, 0, "dwfl-report-elf-align shlib.so base funcaddr funcname"); + + Dwfl *dwfl = dwfl_begin (&offline_callbacks); + assert (dwfl != NULL); + + char *endptr; + uintptr_t base = strtoull (argv[2], &endptr, 0); + assert (endptr && !*endptr); + + Dwfl_Module *mod = dwfl_report_elf (dwfl, argv[1], argv[1], -1, base); + assert (mod != NULL); + + uintptr_t funcaddr = strtoull (argv[3], &endptr, 0); + assert (endptr && !*endptr); + + Dwfl_Module *mod_found = dwfl_addrmodule (dwfl, funcaddr); + assert (mod_found == mod); + + const char *symname = dwfl_module_addrname (mod, funcaddr); + assert (symname != NULL); + assert (strcmp (symname, argv[4]) == 0); + + dwfl_end (dwfl); + + return 0; +} diff --git a/tests/run-dwfl-report-elf-align.sh b/tests/run-dwfl-report-elf-align.sh new file mode 100755 index 00000000..4c4c3e65 --- /dev/null +++ b/tests/run-dwfl-report-elf-align.sh @@ -0,0 +1,34 @@ +#! /bin/sh +# Copyright (C) 2012 Red Hat, Inc. +# This file is part of elfutils. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# elfutils is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. $srcdir/test-subr.sh + +testfiles testfile-dwfl-report-elf-align-shlib.so + +# 7f3560c92000-7f3560c93000 r-xp 00000000 fd:02 25037063 testfile-dwfl-report-elf-align-shlib.so +# 7f3560c93000-7f3560e92000 ---p 00001000 fd:02 25037063 testfile-dwfl-report-elf-align-shlib.so +# 7f3560e92000-7f3560e93000 rw-p 00000000 fd:02 25037063 testfile-dwfl-report-elf-align-shlib.so +# Program Headers: +# Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align +# LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x00065c 0x00065c R E 0x200000 +# LOAD 0x000660 0x0000000000200660 0x0000000000200660 0x0001f0 0x000200 RW 0x200000 +# #1 0x00007f3560c92585 in shlib () from ./testfile-dwfl-report-elf-align-shlib.so + +testrun ./dwfl-report-elf-align ./testfile-dwfl-report-elf-align-shlib.so \ + 0x7f3560c92000 0x7f3560c92585 shlib + +exit 0 diff --git a/tests/testfile-dwfl-report-elf-align-shlib.so.bz2 b/tests/testfile-dwfl-report-elf-align-shlib.so.bz2 new file mode 100755 index 00000000..1f35df98 Binary files /dev/null and b/tests/testfile-dwfl-report-elf-align-shlib.so.bz2 differ -- cgit v1.2.1