[PATCH] config: disable debug prints

From: Roman Zippel <zippel@linux-m68k.org>

This disables some debug prints, which are more confusing than helpful for
normal users.

diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 3f15ae859a5b291a657a8b2f00a6325250378710..10f45232b4c716df8a301fd6c75f0f547b3018bc 100644 (file)
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -10,6 +10,8 @@
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 
+#define DEBUG_EXPR     0
+
 struct expr *expr_alloc_symbol(struct symbol *sym)
 {
        struct expr *e = malloc(sizeof(*e));
@@ -220,10 +222,12 @@ int expr_eq(struct expr *e1, struct expr *e2)
                /* panic */;
        }
 
-       print_expr(0, e1, 0);
-       printf(" = ");
-       print_expr(0, e2, 0);
-       printf(" ?\n");
+       if (DEBUG_EXPR) {
+               expr_fprint(e1, stdout);
+               printf(" = ");
+               expr_fprint(e2, stdout);
+               printf(" ?\n");
+       }
 
        return 0;
 }
@@ -397,11 +401,13 @@ struct expr *expr_join_or(struct expr *e1, struct expr *e2)
                        return expr_alloc_symbol(&symbol_yes);
        }
 
-       printf("optimize ");
-       print_expr(0, e1, 0);
-       printf(" || ");
-       print_expr(0, e2, 0);
-       printf(" ?\n");
+       if (DEBUG_EXPR) {
+               printf("optimize (");
+               expr_fprint(e1, stdout);
+               printf(") || (");
+               expr_fprint(e2, stdout);
+               printf(")?\n");
+       }
        return NULL;
 }
 
@@ -444,6 +450,11 @@ struct expr *expr_join_and(struct expr *e1, struct expr *e2)
                // (a) && (a!='n') -> (a)
                return expr_alloc_symbol(sym1);
 
+       if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) ||
+           (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod))
+               // (a) && (a!='m') -> (a='y')
+               return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
        if (sym1->type == S_TRISTATE) {
                if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) {
                        // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
@@ -483,11 +494,14 @@ struct expr *expr_join_and(struct expr *e1, struct expr *e2)
                    (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_yes))
                        return NULL;
        }
-       printf("optimize ");
-       print_expr(0, e1, 0);
-       printf(" && ");
-       print_expr(0, e2, 0);
-       printf(" ?\n");
+
+       if (DEBUG_EXPR) {
+               printf("optimize (");
+               expr_fprint(e1, stdout);
+               printf(") && (");
+               expr_fprint(e2, stdout);
+               printf(")?\n");
+       }
        return NULL;
 }
 
@@ -1073,11 +1087,3 @@ void expr_fprint(struct expr *e, FILE *out)
 {
        expr_print(e, expr_print_file_helper, out, E_NONE);
 }
-
-void print_expr(int mask, struct expr *e, int prevtoken)
-{
-       if (!(cdebug & mask))
-               return;
-       expr_fprint(e, stdout);
-}
-

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index cc616f1f835d860a7110d20d87db724f0e23f289..cac51f6a86e843caede25601a350f8d619260605 100644 (file)
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -174,7 +174,6 @@ void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, s
 struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym);
 
 void expr_fprint(struct expr *e, FILE *out);
-void print_expr(int mask, struct expr *e, int prevtoken);
 
 static inline int expr_is_yes(struct expr *e)
 {