GNU Binutils with patches for OS216
Revision | c3b3386770ff4320a582d292a6077d83533b86ad (tree) |
---|---|
Zeit | 2018-01-10 02:15:44 |
Autor | Pedro Alves <palves@redh...> |
Commiter | Pedro Alves |
language_get_symbol_name_matcher -> get_symbol_name_matcher
@@ -631,7 +631,7 @@ iter_match_first_hashed (const struct dictionary *dict, | ||
631 | 631 | unsigned int hash_index = (name.search_name_hash (lang->la_language) |
632 | 632 | % DICT_HASHED_NBUCKETS (dict)); |
633 | 633 | symbol_name_matcher_ftype *matches_name |
634 | - = language_get_symbol_name_matcher (lang, name); | |
634 | + = get_symbol_name_matcher (lang, name); | |
635 | 635 | struct symbol *sym; |
636 | 636 | |
637 | 637 | DICT_ITERATOR_DICT (iterator) = dict; |
@@ -659,7 +659,7 @@ iter_match_next_hashed (const lookup_name_info &name, | ||
659 | 659 | { |
660 | 660 | const language_defn *lang = DICT_LANGUAGE (DICT_ITERATOR_DICT (iterator)); |
661 | 661 | symbol_name_matcher_ftype *matches_name |
662 | - = language_get_symbol_name_matcher (lang, name); | |
662 | + = get_symbol_name_matcher (lang, name); | |
663 | 663 | struct symbol *next; |
664 | 664 | |
665 | 665 | for (next = DICT_ITERATOR_CURRENT (iterator)->hash_next; |
@@ -875,7 +875,7 @@ iter_match_next_linear (const lookup_name_info &name, | ||
875 | 875 | const struct dictionary *dict = DICT_ITERATOR_DICT (iterator); |
876 | 876 | const language_defn *lang = DICT_LANGUAGE (dict); |
877 | 877 | symbol_name_matcher_ftype *matches_name |
878 | - = language_get_symbol_name_matcher (lang, name); | |
878 | + = get_symbol_name_matcher (lang, name); | |
879 | 879 | |
880 | 880 | int i, nsyms = DICT_LINEAR_NSYMS (dict); |
881 | 881 | struct symbol *sym, *retval = NULL; |
@@ -4530,7 +4530,7 @@ gdb_index_symbol_name_matcher::gdb_index_symbol_name_matcher | ||
4530 | 4530 | { |
4531 | 4531 | const language_defn *lang = language_def ((enum language) i); |
4532 | 4532 | symbol_name_matcher_ftype *name_matcher |
4533 | - = language_get_symbol_name_matcher (lang, m_lookup_name); | |
4533 | + = get_symbol_name_matcher (lang, m_lookup_name); | |
4534 | 4534 | |
4535 | 4535 | /* Don't insert the same comparison routine more than once. |
4536 | 4536 | Note that we do this linear walk instead of a seemingly |
@@ -727,8 +727,8 @@ default_symbol_name_matcher (const char *symbol_search_name, | ||
727 | 727 | /* See language.h. */ |
728 | 728 | |
729 | 729 | symbol_name_matcher_ftype * |
730 | -language_get_symbol_name_matcher (const language_defn *lang, | |
731 | - const lookup_name_info &lookup_name) | |
730 | +get_symbol_name_matcher (const language_defn *lang, | |
731 | + const lookup_name_info &lookup_name) | |
732 | 732 | { |
733 | 733 | /* If currently in Ada mode, and the lookup name is wrapped in |
734 | 734 | '<...>', hijack all symbol name comparisons using the Ada |
@@ -637,7 +637,7 @@ extern bool default_symbol_name_matcher | ||
637 | 637 | the function may ignore it depending on the current language and |
638 | 638 | LOOKUP_NAME. Specifically, if the current language is Ada, this |
639 | 639 | may return an Ada matcher regardless of LANG. */ |
640 | -symbol_name_matcher_ftype *language_get_symbol_name_matcher | |
640 | +symbol_name_matcher_ftype *get_symbol_name_matcher | |
641 | 641 | (const language_defn *lang, const lookup_name_info &lookup_name); |
642 | 642 | |
643 | 643 | /* The languages supported by GDB. */ |
@@ -1226,7 +1226,7 @@ find_methods (struct type *t, enum language t_lang, const char *name, | ||
1226 | 1226 | int method_counter; |
1227 | 1227 | lookup_name_info lookup_name (name, symbol_name_match_type::FULL); |
1228 | 1228 | symbol_name_matcher_ftype *symbol_name_compare |
1229 | - = language_get_symbol_name_matcher (language_def (t_lang), lookup_name); | |
1229 | + = get_symbol_name_matcher (language_def (t_lang), lookup_name); | |
1230 | 1230 | |
1231 | 1231 | t = check_typedef (t); |
1232 | 1232 |
@@ -359,8 +359,8 @@ lookup_minimal_symbol (const char *name, const char *sfile, | ||
359 | 359 | % MINIMAL_SYMBOL_HASH_SIZE); |
360 | 360 | |
361 | 361 | symbol_name_matcher_ftype *match |
362 | - = language_get_symbol_name_matcher (language_def (lang), | |
363 | - lookup_name); | |
362 | + = get_symbol_name_matcher (language_def (lang), | |
363 | + lookup_name); | |
364 | 364 | struct minimal_symbol **msymbol_demangled_hash |
365 | 365 | = objfile->per_bfd->msymbol_demangled_hash; |
366 | 366 |
@@ -501,7 +501,7 @@ iterate_over_minimal_symbols (struct objfile *objf, | ||
501 | 501 | { |
502 | 502 | const language_defn *lang_def = language_def (lang); |
503 | 503 | symbol_name_matcher_ftype *name_match |
504 | - = language_get_symbol_name_matcher (lang_def, lookup_name); | |
504 | + = get_symbol_name_matcher (lang_def, lookup_name); | |
505 | 505 | |
506 | 506 | unsigned int hash |
507 | 507 | = lookup_name.search_name_hash (lang) % MINIMAL_SYMBOL_HASH_SIZE; |
@@ -556,7 +556,7 @@ psymbol_name_matches (partial_symbol *psym, | ||
556 | 556 | { |
557 | 557 | const language_defn *lang = language_def (SYMBOL_LANGUAGE (psym)); |
558 | 558 | symbol_name_matcher_ftype *name_match |
559 | - = language_get_symbol_name_matcher (lang, lookup_name); | |
559 | + = get_symbol_name_matcher (lang, lookup_name); | |
560 | 560 | return name_match (SYMBOL_SEARCH_NAME (psym), lookup_name, NULL); |
561 | 561 | } |
562 | 562 |
@@ -955,8 +955,7 @@ symbol_matches_search_name (const struct general_symbol_info *gsymbol, | ||
955 | 955 | const lookup_name_info &name) |
956 | 956 | { |
957 | 957 | symbol_name_matcher_ftype *name_match |
958 | - = language_get_symbol_name_matcher (language_def (gsymbol->language), | |
959 | - name); | |
958 | + = get_symbol_name_matcher (language_def (gsymbol->language), name); | |
960 | 959 | return name_match (symbol_search_name (gsymbol), name, NULL); |
961 | 960 | } |
962 | 961 |
@@ -4707,7 +4706,7 @@ compare_symbol_name (const char *symbol_name, language symbol_language, | ||
4707 | 4706 | const language_defn *lang = language_def (symbol_language); |
4708 | 4707 | |
4709 | 4708 | symbol_name_matcher_ftype *name_match |
4710 | - = language_get_symbol_name_matcher (lang, lookup_name); | |
4709 | + = get_symbol_name_matcher (lang, lookup_name); | |
4711 | 4710 | |
4712 | 4711 | return name_match (symbol_name, lookup_name, &match_res); |
4713 | 4712 | } |