diff options
| author | Karel Kočí <cynerd@email.cz> | 2015-05-02 13:29:49 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2015-05-02 13:29:49 +0200 |
| commit | e6cd8a42dd9d0be35e9d12a9d6feb329f1ed88a9 (patch) | |
| tree | 680b20ad5ccff070a702ab222bbb0ee78f1f5bc9 | |
| parent | 34daa4c1cb99ed66c974336f23269cb508f71c74 (diff) | |
| download | linux-conf-perf-e6cd8a42dd9d0be35e9d12a9d6feb329f1ed88a9.tar.gz linux-conf-perf-e6cd8a42dd9d0be35e9d12a9d6feb329f1ed88a9.tar.bz2 linux-conf-perf-e6cd8a42dd9d0be35e9d12a9d6feb329f1ed88a9.zip | |
parse_kconfig fix problems with generated rules to be UNSAT
| -rw-r--r-- | scripts/parse_kconfig/boolexpr.c | 16 | ||||
| -rw-r--r-- | scripts/parse_kconfig/output.c | 1 | ||||
| -rw-r--r-- | scripts/parse_kconfig/output.h | 1 | ||||
| -rw-r--r-- | scripts/parse_kconfig/symlist.c | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/scripts/parse_kconfig/boolexpr.c b/scripts/parse_kconfig/boolexpr.c index ccd7cef..4ce4154 100644 --- a/scripts/parse_kconfig/boolexpr.c +++ b/scripts/parse_kconfig/boolexpr.c @@ -113,11 +113,17 @@ struct boolexpr *boolexpr_sym(struct symlist *sl, struct symbol *sym) { struct boolexpr *rtn; rtn = malloc(sizeof(struct boolexpr)); rtn->overusage = 0; - rtn->id = symlist_id(sl, sym->name); - if (rtn->id != 0) - rtn->type = BT_SYM; - else - rtn->type = BT_FALSE; + if (!strcmp(sym->name, "m") || !strcmp(sym->name, "n")) { + rtn->type = BT_FALSE; + } else if (!strcmp(sym->name, "y")) { + rtn->type = BT_TRUE; + } else { + rtn->id = symlist_id(sl, sym->name); + if (rtn->id != 0) + rtn->type = BT_SYM; + else + rtn->type = BT_FALSE; + } return rtn; } diff --git a/scripts/parse_kconfig/output.c b/scripts/parse_kconfig/output.c index 47442ce..81debaf 100644 --- a/scripts/parse_kconfig/output.c +++ b/scripts/parse_kconfig/output.c @@ -30,6 +30,7 @@ void output_rules_endterm(void) { fprintf(frules, "\n"); } +// Functions for variable_count void output_write_variable_count(char *var_file, int count) { FILE *f; f = fopen(var_file, "w"); diff --git a/scripts/parse_kconfig/output.h b/scripts/parse_kconfig/output.h index de8f672..2950f7a 100644 --- a/scripts/parse_kconfig/output.h +++ b/scripts/parse_kconfig/output.h @@ -20,4 +20,5 @@ void output_rules_endterm(void); // Functions for variable_count void output_write_variable_count(char *var_file, int count); + #endif /* _OUTPUT_H_ */ diff --git a/scripts/parse_kconfig/symlist.c b/scripts/parse_kconfig/symlist.c index 62cdd6c..d38dde1 100644 --- a/scripts/parse_kconfig/symlist.c +++ b/scripts/parse_kconfig/symlist.c @@ -26,7 +26,7 @@ void symlist_add(struct symlist *sl, char *name) { } void symlist_closesym(struct symlist *sl) { - sl->lastsym = (unsigned) sl->pos; + sl->lastsym = (unsigned) sl->pos + 1; } unsigned symlist_adddummy(struct symlist *sl) { |