genksyms: Simplify printing of symbol types
Instead of special-casing SYM_NORMAL, do not map any name to it. Also explicitly set the single-letter name of the symbol type, which will be needed by a further patch. The only user-visible change is one debug printf. Signed-off-by: Michal Marek <mmarek@suse.cz> Acked-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Родитель
95f1d639ad
Коммит
7ec8eda154
|
@ -53,8 +53,15 @@ static int nsyms;
|
|||
static struct symbol *expansion_trail;
|
||||
static struct symbol *visited_symbols;
|
||||
|
||||
static const char *const symbol_type_name[] = {
|
||||
"normal", "typedef", "enum", "struct", "union"
|
||||
static const struct {
|
||||
int n;
|
||||
const char *name;
|
||||
} symbol_types[] = {
|
||||
[SYM_NORMAL] = { 0, NULL},
|
||||
[SYM_TYPEDEF] = {'t', "typedef"},
|
||||
[SYM_ENUM] = {'e', "enum"},
|
||||
[SYM_STRUCT] = {'s', "struct"},
|
||||
[SYM_UNION] = {'u', "union"},
|
||||
};
|
||||
|
||||
static int equal_list(struct string_list *a, struct string_list *b);
|
||||
|
@ -247,8 +254,12 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,
|
|||
sym->is_override = 0;
|
||||
|
||||
if (flag_debug) {
|
||||
fprintf(debugfile, "Defn for %s %s == <",
|
||||
symbol_type_name[type], name);
|
||||
if (symbol_types[type].name)
|
||||
fprintf(debugfile, "Defn for %s %s == <",
|
||||
symbol_types[type].name, name);
|
||||
else
|
||||
fprintf(debugfile, "Defn for type%d %s == <",
|
||||
type, name);
|
||||
if (is_extern)
|
||||
fputs("extern ", debugfile);
|
||||
print_list(debugfile, defn);
|
||||
|
@ -346,8 +357,8 @@ static struct string_list *read_node(FILE *f)
|
|||
if (node.string[1] == '#') {
|
||||
int n;
|
||||
|
||||
for (n = 0; n < ARRAY_SIZE(symbol_type_name); n++) {
|
||||
if (node.string[0] == symbol_type_name[n][0]) {
|
||||
for (n = 0; n < ARRAY_SIZE(symbol_types); n++) {
|
||||
if (node.string[0] == symbol_types[n].n) {
|
||||
node.tag = n;
|
||||
node.string += 2;
|
||||
return copy_node(&node);
|
||||
|
@ -397,8 +408,8 @@ static void read_reference(FILE *f)
|
|||
|
||||
static void print_node(FILE * f, struct string_list *list)
|
||||
{
|
||||
if (list->tag != SYM_NORMAL) {
|
||||
putc(symbol_type_name[list->tag][0], f);
|
||||
if (symbol_types[list->tag].n) {
|
||||
putc(symbol_types[list->tag].n, f);
|
||||
putc('#', f);
|
||||
}
|
||||
fputs(list->string, f);
|
||||
|
@ -491,11 +502,11 @@ static unsigned long expand_and_crc_sym(struct symbol *sym, unsigned long crc)
|
|||
struct string_list *n, *t = NULL;
|
||||
|
||||
error_with_pos("expand undefined %s %s",
|
||||
symbol_type_name[cur->tag],
|
||||
symbol_types[cur->tag].name,
|
||||
cur->string);
|
||||
|
||||
n = xmalloc(sizeof(*n));
|
||||
n->string = xstrdup(symbol_type_name[cur->tag]);
|
||||
n->string = xstrdup(symbol_types[cur->tag].name);
|
||||
n->tag = SYM_NORMAL;
|
||||
n->next = t;
|
||||
t = n;
|
||||
|
@ -530,11 +541,11 @@ static unsigned long expand_and_crc_sym(struct symbol *sym, unsigned long crc)
|
|||
if (subsym->expansion_trail) {
|
||||
if (flag_dump_defs) {
|
||||
fprintf(debugfile, "%s %s ",
|
||||
symbol_type_name[cur->tag],
|
||||
symbol_types[cur->tag].name,
|
||||
cur->string);
|
||||
}
|
||||
|
||||
crc = partial_crc32(symbol_type_name[cur->tag],
|
||||
crc = partial_crc32(symbol_types[cur->tag].name,
|
||||
crc);
|
||||
crc = partial_crc32_one(' ', crc);
|
||||
crc = partial_crc32(cur->string, crc);
|
||||
|
@ -624,8 +635,8 @@ static void print_location(void)
|
|||
|
||||
static void print_type_name(enum symbol_type type, const char *name)
|
||||
{
|
||||
if (type != SYM_NORMAL)
|
||||
fprintf(stderr, "%s %s", symbol_type_name[type], name);
|
||||
if (symbol_types[type].name)
|
||||
fprintf(stderr, "%s %s", symbol_types[type].name, name);
|
||||
else
|
||||
fprintf(stderr, "%s", name);
|
||||
}
|
||||
|
@ -771,8 +782,8 @@ int main(int argc, char **argv)
|
|||
|
||||
if (sym->is_override)
|
||||
fputs("override ", dumpfile);
|
||||
if (sym->type != SYM_NORMAL) {
|
||||
putc(symbol_type_name[sym->type][0], dumpfile);
|
||||
if (symbol_types[sym->type].n) {
|
||||
putc(symbol_types[sym->type].n, dumpfile);
|
||||
putc('#', dumpfile);
|
||||
}
|
||||
fputs(sym->name, dumpfile);
|
||||
|
|
Загрузка…
Ссылка в новой задаче