From b9c04fb2681dd5706d2cafa5dcc6bdcd99016cf4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 8 Oct 2017 12:11:18 -0600 Subject: [PATCH] Change search_symbols to return std::vector This changes search_symbols to return a std::vector, replacing the previous linked list approach. This allows the removal of some cleanups, as well as the use of std::sort and std::unique, saving some code and extra allocations in sort_search_symbols_remove_dups. Regression tested by the buildbot. gdb/ChangeLog 2017-10-08 Tom Tromey * symtab.c (free_search_symbols, do_free_search_symbols_cleanup) (make_cleanup_free_search_symbols): Remove. (search_symbols): Return std::vector. (symbol_search::compare_search_syms): Now member of symbol_search. Change arguments. (sort_search_symbols_remove_dups): Change arguments. Rewrite. (symtab_symbol_info, rbreak_command): Update. * symtab.h (struct symbol_search) : Remove. Add constructors. (symbol_search::operator<): New function. (symbol_search::operator==): New function. (search_symbols): Remove std::vector. (free_search_symbols, make_cleanup_free_search_symbols): Remove. (symbol_search::compare_search_syms): Declare. --- gdb/ChangeLog | 17 +++++ gdb/symtab.c | 204 +++++++++++--------------------------------------- gdb/symtab.h | 45 ++++++++--- 3 files changed, 98 insertions(+), 168 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 18224e0305e..511df166630 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +2017-10-08 Tom Tromey + + * symtab.c (free_search_symbols, do_free_search_symbols_cleanup) + (make_cleanup_free_search_symbols): Remove. + (search_symbols): Return std::vector. + (symbol_search::compare_search_syms): Now member of + symbol_search. Change arguments. + (sort_search_symbols_remove_dups): Change arguments. Rewrite. + (symtab_symbol_info, rbreak_command): Update. + * symtab.h (struct symbol_search) : Remove. + Add constructors. + (symbol_search::operator<): New function. + (symbol_search::operator==): New function. + (search_symbols): Remove std::vector. + (free_search_symbols, make_cleanup_free_search_symbols): Remove. + (symbol_search::compare_search_syms): Declare. + 2017-10-06 Yao Qi * Makefile.in (ALL_64_TARGET_OBS): Replace aarch64-insn.o with diff --git a/gdb/symtab.c b/gdb/symtab.c index 47385dfbbc3..16a6b2eb6f3 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -65,6 +65,7 @@ #include "common/gdb_optional.h" #include "filename-seen-cache.h" #include "arch-utils.h" +#include /* Forward declarations for local functions. */ @@ -4092,110 +4093,39 @@ file_matches (const char *file, const char *files[], int nfiles, int basenames) return 0; } -/* Free any memory associated with a search. */ - -void -free_search_symbols (struct symbol_search *symbols) -{ - struct symbol_search *p; - struct symbol_search *next; - - for (p = symbols; p != NULL; p = next) - { - next = p->next; - xfree (p); - } -} - -static void -do_free_search_symbols_cleanup (void *symbolsp) -{ - struct symbol_search *symbols = *(struct symbol_search **) symbolsp; - - free_search_symbols (symbols); -} - -struct cleanup * -make_cleanup_free_search_symbols (struct symbol_search **symbolsp) -{ - return make_cleanup (do_free_search_symbols_cleanup, symbolsp); -} - /* Helper function for sort_search_symbols_remove_dups and qsort. Can only sort symbols, not minimal symbols. */ -static int -compare_search_syms (const void *sa, const void *sb) +int +symbol_search::compare_search_syms (const symbol_search &sym_a, + const symbol_search &sym_b) { - struct symbol_search *sym_a = *(struct symbol_search **) sa; - struct symbol_search *sym_b = *(struct symbol_search **) sb; int c; - c = FILENAME_CMP (symbol_symtab (sym_a->symbol)->filename, - symbol_symtab (sym_b->symbol)->filename); + c = FILENAME_CMP (symbol_symtab (sym_a.symbol)->filename, + symbol_symtab (sym_b.symbol)->filename); if (c != 0) return c; - if (sym_a->block != sym_b->block) - return sym_a->block - sym_b->block; + if (sym_a.block != sym_b.block) + return sym_a.block - sym_b.block; - return strcmp (SYMBOL_PRINT_NAME (sym_a->symbol), - SYMBOL_PRINT_NAME (sym_b->symbol)); + return strcmp (SYMBOL_PRINT_NAME (sym_a.symbol), + SYMBOL_PRINT_NAME (sym_b.symbol)); } -/* Sort the NFOUND symbols in list FOUND and remove duplicates. - The duplicates are freed, and the new list is returned in - *NEW_HEAD, *NEW_TAIL. */ +/* Sort the symbols in RESULT and remove duplicates. */ static void -sort_search_symbols_remove_dups (struct symbol_search *found, int nfound, - struct symbol_search **new_head, - struct symbol_search **new_tail) +sort_search_symbols_remove_dups (std::vector *result) { - struct symbol_search **symbols, *symp; - int i, j, nunique; - - gdb_assert (found != NULL && nfound > 0); - - /* Build an array out of the list so we can easily sort them. */ - symbols = XNEWVEC (struct symbol_search *, nfound); - - symp = found; - for (i = 0; i < nfound; i++) - { - gdb_assert (symp != NULL); - gdb_assert (symp->block >= 0 && symp->block <= 1); - symbols[i] = symp; - symp = symp->next; - } - gdb_assert (symp == NULL); - - qsort (symbols, nfound, sizeof (struct symbol_search *), - compare_search_syms); - - /* Collapse out the dups. */ - for (i = 1, j = 1; i < nfound; ++i) - { - if (compare_search_syms (&symbols[j - 1], &symbols[i]) != 0) - symbols[j++] = symbols[i]; - else - xfree (symbols[i]); - } - nunique = j; - symbols[j - 1]->next = NULL; - - /* Rebuild the linked list. */ - for (i = 0; i < nunique - 1; i++) - symbols[i]->next = symbols[i + 1]; - symbols[nunique - 1]->next = NULL; - - *new_head = symbols[0]; - *new_tail = symbols[nunique - 1]; - xfree (symbols); + std::sort (result->begin (), result->end ()); + result->erase (std::unique (result->begin (), result->end ()), + result->end ()); } /* Search the symbol table for matches to the regular expression REGEXP, - returning the results in *MATCHES. + returning the results. Only symbols of KIND are searched: VARIABLES_DOMAIN - search all symbols, excluding functions, type names, @@ -4204,16 +4134,13 @@ sort_search_symbols_remove_dups (struct symbol_search *found, int nfound, TYPES_DOMAIN - search all type names ALL_DOMAIN - an internal error for this function - free_search_symbols should be called when *MATCHES is no longer needed. - Within each file the results are sorted locally; each symtab's global and static blocks are separately alphabetized. Duplicate entries are removed. */ -void +std::vector search_symbols (const char *regexp, enum search_domain kind, - int nfiles, const char *files[], - struct symbol_search **matches) + int nfiles, const char *files[]) { struct compunit_symtab *cust; const struct blockvector *bv; @@ -4236,9 +4163,7 @@ search_symbols (const char *regexp, enum search_domain kind, enum minimal_symbol_type ourtype2; enum minimal_symbol_type ourtype3; enum minimal_symbol_type ourtype4; - struct symbol_search *found; - struct symbol_search *tail; - int nfound; + std::vector result; gdb::optional preg; gdb_assert (kind <= TYPES_DOMAIN); @@ -4248,8 +4173,6 @@ search_symbols (const char *regexp, enum search_domain kind, ourtype3 = types3[kind]; ourtype4 = types4[kind]; - *matches = NULL; - if (regexp != NULL) { /* Make sure spacing is right for C++ operators. @@ -4357,11 +4280,6 @@ search_symbols (const char *regexp, enum search_domain kind, } } - found = NULL; - tail = NULL; - nfound = 0; - struct cleanup *retval_chain = make_cleanup_free_search_symbols (&found); - ALL_COMPUNITS (objfile, cust) { bv = COMPUNIT_BLOCKVECTOR (cust); @@ -4401,27 +4319,14 @@ search_symbols (const char *regexp, enum search_domain kind, && SYMBOL_CLASS (sym) == LOC_TYPEDEF)))) { /* match */ - struct symbol_search *psr = XCNEW (struct symbol_search); - - psr->block = i; - psr->symbol = sym; - psr->next = NULL; - if (tail == NULL) - found = psr; - else - tail->next = psr; - tail = psr; - nfound ++; + result.emplace_back (i, sym); } } } } - if (found != NULL) - { - sort_search_symbols_remove_dups (found, nfound, &found, &tail); - /* Note: nfound is no longer useful beyond this point. */ - } + if (!result.empty ()) + sort_search_symbols_remove_dups (&result); /* If there are no eyes, avoid all contact. I mean, if there are no debug symbols, then add matching minsyms. */ @@ -4454,17 +4359,7 @@ search_symbols (const char *regexp, enum search_domain kind, .symbol == NULL) { /* match */ - struct symbol_search *psr = XNEW (struct symbol_search); - psr->block = i; - psr->msymbol.minsym = msymbol; - psr->msymbol.objfile = objfile; - psr->symbol = NULL; - psr->next = NULL; - if (tail == NULL) - found = psr; - else - tail->next = psr; - tail = psr; + result.emplace_back (i, msymbol, objfile); } } } @@ -4472,8 +4367,7 @@ search_symbols (const char *regexp, enum search_domain kind, } } - discard_cleanups (retval_chain); - *matches = found; + return result; } /* Helper function for symtab_symbol_info, this function uses @@ -4546,17 +4440,13 @@ symtab_symbol_info (char *regexp, enum search_domain kind, int from_tty) { static const char * const classnames[] = {"variable", "function", "type"}; - struct symbol_search *symbols; - struct symbol_search *p; - struct cleanup *old_chain; const char *last_filename = NULL; int first = 1; gdb_assert (kind <= TYPES_DOMAIN); /* Must make sure that if we're interrupted, symbols gets freed. */ - search_symbols (regexp, kind, 0, NULL, &symbols); - old_chain = make_cleanup_free_search_symbols (&symbols); + std::vector symbols = search_symbols (regexp, kind, 0, NULL); if (regexp != NULL) printf_filtered (_("All %ss matching regular expression \"%s\":\n"), @@ -4564,31 +4454,29 @@ symtab_symbol_info (char *regexp, enum search_domain kind, int from_tty) else printf_filtered (_("All defined %ss:\n"), classnames[kind]); - for (p = symbols; p != NULL; p = p->next) + for (const symbol_search &p : symbols) { QUIT; - if (p->msymbol.minsym != NULL) + if (p.msymbol.minsym != NULL) { if (first) { printf_filtered (_("\nNon-debugging symbols:\n")); first = 0; } - print_msymbol_info (p->msymbol); + print_msymbol_info (p.msymbol); } else { print_symbol_info (kind, - p->symbol, - p->block, + p.symbol, + p.block, last_filename); last_filename - = symtab_to_filename_for_display (symbol_symtab (p->symbol)); + = symtab_to_filename_for_display (symbol_symtab (p.symbol)); } } - - do_cleanups (old_chain); } static void @@ -4629,8 +4517,6 @@ do_end_rbreak_breakpoints (void *ignore) static void rbreak_command (char *regexp, int from_tty) { - struct symbol_search *ss; - struct symbol_search *p; struct cleanup *old_chain; char *string = NULL; int len = 0; @@ -4660,21 +4546,21 @@ rbreak_command (char *regexp, int from_tty) } } - search_symbols (regexp, FUNCTIONS_DOMAIN, nfiles, files, &ss); - old_chain = make_cleanup_free_search_symbols (&ss); - make_cleanup (free_current_contents, &string); + std::vector symbols = search_symbols (regexp, + FUNCTIONS_DOMAIN, + nfiles, files); start_rbreak_breakpoints (); - make_cleanup (do_end_rbreak_breakpoints, NULL); - for (p = ss; p != NULL; p = p->next) + old_chain = make_cleanup (do_end_rbreak_breakpoints, NULL); + for (const symbol_search &p : symbols) { - if (p->msymbol.minsym == NULL) + if (p.msymbol.minsym == NULL) { - struct symtab *symtab = symbol_symtab (p->symbol); + struct symtab *symtab = symbol_symtab (p.symbol); const char *fullname = symtab_to_fullname (symtab); int newlen = (strlen (fullname) - + strlen (SYMBOL_LINKAGE_NAME (p->symbol)) + + strlen (SYMBOL_LINKAGE_NAME (p.symbol)) + 4); if (newlen > len) @@ -4684,17 +4570,17 @@ rbreak_command (char *regexp, int from_tty) } strcpy (string, fullname); strcat (string, ":'"); - strcat (string, SYMBOL_LINKAGE_NAME (p->symbol)); + strcat (string, SYMBOL_LINKAGE_NAME (p.symbol)); strcat (string, "'"); break_command (string, from_tty); print_symbol_info (FUNCTIONS_DOMAIN, - p->symbol, - p->block, + p.symbol, + p.block, symtab_to_filename_for_display (symtab)); } else { - int newlen = (strlen (MSYMBOL_LINKAGE_NAME (p->msymbol.minsym)) + 3); + int newlen = (strlen (MSYMBOL_LINKAGE_NAME (p.msymbol.minsym)) + 3); if (newlen > len) { @@ -4702,12 +4588,12 @@ rbreak_command (char *regexp, int from_tty) len = newlen; } strcpy (string, "'"); - strcat (string, MSYMBOL_LINKAGE_NAME (p->msymbol.minsym)); + strcat (string, MSYMBOL_LINKAGE_NAME (p.msymbol.minsym)); strcat (string, "'"); break_command (string, from_tty); printf_filtered (" %s;\n", - MSYMBOL_PRINT_NAME (p->msymbol.minsym)); + MSYMBOL_PRINT_NAME (p.msymbol.minsym)); } } diff --git a/gdb/symtab.h b/gdb/symtab.h index 8b429a8b65a..cd6dbaea480 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1561,10 +1561,37 @@ extern symbol *find_function_alias_target (bound_minimal_symbol msymbol); /* Note: struct symbol_search, search_symbols, et.al. are declared here, instead of making them local to symtab.c, for gdbtk's sake. */ -/* When using search_symbols, a list of the following structs is returned. - Callers must free the search list using free_search_symbols! */ +/* When using search_symbols, a vector of the following structs is + returned. */ struct symbol_search { + symbol_search (int block_, struct symbol *symbol_) + : block (block_), + symbol (symbol_) + { + msymbol.minsym = nullptr; + msymbol.objfile = nullptr; + } + + symbol_search (int block_, struct minimal_symbol *minsym, + struct objfile *objfile) + : block (block_), + symbol (nullptr) + { + msymbol.minsym = minsym; + msymbol.objfile = objfile; + } + + bool operator< (const symbol_search &other) const + { + return compare_search_syms (*this, other) < 0; + } + + bool operator== (const symbol_search &other) const + { + return compare_search_syms (*this, other) == 0; + } + /* The block in which the match was found. Could be, for example, STATIC_BLOCK or GLOBAL_BLOCK. */ int block; @@ -1578,15 +1605,15 @@ struct symbol_search which only minimal_symbols exist. */ struct bound_minimal_symbol msymbol; - /* A link to the next match, or NULL for the end. */ - struct symbol_search *next; +private: + + static int compare_search_syms (const symbol_search &sym_a, + const symbol_search &sym_b); }; -extern void search_symbols (const char *, enum search_domain, int, - const char **, struct symbol_search **); -extern void free_search_symbols (struct symbol_search *); -extern struct cleanup *make_cleanup_free_search_symbols (struct symbol_search - **); +extern std::vector search_symbols (const char *, + enum search_domain, int, + const char **); /* The name of the ``main'' function. FIXME: cagney/2001-03-20: Can't make main_name() const since some -- 2.30.2