From dbccfd4c96f245e61996e0f32370e4697569205a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 20 Mar 2013 18:28:48 +0000 Subject: [PATCH] * psymtab.c (find_pc_sect_psymbol, fixup_psymbol_section) (print_partial_symbols, recursively_search_psymtabs): Use PSYMBOL_CLASS. --- gdb/ChangeLog | 6 ++++++ gdb/psymtab.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 01cefe710f0..7493a3372a7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-03-20 Tom Tromey + + * psymtab.c (find_pc_sect_psymbol, fixup_psymbol_section) + (print_partial_symbols, recursively_search_psymtabs): Use + PSYMBOL_CLASS. + 2013-03-20 Pierre Muller * contrib/ari/gdb_ari.sh (OP eol rule): Also check diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 7b118c5360a..de8a3ccd736 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -420,7 +420,7 @@ find_pc_sect_psymbol (struct objfile *objfile, { p = *pp; if (SYMBOL_DOMAIN (p) == VAR_DOMAIN - && SYMBOL_CLASS (p) == LOC_BLOCK + && PSYMBOL_CLASS (p) == LOC_BLOCK && pc >= SYMBOL_VALUE_ADDRESS (p) && (SYMBOL_VALUE_ADDRESS (p) > best_pc || (psymtab->textlow == 0 @@ -444,7 +444,7 @@ find_pc_sect_psymbol (struct objfile *objfile, { p = *pp; if (SYMBOL_DOMAIN (p) == VAR_DOMAIN - && SYMBOL_CLASS (p) == LOC_BLOCK + && PSYMBOL_CLASS (p) == LOC_BLOCK && pc >= SYMBOL_VALUE_ADDRESS (p) && (SYMBOL_VALUE_ADDRESS (p) > best_pc || (psymtab->textlow == 0 @@ -474,7 +474,7 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile) gdb_assert (objfile); - switch (SYMBOL_CLASS (psym)) + switch (PSYMBOL_CLASS (psym)) { case LOC_STATIC: case LOC_LABEL: @@ -890,7 +890,7 @@ print_partial_symbols (struct gdbarch *gdbarch, fputs_filtered (", ", outfile); break; } - switch (SYMBOL_CLASS (*p)) + switch (PSYMBOL_CLASS (*p)) { case LOC_UNDEF: fputs_filtered ("undefined", outfile); @@ -1343,12 +1343,12 @@ recursively_search_psymtabs (struct partial_symtab *ps, if ((kind == ALL_DOMAIN || (kind == VARIABLES_DOMAIN - && SYMBOL_CLASS (*psym) != LOC_TYPEDEF - && SYMBOL_CLASS (*psym) != LOC_BLOCK) + && PSYMBOL_CLASS (*psym) != LOC_TYPEDEF + && PSYMBOL_CLASS (*psym) != LOC_BLOCK) || (kind == FUNCTIONS_DOMAIN - && SYMBOL_CLASS (*psym) == LOC_BLOCK) + && PSYMBOL_CLASS (*psym) == LOC_BLOCK) || (kind == TYPES_DOMAIN - && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)) + && PSYMBOL_CLASS (*psym) == LOC_TYPEDEF)) && (*name_matcher) (SYMBOL_SEARCH_NAME (*psym), data)) { /* Found a match, so notify our caller. */ -- 2.30.2