From 64ae9269446ecfac0e46940e03322373e1aacc76 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Sat, 26 Jul 2003 22:03:38 +0000 Subject: [PATCH] PR c++/1267 * minsyms.c (lookup_minimal_symbol_by_pc_section): If SECTION is NULL, default to the section containing PC. --- gdb/ChangeLog | 6 ++++++ gdb/minsyms.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6473f3e9b3..60e60f9cf3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2003-07-26 Daniel Jacobowitz + + PR c++/1267 + * minsyms.c (lookup_minimal_symbol_by_pc_section): If SECTION is + NULL, default to the section containing PC. + 2003-07-24 Stephane Carrez * NEWS: Mention "regs" deprecated for m68hc11 too. diff --git a/gdb/minsyms.c b/gdb/minsyms.c index fa7209d2bc..319865f6fa 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -403,13 +403,23 @@ lookup_minimal_symbol_by_pc_section (CORE_ADDR pc, asection *section) struct objfile *objfile; struct minimal_symbol *msymbol; struct minimal_symbol *best_symbol = NULL; + struct obj_section *pc_section; /* pc has to be in a known section. This ensures that anything beyond the end of the last segment doesn't appear to be part of the last function in the last segment. */ - if (find_pc_section (pc) == NULL) + pc_section = find_pc_section (pc); + if (pc_section == NULL) return NULL; + /* If no section was specified, then just make sure that the PC is in + the same section as the minimal symbol we find. */ + if (section == NULL) + section = pc_section->the_bfd_section; + + /* FIXME drow/2003-07-19: Should we also check that PC is in SECTION + if we were passed a non-NULL SECTION argument? */ + for (objfile = object_files; objfile != NULL; objfile = objfile->next)