From ae2f03ac167ef20ec3765edfb03bbe2fb7f32a8b Mon Sep 17 00:00:00 2001 From: Elena Zannoni Date: Thu, 15 May 2003 14:28:57 +0000 Subject: [PATCH] 2003-05-15 David Carlton Committed by Elena Zannoni * symtab.c (lookup_symbol_aux): Delete calls to lookup_symbol_aux_minsyms. (lookup_symbol_aux_minsyms): Comment out function and prototype. Delete lookup by mangled name. --- gdb/ChangeLog | 8 +++++++ gdb/symtab.c | 61 ++++++++------------------------------------------- 2 files changed, 17 insertions(+), 52 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a62ecd3a369..a601a8dc9cb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2003-05-15 David Carlton + + Committed by Elena Zannoni + * symtab.c (lookup_symbol_aux): Delete calls to + lookup_symbol_aux_minsyms. + (lookup_symbol_aux_minsyms): Comment out function and + prototype. Delete lookup by mangled name. + 2003-05-14 Kevin Buettner * dwarf2expr.c (new_dwarf_expr_context): Set ``stack_len'' to diff --git a/gdb/symtab.c b/gdb/symtab.c index dbc83b9143c..c5e7e353163 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -117,12 +117,14 @@ struct symbol *lookup_symbol_aux_psymtabs (int block_index, const domain_enum domain, struct symtab **symtab); +#if 0 static struct symbol *lookup_symbol_aux_minsyms (const char *name, const char *mangled_name, const domain_enum domain, int *is_a_field_of_this, struct symtab **symtab); +#endif static struct symbol *find_active_alias (struct symbol *sym, CORE_ADDR addr); @@ -1065,21 +1067,6 @@ lookup_symbol_aux (const char *name, const char *mangled_name, if (sym != NULL) return sym; -#ifndef HPUXHPPA - - /* Check for the possibility of the symbol being a function or - a mangled variable that is stored in one of the minimal symbol tables. - Eventually, all global symbols might be resolved in this way. */ - - sym = lookup_symbol_aux_minsyms (name, mangled_name, - domain, is_a_field_of_this, - symtab); - - if (sym != NULL) - return sym; - -#endif - sym = lookup_symbol_aux_psymtabs (GLOBAL_BLOCK, name, mangled_name, domain, symtab); if (sym != NULL) @@ -1101,33 +1088,6 @@ lookup_symbol_aux (const char *name, const char *mangled_name, if (sym != NULL) return sym; -#ifdef HPUXHPPA - - /* Check for the possibility of the symbol being a function or - a global variable that is stored in one of the minimal symbol tables. - The "minimal symbol table" is built from linker-supplied info. - - RT: I moved this check to last, after the complete search of - the global (p)symtab's and static (p)symtab's. For HP-generated - symbol tables, this check was causing a premature exit from - lookup_symbol with NULL return, and thus messing up symbol lookups - of things like "c::f". It seems to me a check of the minimal - symbol table ought to be a last resort in any case. I'm vaguely - worried about the comment below which talks about FORTRAN routines "foo_" - though... is it saying we need to do the "minsym" check before - the static check in this case? - */ - - - sym = lookup_symbol_aux_minsyms (name, mangled_name, - domain, is_a_field_of_this, - symtab); - - if (sym != NULL) - return sym; - -#endif - if (symtab != NULL) *symtab = NULL; return NULL; @@ -1304,6 +1264,7 @@ lookup_symbol_aux_psymtabs (int block_index, const char *name, return NULL; } +#if 0 /* Check for the possibility of the symbol being a function or a mangled variable that is stored in one of the minimal symbol tables. Eventually, all global symbols might be resolved in this @@ -1317,6 +1278,11 @@ lookup_symbol_aux_psymtabs (int block_index, const char *name, some additional conditions held as well, and it caused problems with HP-generated symbol tables. */ +/* NOTE: carlton/2003-05-14: This function was once used as part of + lookup_symbol. It is currently unnecessary for correctness + reasons, however, and using it doesn't seem to be any faster than + using lookup_symbol_aux_psymtabs, so I'm commenting it out. */ + static struct symbol * lookup_symbol_aux_minsyms (const char *name, const char *mangled_name, @@ -1417,21 +1383,12 @@ lookup_symbol_aux_minsyms (const char *name, *symtab = s; return fixup_symbol_section (sym, s->objfile); } - else if (MSYMBOL_TYPE (msymbol) != mst_text - && MSYMBOL_TYPE (msymbol) != mst_file_text - && !STREQ (name, DEPRECATED_SYMBOL_NAME (msymbol))) - { - /* This is a mangled variable, look it up by its - mangled name. */ - return lookup_symbol_aux (DEPRECATED_SYMBOL_NAME (msymbol), mangled_name, - NULL, domain, is_a_field_of_this, - symtab); - } } } return NULL; } +#endif /* 0 */ /* Look, in partial_symtab PST, for symbol whose natural name is NAME. If LINKAGE_NAME is non-NULL, check in addition that the symbol's -- 2.30.2