From 5520a790ef1a5b3804fec946801f91ddb6f3c2cb Mon Sep 17 00:00:00 2001 From: Elena Zannoni Date: Tue, 21 Oct 2003 22:56:39 +0000 Subject: [PATCH] 2003-10-21 Elena Zannoni * minsyms.c (lookup_minimal_symbol_text): Remove unused parameter. Remove SOFUN_ADDRESS_MAYBE_MISSING ifdeffed code. * symtab.h (lookup_minimal_symbol_text): Update. * breakpoint.c (create_overlay_event_breakpoint, create_longjmp_breakpoint): Update callers. * ppc-linux-tdep.c (ppc_linux_skip_trampoline_code): Update caller. * symtab.c (find_pc_sect_line): Ditto. --- gdb/ChangeLog | 10 ++++++++++ gdb/breakpoint.c | 4 ++-- gdb/minsyms.c | 37 +++++++------------------------------ gdb/ppc-linux-tdep.c | 2 +- gdb/symtab.c | 2 +- gdb/symtab.h | 1 - 6 files changed, 21 insertions(+), 35 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6a0eae6a..fd9b257 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2003-10-21 Elena Zannoni + + * minsyms.c (lookup_minimal_symbol_text): Remove unused parameter. + Remove SOFUN_ADDRESS_MAYBE_MISSING ifdeffed code. + * symtab.h (lookup_minimal_symbol_text): Update. + * breakpoint.c (create_overlay_event_breakpoint, + create_longjmp_breakpoint): Update callers. + * ppc-linux-tdep.c (ppc_linux_skip_trampoline_code): Update caller. + * symtab.c (find_pc_sect_line): Ditto. + 2003-10-21 Andrew Cagney * target.c (errno): Delete extern declaration. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 8118a0a..79f0b70 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -4005,7 +4005,7 @@ create_longjmp_breakpoint (char *func_name) b = create_internal_breakpoint (0, bp_longjmp_resume); else { - if ((m = lookup_minimal_symbol_text (func_name, NULL, NULL)) == NULL) + if ((m = lookup_minimal_symbol_text (func_name, NULL)) == NULL) return; b = create_internal_breakpoint (SYMBOL_VALUE_ADDRESS (m), bp_longjmp); @@ -4054,7 +4054,7 @@ create_overlay_event_breakpoint (char *func_name) struct breakpoint *b; struct minimal_symbol *m; - if ((m = lookup_minimal_symbol_text (func_name, NULL, NULL)) == NULL) + if ((m = lookup_minimal_symbol_text (func_name, NULL)) == NULL) return; b = create_internal_breakpoint (SYMBOL_VALUE_ADDRESS (m), diff --git a/gdb/minsyms.c b/gdb/minsyms.c index d93a697..c194555 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -260,16 +260,13 @@ lookup_minimal_symbol (const char *name, const char *sfile, /* Look through all the current minimal symbol tables and find the first minimal symbol that matches NAME and has text type. If OBJF - is non-NULL, limit the search to that objfile. If SFILE is non-NULL, - the only file-scope symbols considered will be from that source file - (global symbols are still preferred). Returns a pointer to the minimal - symbol that matches, or NULL if no match is found. + is non-NULL, limit the search to that objfile. Returns a pointer + to the minimal symbol that matches, or NULL if no match is found. This function only searches the mangled (linkage) names. */ struct minimal_symbol * -lookup_minimal_symbol_text (const char *name, const char *sfile, - struct objfile *objf) +lookup_minimal_symbol_text (const char *name, struct objfile *objf) { struct objfile *objfile; struct minimal_symbol *msymbol; @@ -278,15 +275,6 @@ lookup_minimal_symbol_text (const char *name, const char *sfile, unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE; -#ifdef SOFUN_ADDRESS_MAYBE_MISSING - if (sfile != NULL) - { - char *p = strrchr (sfile, '/'); - if (p != NULL) - sfile = p + 1; - } -#endif - for (objfile = object_files; objfile != NULL && found_symbol == NULL; objfile = objfile->next) @@ -304,17 +292,7 @@ lookup_minimal_symbol_text (const char *name, const char *sfile, switch (MSYMBOL_TYPE (msymbol)) { case mst_file_text: -#ifdef SOFUN_ADDRESS_MAYBE_MISSING - if (sfile == NULL || STREQ (msymbol->filename, sfile)) - found_file_symbol = msymbol; -#else - /* We have neither the ability nor the need to - deal with the SFILE parameter. If we find - more than one symbol, just return the latest - one (the user can't expect useful behavior in - that case). */ found_file_symbol = msymbol; -#endif break; default: found_symbol = msymbol; @@ -336,11 +314,10 @@ lookup_minimal_symbol_text (const char *name, const char *sfile, } /* Look through all the current minimal symbol tables and find the - first minimal symbol that matches NAME and is a solib trampoline. If OBJF - is non-NULL, limit the search to that objfile. If SFILE is non-NULL, - the only file-scope symbols considered will be from that source file - (global symbols are still preferred). Returns a pointer to the minimal - symbol that matches, or NULL if no match is found. + first minimal symbol that matches NAME and is a solib trampoline. + If OBJF is non-NULL, limit the search to that objfile. Returns a + pointer to the minimal symbol that matches, or NULL if no match is + found. This function only searches the mangled (linkage) names. */ diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 4a6bf6d..60b976f 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -331,7 +331,7 @@ ppc_linux_skip_trampoline_code (CORE_ADDR pc) /* This might not work right if we have multiple symbols with the same name; the only way to really get it right is to perform the same sort of lookup as the dynamic linker. */ - msymbol = lookup_minimal_symbol_text (symname, NULL, NULL); + msymbol = lookup_minimal_symbol_text (symname, NULL); if (!msymbol) return 0; diff --git a/gdb/symtab.c b/gdb/symtab.c index 3a3a547..208b04a 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1969,7 +1969,7 @@ find_pc_sect_line (CORE_ADDR pc, struct bfd_section *section, int notcurrent) if (MSYMBOL_TYPE (msymbol) == mst_solib_trampoline) { mfunsym = lookup_minimal_symbol_text (SYMBOL_LINKAGE_NAME (msymbol), - NULL, NULL); + NULL); if (mfunsym == NULL) /* I eliminated this warning since it is coming out * in the following situation: diff --git a/gdb/symtab.h b/gdb/symtab.h index 3723559..437c9ea 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1164,7 +1164,6 @@ extern struct minimal_symbol *lookup_minimal_symbol (const char *, struct objfile *); extern struct minimal_symbol *lookup_minimal_symbol_text (const char *, - const char *, struct objfile *); struct minimal_symbol *lookup_minimal_symbol_solib_trampoline (const char *, -- 2.7.4