diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2014-12-05 19:39:12 +0100 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2014-12-05 19:39:12 +0100 |
| commit | 6c1c7be347154e17a8cf723395bb616d4f3258ed (patch) | |
| tree | 46a4d50c1022c078f11e0a6c384bf7e7e71667ad | |
| parent | efad9b6a7ad68e3e85dd28a12b567f84d6860d17 (diff) | |
| download | gdb-6c1c7be347154e17a8cf723395bb616d4f3258ed.zip gdb-6c1c7be347154e17a8cf723395bb616d4f3258ed.tar.gz gdb-6c1c7be347154e17a8cf723395bb616d4f3258ed.tar.bz2 | |
Unify lookup_symbol_in_objfile_symtabs
That's right, block_lookup_symbol_primary()'s additional requirement over
block_lookup_symbol() is:
Function is useful if one iterates all global/static blocks of an
objfile.
Which is satisfied both in lookup_symbol_in_objfile_symtabs() and in
lookup_global_symbol_from_objfile() thanks to their's ALL_OBJFILE_COMPUNITS.
In fact after reverting that ba715d7fe49c8a59660fbd571b935b29eb7cfbdb above
the lines of code were exactly the same.
So instead of accelerating both lookup_symbol_in_objfile_symtabs() and
lookup_global_symbol_from_objfile() I just accelerated
lookup_symbol_in_objfile_symtabs() and I am proposing to reuse
lookup_symbol_in_objfile_symtabs() in lookup_global_symbol_from_objfile()
instead. In fact such unification would already save some lines of code even
before the checked-in acceleration patch above.
gdb/ChangeLog
2014-12-05 Jan Kratochvil <jan.kratochvil@redhat.com>
* symtab.c (lookup_symbol_in_objfile_symtabs): New declaration.
(lookup_global_symbol_from_objfile): Call it.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/symtab.c | 27 |
2 files changed, 15 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b010c81..83e649e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2014-12-05 Jan Kratochvil <jan.kratochvil@redhat.com> + * symtab.c (lookup_symbol_in_objfile_symtabs): New declaration. + (lookup_global_symbol_from_objfile): Call it. + +2014-12-05 Jan Kratochvil <jan.kratochvil@redhat.com> + Remove const from struct objfile *. * solib-darwin.c, solib-spu.c, solib-svr4.c, solib.c, solist.h, symtab.c, symtab.h: In these files. diff --git a/gdb/symtab.c b/gdb/symtab.c index c697b1b..c07b902 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -79,6 +79,11 @@ struct symbol *lookup_local_symbol (const char *name, const domain_enum domain, enum language language); +static struct symbol * + lookup_symbol_in_objfile_symtabs (struct objfile *objfile, + int block_index, const char *name, + const domain_enum domain); + static struct symbol *lookup_symbol_via_quick_fns (struct objfile *objfile, int block_index, @@ -1546,24 +1551,12 @@ lookup_global_symbol_from_objfile (struct objfile *main_objfile, objfile; objfile = objfile_separate_debug_iterate (main_objfile, objfile)) { - struct compunit_symtab *cust; struct symbol *sym; - - /* Go through symtabs. */ - ALL_OBJFILE_COMPUNITS (objfile, cust) - { - const struct blockvector *bv; - const struct block *block; - - bv = COMPUNIT_BLOCKVECTOR (cust); - block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); - sym = block_lookup_symbol (block, name, domain); - if (sym) - { - block_found = block; - return fixup_symbol_section (sym, objfile); - } - } + + sym = lookup_symbol_in_objfile_symtabs (objfile, GLOBAL_BLOCK, name, + domain); + if (sym != NULL) + return sym; sym = lookup_symbol_via_quick_fns (objfile, GLOBAL_BLOCK, name, domain); if (sym) |