symtab.h (struct symbol_search) <symtab>: Delete, unnecessary.
gdb/ChangeLog: * symtab.h (struct symbol_search) <symtab>: Delete. All uses updated. * symtab.c (compare_search_syms): Use SYMBOL_SYMTAB accessor. (print_symbol_info): Delete arg symtab. All callers updated. (symtab_symbol_info): Use SYMBOL_SYMTAB accessor.
This commit is contained in:
parent
64f0601bb4
commit
d01060f023
|
@ -1,3 +1,10 @@
|
||||||
|
2014-12-16 Doug Evans <xdje42@gmail.com>
|
||||||
|
|
||||||
|
* symtab.h (struct symbol_search) <symtab>: Delete. All uses updated.
|
||||||
|
* symtab.c (compare_search_syms): Use SYMBOL_SYMTAB accessor.
|
||||||
|
(print_symbol_info): Delete arg symtab. All callers updated.
|
||||||
|
(symtab_symbol_info): Use SYMBOL_SYMTAB accessor.
|
||||||
|
|
||||||
2014-12-16 Andreas Arnez <arnez@vnet.linux.ibm.com>
|
2014-12-16 Andreas Arnez <arnez@vnet.linux.ibm.com>
|
||||||
|
|
||||||
* user-regs.c (maintenance_print_user_registers): Swap "Nr" and
|
* user-regs.c (maintenance_print_user_registers): Swap "Nr" and
|
||||||
|
|
18
gdb/symtab.c
18
gdb/symtab.c
|
@ -3406,7 +3406,8 @@ compare_search_syms (const void *sa, const void *sb)
|
||||||
struct symbol_search *sym_b = *(struct symbol_search **) sb;
|
struct symbol_search *sym_b = *(struct symbol_search **) sb;
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
c = FILENAME_CMP (sym_a->symtab->filename, sym_b->symtab->filename);
|
c = FILENAME_CMP (SYMBOL_SYMTAB (sym_a->symbol)->filename,
|
||||||
|
SYMBOL_SYMTAB (sym_b->symbol)->filename);
|
||||||
if (c != 0)
|
if (c != 0)
|
||||||
return c;
|
return c;
|
||||||
|
|
||||||
|
@ -3722,7 +3723,6 @@ search_symbols (const char *regexp, enum search_domain kind,
|
||||||
struct symbol_search *psr = (struct symbol_search *)
|
struct symbol_search *psr = (struct symbol_search *)
|
||||||
xmalloc (sizeof (struct symbol_search));
|
xmalloc (sizeof (struct symbol_search));
|
||||||
psr->block = i;
|
psr->block = i;
|
||||||
psr->symtab = real_symtab;
|
|
||||||
psr->symbol = sym;
|
psr->symbol = sym;
|
||||||
memset (&psr->msymbol, 0, sizeof (psr->msymbol));
|
memset (&psr->msymbol, 0, sizeof (psr->msymbol));
|
||||||
psr->next = NULL;
|
psr->next = NULL;
|
||||||
|
@ -3780,7 +3780,6 @@ search_symbols (const char *regexp, enum search_domain kind,
|
||||||
psr->block = i;
|
psr->block = i;
|
||||||
psr->msymbol.minsym = msymbol;
|
psr->msymbol.minsym = msymbol;
|
||||||
psr->msymbol.objfile = objfile;
|
psr->msymbol.objfile = objfile;
|
||||||
psr->symtab = NULL;
|
|
||||||
psr->symbol = NULL;
|
psr->symbol = NULL;
|
||||||
psr->next = NULL;
|
psr->next = NULL;
|
||||||
if (tail == NULL)
|
if (tail == NULL)
|
||||||
|
@ -3806,9 +3805,10 @@ search_symbols (const char *regexp, enum search_domain kind,
|
||||||
|
|
||||||
static void
|
static void
|
||||||
print_symbol_info (enum search_domain kind,
|
print_symbol_info (enum search_domain kind,
|
||||||
struct symtab *s, struct symbol *sym,
|
struct symbol *sym,
|
||||||
int block, const char *last)
|
int block, const char *last)
|
||||||
{
|
{
|
||||||
|
struct symtab *s = SYMBOL_SYMTAB (sym);
|
||||||
const char *s_filename = symtab_to_filename_for_display (s);
|
const char *s_filename = symtab_to_filename_for_display (s);
|
||||||
|
|
||||||
if (last == NULL || filename_cmp (last, s_filename) != 0)
|
if (last == NULL || filename_cmp (last, s_filename) != 0)
|
||||||
|
@ -3903,11 +3903,11 @@ symtab_symbol_info (char *regexp, enum search_domain kind, int from_tty)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print_symbol_info (kind,
|
print_symbol_info (kind,
|
||||||
p->symtab,
|
|
||||||
p->symbol,
|
p->symbol,
|
||||||
p->block,
|
p->block,
|
||||||
last_filename);
|
last_filename);
|
||||||
last_filename = symtab_to_filename_for_display (p->symtab);
|
last_filename
|
||||||
|
= symtab_to_filename_for_display (SYMBOL_SYMTAB (p->symbol));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3993,7 +3993,8 @@ rbreak_command (char *regexp, int from_tty)
|
||||||
{
|
{
|
||||||
if (p->msymbol.minsym == NULL)
|
if (p->msymbol.minsym == NULL)
|
||||||
{
|
{
|
||||||
const char *fullname = symtab_to_fullname (p->symtab);
|
struct symtab *symtab = SYMBOL_SYMTAB (p->symbol);
|
||||||
|
const char *fullname = symtab_to_fullname (symtab);
|
||||||
|
|
||||||
int newlen = (strlen (fullname)
|
int newlen = (strlen (fullname)
|
||||||
+ strlen (SYMBOL_LINKAGE_NAME (p->symbol))
|
+ strlen (SYMBOL_LINKAGE_NAME (p->symbol))
|
||||||
|
@ -4010,10 +4011,9 @@ rbreak_command (char *regexp, int from_tty)
|
||||||
strcat (string, "'");
|
strcat (string, "'");
|
||||||
break_command (string, from_tty);
|
break_command (string, from_tty);
|
||||||
print_symbol_info (FUNCTIONS_DOMAIN,
|
print_symbol_info (FUNCTIONS_DOMAIN,
|
||||||
p->symtab,
|
|
||||||
p->symbol,
|
p->symbol,
|
||||||
p->block,
|
p->block,
|
||||||
symtab_to_filename_for_display (p->symtab));
|
symtab_to_filename_for_display (symtab));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1457,9 +1457,7 @@ struct symbol_search
|
||||||
|
|
||||||
/* Information describing what was found.
|
/* Information describing what was found.
|
||||||
|
|
||||||
If symtab and symbol are NOT NULL, then information was found
|
If symbol is NOT NULL, then information was found for this match. */
|
||||||
for this match. */
|
|
||||||
struct symtab *symtab;
|
|
||||||
struct symbol *symbol;
|
struct symbol *symbol;
|
||||||
|
|
||||||
/* If msymbol is non-null, then a match was made on something for
|
/* If msymbol is non-null, then a match was made on something for
|
||||||
|
|
Loading…
Reference in New Issue