espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-10 09:59:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

2002-02-10 Daniel Jacobowitz <drow@mvista.com>

Browse Source 
* symtab.c (compare_search_syms): New function.
        (sort_search_symbols): New function.
        (search_symbols): Sort symbols after searching rather than
        before.

2002-02-10  Daniel Jacobowitz  <drow@mvista.com>

        * generic/gdbtk-cmds.c (gdb_listfuncs): Don't call
        BLOCK_SHOULD_SORT.
        * library/browserwin.itb (BrowserWin::_fill_funcs_combo): Sort
        the output of gdb_listfuncs.
This commit is contained in:
Daniel Jacobowitz
2002-02-11 03:21:53 +00:00
parent 37b0ac0fc8
commit 434d2d4f74
2 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2002-02-10 Daniel Jacobowitz <drow@mvista.com>
* symtab.c (compare_search_syms): New function.
(sort_search_symbols): New function.
(search_symbols): Sort symbols after searching rather than
before.
2002-02-10 Andrew Cagney <ac131313@redhat.com> 2002-02-10 Andrew Cagney <ac131313@redhat.com>
* NEWS: Linux -> GNU/Linux. * NEWS: Linux -> GNU/Linux.

73
gdb/symtab.c
View File

@ -2406,6 +2406,52 @@ make_cleanup_free_search_symbols (struct symbol_search *symbols)
return make_cleanup (do_free_search_symbols_cleanup, symbols); return make_cleanup (do_free_search_symbols_cleanup, symbols);
} }
/* Helper function for sort_search_symbols and qsort. Can only
sort symbols, not minimal symbols. */
static int
compare_search_syms (const void *sa, const void *sb)
{
struct symbol_search **sym_a = (struct symbol_search **) sa;
struct symbol_search **sym_b = (struct symbol_search **) sb;
return strcmp (SYMBOL_SOURCE_NAME ((*sym_a)->symbol),
SYMBOL_SOURCE_NAME ((*sym_b)->symbol));
}
/* Sort the ``nfound'' symbols in the list after prevtail. Leave
prevtail where it is, but update its next pointer to point to
the first of the sorted symbols. */
static struct symbol_search *
sort_search_symbols (struct symbol_search *prevtail, int nfound)
{
struct symbol_search **symbols, *symp, *old_next;
int i;
symbols = (struct symbol_search **) xmalloc (sizeof (struct symbol_search *)
* nfound);
symp = prevtail->next;
for (i = 0; i < nfound; i++)
{
symbols[i] = symp;
symp = symp->next;
}
/* Generally NULL. */
old_next = symp;
qsort (symbols, nfound, sizeof (struct symbol_search *),
compare_search_syms);
symp = prevtail;
for (i = 0; i < nfound; i++)
{
symp->next = symbols[i];
symp = symp->next;
}
symp->next = old_next;
free (symbols);
return symp;
}
/* Search the symbol table for matches to the regular expression REGEXP, /* Search the symbol table for matches to the regular expression REGEXP,
returning the results in *MATCHES. returning the results in *MATCHES.
@ -2418,6 +2464,9 @@ make_cleanup_free_search_symbols (struct symbol_search *symbols)
and constants (enums) and constants (enums)
free_search_symbols should be called when *MATCHES is no longer needed. free_search_symbols should be called when *MATCHES is no longer needed.
The results are sorted locally; each symtab's global and static blocks are
separately alphabetized.
*/ */
void void
search_symbols (char *regexp, namespace_enum kind, int nfiles, char *files[], search_symbols (char *regexp, namespace_enum kind, int nfiles, char *files[],
@ -2607,10 +2656,9 @@ search_symbols (char *regexp, namespace_enum kind, int nfiles, char *files[],
if (bv != prev_bv) if (bv != prev_bv)
for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++) for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)
{ {
struct symbol_search *prevtail = tail;
int nfound = 0;
b = BLOCKVECTOR_BLOCK (bv, i); b = BLOCKVECTOR_BLOCK (bv, i);
/* Skip the sort if this block is always sorted. */
if (!BLOCK_SHOULD_SORT (b))
sort_block_syms (b);
for (j = 0; j < BLOCK_NSYMS (b); j++) for (j = 0; j < BLOCK_NSYMS (b); j++)
{ {
QUIT; QUIT;
@ -2632,15 +2680,28 @@ search_symbols (char *regexp, namespace_enum kind, int nfiles, char *files[],
psr->msymbol = NULL; psr->msymbol = NULL;
psr->next = NULL; psr->next = NULL;
if (tail == NULL) if (tail == NULL)
{
sr = psr; sr = psr;
old_chain = make_cleanup_free_search_symbols (sr);
}
else else
tail->next = psr; tail->next = psr;
tail = psr; tail = psr;
nfound ++;
} }
} }
if (nfound > 0)
{
if (prevtail == NULL)
{
struct symbol_search dummy;
dummy.next = sr;
tail = sort_search_symbols (&dummy, nfound);
sr = dummy.next;
old_chain = make_cleanup_free_search_symbols (sr);
}
else
tail = sort_search_symbols (prevtail, nfound);
}
} }
prev_bv = bv; prev_bv = bv;
} }