Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 01762c4ec5f6f62c550304b9c70e824293cefdd0

Authored by Michal Marek
1 parent 68eb8563a1
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

genksyms: simplify usage of find_symbol() 

Allow searching for symbols of an exact type. The lexer does this and a
subsequent patch will add one more usage.

Signed-off-by: Michal Marek <mmarek@suse.cz>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

Showing 4 changed files with 9 additions and 9 deletions Side-by-side Diff

scripts/genksyms/genksyms.c
Diff comments   View file @ 01762c4
... ... @@ -156,7 +156,7 @@
156 156 return t;
157 157 }
158 158  
159   -struct symbol *find_symbol(const char *name, enum symbol_type ns)
  159 +struct symbol *find_symbol(const char *name, enum symbol_type ns, int exact)
160 160 {
161 161 unsigned long h = crc32(name) % HASH_BUCKETS;
162 162 struct symbol *sym;
... ... @@ -167,6 +167,8 @@
167 167 sym->is_declared)
168 168 break;
169 169  
  170 + if (exact && sym && sym->type != ns)
  171 + return NULL;
170 172 return sym;
171 173 }
172 174  
... ... @@ -511,7 +513,7 @@
511 513 break;
512 514  
513 515 case SYM_TYPEDEF:
514   - subsym = find_symbol(cur->string, cur->tag);
  516 + subsym = find_symbol(cur->string, cur->tag, 0);
515 517 /* FIXME: Bad reference files can segfault here. */
516 518 if (subsym->expansion_trail) {
517 519 if (flag_dump_defs)
... ... @@ -528,7 +530,7 @@
528 530 case SYM_STRUCT:
529 531 case SYM_UNION:
530 532 case SYM_ENUM:
531   - subsym = find_symbol(cur->string, cur->tag);
  533 + subsym = find_symbol(cur->string, cur->tag, 0);
532 534 if (!subsym) {
533 535 struct string_list *n;
534 536  
... ... @@ -582,7 +584,7 @@
582 584 {
583 585 struct symbol *sym;
584 586  
585   - sym = find_symbol(name, SYM_NORMAL);
  587 + sym = find_symbol(name, SYM_NORMAL, 0);
586 588 if (!sym)
587 589 error_with_pos("export undefined symbol %s", name);
588 590 else {
scripts/genksyms/genksyms.h
Diff comments   View file @ 01762c4
... ... @@ -58,7 +58,7 @@
58 58 extern int cur_line;
59 59 extern char *cur_filename;
60 60  
61   -struct symbol *find_symbol(const char *name, enum symbol_type ns);
  61 +struct symbol *find_symbol(const char *name, enum symbol_type ns, int exact);
62 62 struct symbol *add_symbol(const char *name, enum symbol_type type,
63 63 struct string_list *defn, int is_extern);
64 64 void export_symbol(const char *);
scripts/genksyms/lex.c_shipped
Diff comments   View file @ 01762c4
... ... @@ -2347,8 +2347,7 @@
2347 2347 }
2348 2348 if (!suppress_type_lookup)
2349 2349 {
2350   - struct symbol *sym = find_symbol(yytext, SYM_TYPEDEF);
2351   - if (sym && sym->type == SYM_TYPEDEF)
  2350 + if (find_symbol(yytext, SYM_TYPEDEF, 1))
2352 2351 token = TYPE;
2353 2352 }
2354 2353 }
scripts/genksyms/lex.l
Diff comments   View file @ 01762c4
... ... @@ -193,8 +193,7 @@
193 193 }
194 194 if (!suppress_type_lookup)
195 195 {
196   - struct symbol *sym = find_symbol(yytext, SYM_TYPEDEF);
197   - if (sym && sym->type == SYM_TYPEDEF)
  196 + if (find_symbol(yytext, SYM_TYPEDEF, 1))
198 197 token = TYPE;
199 198 }
200 199 }