rename debug 'W', in some swt.c, to debug 'K' to allow its reuse remove unused sextern function from all compilers Reference: /n/sources/patch/applied/cc-swt-newdebug Date: Mon Mar 4 09:46:25 CET 2013 Signed-off-by: charles.forsyth@gmail.com --- /sys/src/cmd/5c/swt.c Mon Mar 4 09:44:50 2013 +++ /sys/src/cmd/5c/swt.c Mon Mar 4 09:44:47 2013 @@ -25,7 +25,7 @@ } if(nc < 5) { for(i=0; ival); gopcode(OEQ, nodconst(q->val), n, Z); patch(p, q->label); @@ -38,7 +38,7 @@ i = nc / 2; r = q+i; - if(debug['W']) + if(debug['K']) print("case > %.8llux\n", r->val); gopcode(OGT, nodconst(r->val), n, Z); sp = p; @@ -46,7 +46,7 @@ patch(p, r->label); swit2(q, i, def, n, tn); - if(debug['W']) + if(debug['K']) print("case < %.8llux\n", r->val); patch(sp, pc); swit2(r+1, nc-i-1, def, n, tn); @@ -59,7 +59,7 @@ gopcode(OCASE, nodconst((q+nc-1)->val - v), n, Z); patch(p, def); for(i=0; ival); while(q->val != v) { nextpc(); @@ -266,23 +266,6 @@ } p += 2; goto loop; -} - -void -sextern(Sym *s, Node *a, long o, long w) -{ - long e, lw; - - for(e=0; efrom.offset += o+e; - p->reg = lw; - p->to.type = D_SCONST; - memmove(p->to.sval, a->cstring+e, lw); - } } void --- /sys/src/cmd/6c/swt.c Mon Mar 4 09:44:54 2013 +++ /sys/src/cmd/6c/swt.c Mon Mar 4 09:44:52 2013 @@ -9,7 +9,7 @@ if(nc < 5) { for(i=0; ival); gcmp(OEQ, n, q->val); patch(p, q->label); @@ -21,7 +21,7 @@ } i = nc / 2; r = q+i; - if(debug['W']) + if(debug['K']) print("case > %.8llux\n", r->val); gcmp(OGT, n, r->val); sp = p; @@ -30,7 +30,7 @@ patch(p, r->label); swit1(q, i, def, n); - if(debug['W']) + if(debug['K']) print("case < %.8llux\n", r->val); patch(sp, pc); swit1(r+1, nc-i-1, def, n); @@ -125,23 +125,6 @@ n--; } return r; -} - -void -sextern(Sym *s, Node *a, long o, long w) -{ - long e, lw; - - for(e=0; efrom.offset += o+e; - p->from.scale = lw; - p->to.type = D_SCONST; - memmove(p->to.sval, a->cstring+e, lw); - } } void --- /sys/src/cmd/8c/swt.c Mon Mar 4 09:45:00 2013 +++ /sys/src/cmd/8c/swt.c Mon Mar 4 09:44:57 2013 @@ -9,7 +9,7 @@ if(nc < 5) { for(i=0; ival); gopcode(OEQ, n->type, n, nodconst(q->val)); patch(p, q->label); @@ -21,7 +21,7 @@ } i = nc / 2; r = q+i; - if(debug['W']) + if(debug['K']) print("case > %.8llux\n", r->val); gopcode(OGT, n->type, n, nodconst(r->val)); sp = p; @@ -30,7 +30,7 @@ patch(p, r->label); swit1(q, i, def, n); - if(debug['W']) + if(debug['K']) print("case < %.8llux\n", r->val); patch(sp, pc); swit1(r+1, nc-i-1, def, n); @@ -125,23 +125,6 @@ n--; } return r; -} - -void -sextern(Sym *s, Node *a, long o, long w) -{ - long e, lw; - - for(e=0; efrom.offset += o+e; - p->from.scale = lw; - p->to.type = D_SCONST; - memmove(p->to.sval, a->cstring+e, lw); - } } void --- /sys/src/cmd/kc/swt.c Mon Mar 4 09:45:05 2013 +++ /sys/src/cmd/kc/swt.c Mon Mar 4 09:45:02 2013 @@ -236,23 +236,6 @@ } void -sextern(Sym *s, Node *a, long o, long w) -{ - long e, lw; - - for(e=0; efrom.offset += o+e; - p->reg = lw; - p->to.type = D_SCONST; - memmove(p->to.sval, a->cstring+e, lw); - } -} - -void gextern(Sym *s, Node *a, long o, long w) { if(a->op == OCONST && typev[a->type->etype]) { --- /sys/src/cmd/qc/swt.c Mon Mar 4 09:45:10 2013 +++ /sys/src/cmd/qc/swt.c Mon Mar 4 09:45:08 2013 @@ -240,23 +240,6 @@ } void -sextern(Sym *s, Node *a, long o, long w) -{ - long e, lw; - - for(e=0; efrom.offset += o+e; - p->reg = lw; - p->to.type = D_SCONST; - memmove(p->to.sval, a->cstring+e, lw); - } -} - -void gextern(Sym *s, Node *a, long o, long w) { if(a->op == OCONST && typev[a->type->etype]) { --- /sys/src/cmd/vc/swt.c Mon Mar 4 09:45:16 2013 +++ /sys/src/cmd/vc/swt.c Mon Mar 4 09:45:14 2013 @@ -19,7 +19,7 @@ if(nc < 5) { for(i=0; ival); gmove(nodconst(q->val), tn); gopcode(OEQ, n, tn, Z); @@ -32,7 +32,7 @@ } i = nc / 2; r = q+i; - if(debug['W']) + if(debug['K']) print("case > %.8llux\n", r->val); gmove(nodconst(r->val), tn); gopcode(OLT, tn, n, Z); @@ -41,7 +41,7 @@ patch(p, r->label); swit2(q, i, def, n, tn); - if(debug['W']) + if(debug['K']) print("case < %.8llux\n", r->val); patch(sp, pc); swit2(r+1, nc-i-1, def, n, tn); @@ -231,23 +231,6 @@ } p += 2; goto loop; -} - -void -sextern(Sym *s, Node *a, long o, long w) -{ - long e, lw; - - for(e=0; efrom.offset += o+e; - p->reg = lw; - p->to.type = D_SCONST; - memmove(p->to.sval, a->cstring+e, lw); - } } void --- /sys/src/cmd/5c/gc.h Mon Mar 4 09:45:20 2013 +++ /sys/src/cmd/5c/gc.h Mon Mar 4 09:45:18 2013 @@ -276,7 +276,6 @@ int mulcon(Node*, Node*); Multab* mulcon0(long); void nullwarn(Node*, Node*); -void sextern(Sym*, Node*, long, long); void gextern(Sym*, Node*, long, long); void outcode(void); void ieeedtod(Ieee*, double); --- /sys/src/cmd/6c/gc.h Mon Mar 4 09:45:24 2013 +++ /sys/src/cmd/6c/gc.h Mon Mar 4 09:45:22 2013 @@ -278,7 +278,6 @@ void bitstore(Node*, Node*, Node*, Node*, Node*); long outstring(char*, long); void nullwarn(Node*, Node*); -void sextern(Sym*, Node*, long, long); void gextern(Sym*, Node*, long, long); void outcode(void); void ieeedtod(Ieee*, double); --- /sys/src/cmd/8c/gc.h Mon Mar 4 09:45:28 2013 +++ /sys/src/cmd/8c/gc.h Mon Mar 4 09:45:26 2013 @@ -275,7 +275,6 @@ void bitstore(Node*, Node*, Node*, Node*, Node*); long outstring(char*, long); void nullwarn(Node*, Node*); -void sextern(Sym*, Node*, long, long); void gextern(Sym*, Node*, long, long); void outcode(void); void ieeedtod(Ieee*, double); --- /sys/src/cmd/kc/gc.h Mon Mar 4 09:45:33 2013 +++ /sys/src/cmd/kc/gc.h Mon Mar 4 09:45:31 2013 @@ -267,7 +267,6 @@ Multab* mulcon0(Node*, long); int mulcon1(Node*, long, Node*); void nullwarn(Node*, Node*); -void sextern(Sym*, Node*, long, long); void gextern(Sym*, Node*, long, long); void outcode(void); void ieeedtod(Ieee*, double); --- /sys/src/cmd/qc/gc.h Mon Mar 4 09:45:38 2013 +++ /sys/src/cmd/qc/gc.h Mon Mar 4 09:45:36 2013 @@ -283,7 +283,6 @@ Multab* mulcon0(Node*, long); int mulcon1(Node*, long, Node*); void nullwarn(Node*, Node*); -void sextern(Sym*, Node*, long, long); void gextern(Sym*, Node*, long, long); void outcode(void); void ieeedtod(Ieee*, double); --- /sys/src/cmd/vc/gc.h Mon Mar 4 09:45:43 2013 +++ /sys/src/cmd/vc/gc.h Mon Mar 4 09:45:41 2013 @@ -267,7 +267,6 @@ int mulcon(Node*, Node*); Multab* mulcon0(long); void nullwarn(Node*, Node*); -void sextern(Sym*, Node*, long, long); void gextern(Sym*, Node*, long, long); void outcode(void); void ieeedtod(Ieee*, double); --- /sys/src/cmd/cc/cc.h Mon Mar 4 09:45:47 2013 +++ /sys/src/cmd/cc/cc.h Mon Mar 4 09:45:44 2013 @@ -741,7 +741,6 @@ void ginit(void); long outstring(char*, long); long outlstring(ushort*, long); -void sextern(Sym*, Node*, long, long); void xcom(Node*); long exreg(Type*); long align(long, Type*, int);