This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: [PATCH] delete another SOFUN_ADDRESS_MAYBE_MISSING
- From: Elena Zannoni <ezannoni at redhat dot com>
- To: Elena Zannoni <ezannoni at redhat dot com>
- Cc: gdb-patches at sources dot redhat dot com
- Date: Tue, 21 Oct 2003 19:07:38 -0400
- Subject: Re: [PATCH] delete another SOFUN_ADDRESS_MAYBE_MISSING
- References: <16269.51624.300201.860241@localhost.redhat.com>
Elena Zannoni writes:
>
> Another one, as explained in
> http://sources.redhat.com/ml/gdb/2003-10/msg00202.html
>
> I'll check it in in a couple of days.
>
> elena
>
committed
elena
> 2003-10-15 Elena Zannoni <ezannoni@redhat.com>
>
> * 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.
>
> Index: minsyms.c
> ===================================================================
> RCS file: /cvs/uberbaum/gdb/minsyms.c,v
> retrieving revision 1.34
> diff -u -p -r1.34 minsyms.c
> --- minsyms.c 16 Sep 2003 18:56:35 -0000 1.34
> +++ minsyms.c 15 Oct 2003 19:58:41 -0000
> @@ -268,8 +268,7 @@ lookup_minimal_symbol (const char *name,
> 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 +277,6 @@ lookup_minimal_symbol_text (const char *
>
> 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 +294,7 @@ lookup_minimal_symbol_text (const char *
> 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;
>
> Index: symtab.h
> ===================================================================
> RCS file: /cvs/uberbaum/gdb/symtab.h,v
> retrieving revision 1.79
> diff -u -p -r1.79 symtab.h
> --- symtab.h 21 Aug 2003 19:55:32 -0000 1.79
> +++ symtab.h 15 Oct 2003 19:58:03 -0000
> @@ -1164,11 +1164,9 @@ extern struct minimal_symbol *lookup_min
> 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 *,
> struct objfile
> *);
>
> Index: symtab.c
> ===================================================================
> RCS file: /cvs/uberbaum/gdb/symtab.c,v
> retrieving revision 1.118
> diff -u -p -r1.118 symtab.c
> --- symtab.c 20 Sep 2003 02:39:31 -0000 1.118
> +++ symtab.c 15 Oct 2003 19:56:29 -0000
> @@ -1969,7 +1969,7 @@ find_pc_sect_line (CORE_ADDR pc, struct
> 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:
> Index: breakpoint.c
> ===================================================================
> RCS file: /cvs/uberbaum/gdb/breakpoint.c,v
> retrieving revision 1.132
> diff -u -p -r1.132 breakpoint.c
> --- breakpoint.c 13 Oct 2003 23:53:20 -0000 1.132
> +++ breakpoint.c 15 Oct 2003 19:57:42 -0000
> @@ -4005,7 +4005,7 @@ create_longjmp_breakpoint (char *func_na
> 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 *f
> 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),
> Index: ppc-linux-tdep.c
> ===================================================================
> RCS file: /cvs/uberbaum/gdb/ppc-linux-tdep.c,v
> retrieving revision 1.42
> diff -u -p -r1.42 ppc-linux-tdep.c
> --- ppc-linux-tdep.c 3 Oct 2003 20:50:56 -0000 1.42
> +++ ppc-linux-tdep.c 15 Oct 2003 19:55:41 -0000
> @@ -331,7 +331,7 @@ ppc_linux_skip_trampoline_code (CORE_ADD
> /* 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;
>