From f7a6bb70398a545baf43a6c3ef867b05844d9396 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 9 Jan 2007 22:14:35 +0000 Subject: [PATCH] 2007-01-09 Jan Kratochvil * minsyms.c (lookup_minimal_symbol_by_pc_section): Handle nested symbols. * gdb.arch/i386-size-overlap.c, gdb.arch/i386-size-overlap.exp: New. --- gdb/ChangeLog | 5 ++ gdb/minsyms.c | 16 +++++ gdb/testsuite/ChangeLog | 4 ++ gdb/testsuite/gdb.arch/i386-size-overlap.c | 53 ++++++++++++++ gdb/testsuite/gdb.arch/i386-size-overlap.exp | 76 ++++++++++++++++++++ 5 files changed, 154 insertions(+) create mode 100644 gdb/testsuite/gdb.arch/i386-size-overlap.c create mode 100644 gdb/testsuite/gdb.arch/i386-size-overlap.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 46eb92983f9..9deb737464c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2007-01-09 Jan Kratochvil + + * minsyms.c (lookup_minimal_symbol_by_pc_section): Handle + nested symbols. + 2007-01-09 Daniel Jacobowitz * copyright.sh (prunes): Add step-line.inp and step-line.c. diff --git a/gdb/minsyms.c b/gdb/minsyms.c index 55f2d4a5695..e4b0356b868 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -510,6 +510,22 @@ lookup_minimal_symbol_by_pc_section (CORE_ADDR pc, asection *section) continue; } + /* If we are past the end of the current symbol, try + the previous symbol if it has a larger overlapping + size. This happens on i686-pc-linux-gnu with glibc; + the nocancel variants of system calls are inside + the cancellable variants, but both have sizes. */ + if (hi > 0 + && MSYMBOL_SIZE (&msymbol[hi]) != 0 + && pc >= (SYMBOL_VALUE_ADDRESS (&msymbol[hi]) + + MSYMBOL_SIZE (&msymbol[hi])) + && pc < (SYMBOL_VALUE_ADDRESS (&msymbol[hi - 1]) + + MSYMBOL_SIZE (&msymbol[hi - 1]))) + { + hi--; + continue; + } + /* Otherwise, this symbol must be as good as we're going to get. */ break; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index dedbe26cc01..f62bef293f8 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2007-01-09 Jan Kratochvil + + * gdb.arch/i386-size-overlap.c, gdb.arch/i386-size-overlap.exp: New. + 2007-01-08 Nick Roberts Daniel Jacobowitz diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.c b/gdb/testsuite/gdb.arch/i386-size-overlap.c new file mode 100644 index 00000000000..2acf7ac9a66 --- /dev/null +++ b/gdb/testsuite/gdb.arch/i386-size-overlap.c @@ -0,0 +1,53 @@ +/* Overlapping symbol sizes test program. + + Copyright 2007 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifdef SYMBOL_PREFIX +#define SYMBOL(str) SYMBOL_PREFIX #str +#else +#define SYMBOL(str) #str +#endif + +void +trap (void) +{ + asm ("int $0x03"); +} + +/* Jump from a function with its symbol size set, to a function + named by a local label. GDB should report the `main' function + even for the rest, after the global `inner' ends. */ + +asm(".text\n" + " .align 8\n" + " .globl " SYMBOL (main) "\n" + SYMBOL (main) ":\n" + " pushl %ebp\n" + " mov %esp, %ebp\n" + " call .Lfunc\n" + " ret\n" + SYMBOL (inner) ":\n" + " ret\n" + " .size " SYMBOL (inner) ", .-" SYMBOL (inner) "\n" + ".Lfunc:\n" + " pushl %ebp\n" + " mov %esp, %ebp\n" + " call " SYMBOL (trap) "\n" + " .size " SYMBOL (main) ", .-" SYMBOL (main) "\n"); diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.exp b/gdb/testsuite/gdb.arch/i386-size-overlap.exp new file mode 100644 index 00000000000..628daf49a6b --- /dev/null +++ b/gdb/testsuite/gdb.arch/i386-size-overlap.exp @@ -0,0 +1,76 @@ +# Copyright 2007 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# This file is part of the gdb testsuite. + +if $tracelevel { + strace $tracelevel +} + +# Test that GDB can handle overlapping sizes of symbols. + +if ![istarget "i?86-*-*"] then { + verbose "Skipping i386 unwinder tests." + return +} + +set testfile "i386-size-overlap" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +# some targets have leading underscores on assembly symbols. +# TODO: detect this automatically +set additional_flags "" +if [istarget "i?86-*-cygwin*"] then { + set additional_flags "additional_flags=-DSYMBOL_PREFIX=\"_\"" +} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ + executable [list debug $additional_flags]] != "" } { + untested "i386-size" + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +# We use gdb_run_cmd so this stands a chance to work for remote +# targets too. +gdb_run_cmd + +gdb_expect { + -re "Program received signal SIGTRAP.*$gdb_prompt $" { + pass "run past main" + } + -re ".*$gdb_prompt $" { + fail "run past main" + } + timeout { + fail "run past main (timeout)" + } +} + +set message "backtrace shows the outer function" +gdb_test_multiple "backtrace 10" $message { + -re "#1\[ \t]*$hex in inner.*$gdb_prompt $" { + fail $message + } + -re "#1\[ \t]*$hex in main.*$gdb_prompt $" { + pass $message + } +} -- 2.30.2