[hackers] [scc] [cc1] Add prtree() || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Sat, 4 Feb 2017 17:27:22 +0100 (CET)

commit 95b9b266a3ac7b75b955dedebde0df75640978ee
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
AuthorDate: Sat Feb 4 17:26:27 2017 +0100
Commit: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
CommitDate: Sat Feb 4 17:26:27 2017 +0100

    [cc1] Add prtree()
    
    This functon is intended for debugging process and print the
    tree passed as parameter to stderr.

diff --git a/cc1/cc1.h b/cc1/cc1.h
index 22c5c11..b3975d9 100644
--- a/cc1/cc1.h
+++ b/cc1/cc1.h
_AT_@ -410,6 +410,7 @@ extern int setloc(char *fname, unsigned line);
 #define accept(t) ((yytoken == (t)) ? next() : 0)
 
 /* code.c */
+extern void prtree(Node *np);
 extern void emit(unsigned, void *);
 extern Node *node(unsigned op, Type *tp, Node *left, Node *rigth);
 extern Node *varnode(Symbol *sym);
diff --git a/cc1/code.c b/cc1/code.c
index f4ef599..8f9b0fc 100644
--- a/cc1/code.c
+++ b/cc1/code.c
_AT_@ -137,6 +137,8 @@ void (*opcode[])(unsigned, void *) = {
         [OTYP] = emittype,
 };
 
+static FILE *outfp = stdout;
+
 void
 freetree(Node *np)
 {
_AT_@ -155,6 +157,16 @@ emitnode(Node *np)
 }
 
 void
+prtree(Node *np)
+{
+ outfp = stderr;
+ fputs("DBG prtree", outfp);
+ emitnode(np);
+ putc('\n', outfp);
+ outfp = stdout;
+}
+
+void
 emit(unsigned op, void *arg)
 {
         extern int failure;
_AT_@ -184,7 +196,7 @@ emitvar(Symbol *sym)
                 c = 'X';
         else
                 c = 'A';
- printf("%c%u", c, sym->id);
+ fprintf(outfp, "%c%u", c, sym->id);
 }
 
 static void
_AT_@ -199,9 +211,10 @@ emitconst(Node *np)
         case INT:
         case ENUM:
                 u = (tp->prop & TSIGNED) ? (TUINT) sym->u.i : sym->u.u;
- printf("#%c%llX",
- np->type->letter,
- (long long) sym->u.i & ones(tp->size));
+ fprintf(outfp,
+ "#%c%llX",
+ np->type->letter,
+ (long long) sym->u.i & ones(tp->size));
                 break;
         default:
                 abort();
_AT_@ -220,7 +233,7 @@ emitsym(unsigned op, void *arg)
                  * and it means that we will have two '\t'
                  * for the first element
                  */
- putchar('\t');
+ putc('\t', outfp);
         }
         (np->flags & NCONST) ? emitconst(np) : emitvar(np->sym);
 }
_AT_@ -228,12 +241,12 @@ emitsym(unsigned op, void *arg)
 static void
 emitletter(Type *tp)
 {
- putchar(tp->letter);
+ putc(tp->letter, outfp);
         switch (tp->op) {
         case ARY:
         case STRUCT:
         case UNION:
- printf("%u", tp->id);
+ fprintf(outfp, "%u", tp->id);
         }
 }
 
_AT_@ -251,16 +264,18 @@ emittype(unsigned op, void *arg)
         switch (tp->op) {
         case ARY:
                 emitletter(tp);
- putchar('\t');
+ putc('\t', outfp);
                 emitletter(tp->type);
- printf("\t#%c%llX\n",
- sizettype->letter, (long long) tp->n.elem);
+ fprintf(outfp,
+ "\t#%c%llX\n",
+ sizettype->letter, (long long) tp->n.elem);
                 return;
         case UNION:
         case STRUCT:
                 emitletter(tp);
                 tag = tp->tag->name;
- printf("\t\"%s\t#%c%lX\t#%c%X\n",
+ fprintf(outfp,
+ "\t\"%s\t#%c%lX\t#%c%X\n",
                        (tag) ? tag : "",
                        sizettype->letter,
                        tp->size,
_AT_@ -292,14 +307,15 @@ emitstring(Symbol *sym, Type *tp)
                 while (isprint(*bp) && bp < lim)
                         ++bp;
                 if ((n = bp - s) > 1)
- printf("\t#\"%.*s\n", n, s);
+ fprintf(outfp, "\t#\"%.*s\n", n, s);
                 else
                         bp = s;
                 if (bp == lim)
                         break;
                 do {
- printf("\t#%c%02X\n",
- chartype->letter, (*bp++) & 0xFF);
+ fprintf(outfp,
+ "\t#%c%02X\n",
+ chartype->letter, (*bp++) & 0xFF);
                 } while (!isprint(*bp) && bp < lim);
         }
 }
_AT_@ -362,9 +378,9 @@ emitinit(unsigned op, void *arg)
 {
         Node *np = arg;
 
- puts("\t(");
+ fputs("\t(\n", outfp);
         emitdesig(np, np->type);
- puts(")");
+ fputs(")\n", outfp);
 }
 
 static void
_AT_@ -375,18 +391,18 @@ emitdcl(unsigned op, void *arg)
         if (sym->flags & SEMITTED)
                 return;
         emitvar(sym);
- putchar('\t');
+ putc('\t', outfp);
         if (sym->type->op == FTN) {
                 emitletter(sym->type->type);
- putchar('\t');
+ putc('\t', outfp);
         }
         emitletter(sym->type);
- printf("\t\"%s", (sym->name) ? sym->name : "");
+ fprintf(outfp, "\t\"%s", (sym->name) ? sym->name : "");
         if (sym->flags & SFIELD)
- printf("\t#%c%llX", sizettype->letter, sym->u.i);
+ fprintf(outfp, "\t#%c%llX", sizettype->letter, sym->u.i);
         sym->flags |= SEMITTED;
         if ((sym->flags & SHASINIT) == 0)
- putchar('\n');
+ putc('\n', outfp);
 }
 
 static void
_AT_@ -396,7 +412,7 @@ emitcast(unsigned op, void *arg)
 
         emitnode(lp);
         if (np->type != voidtype)
- printf("\tg%c", np->type->letter);
+ fprintf(outfp, "\tg%c", np->type->letter);
 }
 
 static void
_AT_@ -408,7 +424,7 @@ emitbin(unsigned op, void *arg)
         emitnode(np->left);
         emitnode(np->right);
         if ((s = optxt[op]) != NULL) { /* do not print in OCOLON case */
- printf("\t%s", optxt[op]);
+ fprintf(outfp, "\t%s", optxt[op]);
                 emitletter(np->type);
         }
 }
_AT_@ -419,7 +435,7 @@ emitexp(unsigned op, void *arg)
         Node *np = arg;
 
         emitnode(np);
- putchar('\n');
+ putc('\n', outfp);
         freetree(np);
 }
 
_AT_@ -429,11 +445,11 @@ emitfun(unsigned op, void *arg)
         Symbol *sym = arg, **sp;
 
         emitdcl(op, arg);
- puts("{");
+ fputs("{\n", outfp);
 
         for (sp = sym->u.pars; sp && *sp; ++sp)
                 emit(ODECL, *sp);
- puts("\\");
+ fputs("\\\n", outfp);
         free(sym->u.pars);
         sym->u.pars = NULL;
 }
_AT_@ -441,14 +457,14 @@ emitfun(unsigned op, void *arg)
 static void
 emittext(unsigned op, void *arg)
 {
- fputs(optxt[op], stdout);
+ fputs(optxt[op], outfp);
 }
 
 static void
 emitsymid(unsigned op, void *arg)
 {
         Symbol *sym = arg;
- printf(optxt[op], sym->id);
+ fprintf(outfp, optxt[op], sym->id);
 }
 
 Node *
Received on Sat Feb 04 2017 - 17:27:22 CET