From 8dc772902914c8eadda3ebde4d9203e1d8634839 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 21 May 2026 16:47:38 +0000 Subject: [PATCH] *c: rename local variable 'true' to 'cond' throughout cgen.c/txt.c With _Bool support added to kencc, 'true' is now a keyword (C23 boolean constant, value 1). Using 'true' as a local variable or parameter name in cgen.c/txt.c/cgen64.c causes syntax errors when those files are compiled by the new DWARF-enabled 6c. Affected files: 1c 2c 5c 6c 7c 8c 9c kc qc vc cgen.c, 5c 7c txt.c, 8c cgen64.c. https://claude.ai/code/session_01WGAwvvTwDg2yknFkmZ3qzs --- sys/src/cmd/1c/cgen.c | 34 ++++++++++++++--------------- sys/src/cmd/2c/cgen.c | 34 ++++++++++++++--------------- sys/src/cmd/5c/cgen.c | 42 ++++++++++++++++++------------------ sys/src/cmd/5c/txt.c | 12 +++++------ sys/src/cmd/6c/cgen.c | 34 ++++++++++++++--------------- sys/src/cmd/7c/cgen.c | 42 ++++++++++++++++++------------------ sys/src/cmd/7c/txt.c | 12 +++++------ sys/src/cmd/8c/cgen.c | 38 ++++++++++++++++---------------- sys/src/cmd/8c/cgen64.c | 44 ++++++++++++++++++------------------- sys/src/cmd/9c/cgen.c | 34 ++++++++++++++--------------- sys/src/cmd/kc/cgen.c | 34 ++++++++++++++--------------- sys/src/cmd/qc/cgen.c | 48 ++++++++++++++++++++--------------------- sys/src/cmd/vc/cgen.c | 36 +++++++++++++++---------------- 13 files changed, 222 insertions(+), 222 deletions(-) diff --git a/sys/src/cmd/1c/cgen.c b/sys/src/cmd/1c/cgen.c index 002c06b53..f3c3b2c37 100644 --- a/sys/src/cmd/1c/cgen.c +++ b/sys/src/cmd/1c/cgen.c @@ -945,14 +945,14 @@ lcgen(Node *n, int result, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { - boolgen(n, true, D_NONE, Z, Z); + boolgen(n, cond, D_NONE, Z, Z); } void -boolgen(Node *n, int true, int result, Node *nn, Node *post) +boolgen(Node *n, int cond, int result, Node *nn, Node *post) { Prog *p1, *p2; Node *l, *r; @@ -985,7 +985,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) case OCONST: fp = vconst(n); - if(!true) + if(!cond) fp = !fp; gbranch(OGOTO); if(fp) { @@ -996,7 +996,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) goto com; case ONOT: - boolgen(l, !true, result, nn, post); + boolgen(l, !cond, result, nn, post); break; case OCOND: @@ -1006,7 +1006,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) inargs++; doinc(r->left, PRE); - boolgen(r->left, true, result, nn, r->left); + boolgen(r->left, cond, result, nn, r->left); if(result != D_NONE) { doinc(r->left, POST); gbranch(OGOTO); @@ -1014,7 +1014,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) p1 = p; doinc(r->right, PRE); - boolgen(r->right, !true, result, nn, r->right); + boolgen(r->right, !cond, result, nn, r->right); doinc(r->right, POST); patch(p1, pc); inargs--; @@ -1026,7 +1026,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) p1 = p; doinc(r->right, PRE); - boolgen(r->right, !true, result, nn, r->right); + boolgen(r->right, !cond, result, nn, r->right); patch(p2, pc); p2 = p; if(doinc(post, POST|TEST)) { @@ -1043,16 +1043,16 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: doinc(l, PRE); - boolgen(l, true, D_NONE, Z, l); + boolgen(l, cond, D_NONE, Z, l); p1 = p; inargs++; doinc(r, PRE); - boolgen(r, !true, D_NONE, Z, r); + boolgen(r, !cond, D_NONE, Z, r); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -1061,16 +1061,16 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: doinc(l, PRE); - boolgen(l, !true, D_NONE, Z, l); + boolgen(l, !cond, D_NONE, Z, l); p1 = p; inargs++; doinc(r, PRE); - boolgen(r, !true, D_NONE, Z, r); + boolgen(r, !cond, D_NONE, Z, r); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -1082,10 +1082,10 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) case ONE: if(vconst(l) == 0) { if(n->op == ONE) { - boolgen(r, true, result, nn, post); + boolgen(r, cond, result, nn, post); break; } - boolgen(r, !true, result, nn, post); + boolgen(r, !cond, result, nn, post); break; } @@ -1143,7 +1143,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) regfree(rg); genbool: - if(true) + if(cond) o = comrel[relindex(o)]; if(doinc(post, POST|TEST)) { lg = regalloc(types[TSHORT], D_NONE); diff --git a/sys/src/cmd/2c/cgen.c b/sys/src/cmd/2c/cgen.c index e3d08c746..b59fcbf57 100644 --- a/sys/src/cmd/2c/cgen.c +++ b/sys/src/cmd/2c/cgen.c @@ -953,14 +953,14 @@ lcgen(Node *n, int result, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { - boolgen(n, true, D_NONE, Z, Z); + boolgen(n, cond, D_NONE, Z, Z); } void -boolgen(Node *n, int true, int result, Node *nn, Node *post) +boolgen(Node *n, int cond, int result, Node *nn, Node *post) { Prog *p1, *p2; Node *l, *r; @@ -993,7 +993,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) case OCONST: fp = vconst(n); - if(!true) + if(!cond) fp = !fp; gbranch(OGOTO); if(fp) { @@ -1004,7 +1004,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) goto com; case ONOT: - boolgen(l, !true, result, nn, post); + boolgen(l, !cond, result, nn, post); break; case OCOND: @@ -1014,7 +1014,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) inargs++; doinc(r->left, PRE); - boolgen(r->left, true, result, nn, r->left); + boolgen(r->left, cond, result, nn, r->left); if(result != D_NONE) { doinc(r->left, POST); gbranch(OGOTO); @@ -1022,7 +1022,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) p1 = p; doinc(r->right, PRE); - boolgen(r->right, !true, result, nn, r->right); + boolgen(r->right, !cond, result, nn, r->right); doinc(r->right, POST); patch(p1, pc); inargs--; @@ -1034,7 +1034,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) p1 = p; doinc(r->right, PRE); - boolgen(r->right, !true, result, nn, r->right); + boolgen(r->right, !cond, result, nn, r->right); patch(p2, pc); p2 = p; if(doinc(post, POST|TEST)) { @@ -1051,16 +1051,16 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: doinc(l, PRE); - boolgen(l, true, D_NONE, Z, l); + boolgen(l, cond, D_NONE, Z, l); p1 = p; inargs++; doinc(r, PRE); - boolgen(r, !true, D_NONE, Z, r); + boolgen(r, !cond, D_NONE, Z, r); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -1069,16 +1069,16 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: doinc(l, PRE); - boolgen(l, !true, D_NONE, Z, l); + boolgen(l, !cond, D_NONE, Z, l); p1 = p; inargs++; doinc(r, PRE); - boolgen(r, !true, D_NONE, Z, r); + boolgen(r, !cond, D_NONE, Z, r); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -1090,10 +1090,10 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) case ONE: if(vconst(l) == 0) { if(n->op == ONE) { - boolgen(r, true, result, nn, post); + boolgen(r, cond, result, nn, post); break; } - boolgen(r, !true, result, nn, post); + boolgen(r, !cond, result, nn, post); break; } @@ -1151,7 +1151,7 @@ boolgen(Node *n, int true, int result, Node *nn, Node *post) regfree(rg); genbool: - if(true) + if(cond) o = comrel[relindex(o)]; if(doinc(post, POST|TEST)) { lg = regalloc(types[TSHORT], D_NONE); diff --git a/sys/src/cmd/5c/cgen.c b/sys/src/cmd/5c/cgen.c index 106531415..e5fed7713 100644 --- a/sys/src/cmd/5c/cgen.c +++ b/sys/src/cmd/5c/cgen.c @@ -722,17 +722,17 @@ lcgen(Node *n, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { if(n->type == T) gbranch(OGOTO); else - boolgen(n, true, Z); + boolgen(n, cond, Z); } void -boolgen(Node *n, int true, Node *nn) +boolgen(Node *n, int cond, Node *nn) { int o; Prog *p1, *p2; @@ -752,12 +752,12 @@ boolgen(Node *n, int true, Node *nn) regalloc(&nod, n, nn); cgen(n, &nod); o = ONE; - if(true) + if(cond) o = comrel[relindex(o)]; if(typefd[n->type->etype]){ regalloc(&nod1, n, Z); gmove(nodfconst(0.0), &nod1); - gopcode(true ? o | BTRUE : o, &nod1, &nod, Z); + gopcode(cond ? o | BTRUE : o, &nod1, &nod, Z); regfree(&nod1); }else gopcode(o, nodconst(0), &nod, Z); @@ -766,7 +766,7 @@ boolgen(Node *n, int true, Node *nn) case OCONST: o = vconst(n); - if(!true) + if(!cond) o = !o; gbranch(OGOTO); if(o) { @@ -778,22 +778,22 @@ boolgen(Node *n, int true, Node *nn) case OCOMMA: cgen(l, Z); - boolgen(r, true, nn); + boolgen(r, cond, nn); break; case ONOT: - boolgen(l, !true, nn); + boolgen(l, !cond, nn); break; case OCOND: bcgen(l, 1); p1 = p; - bcgen(r->left, true); + bcgen(r->left, cond); p2 = p; gbranch(OGOTO); patch(p1, pc); p1 = p; - bcgen(r->right, !true); + bcgen(r->right, !cond); patch(p2, pc); p2 = p; gbranch(OGOTO); @@ -802,13 +802,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: - bcgen(l, true); + bcgen(l, cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -816,13 +816,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: - bcgen(l, !true); + bcgen(l, !cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -840,7 +840,7 @@ boolgen(Node *n, int true, Node *nn) case OLO: case OLS: o = n->op; - if(true) + if(cond) o = comrel[relindex(o)]; if(l->complex >= FNX && r->complex >= FNX) { regret(&nod, r); @@ -850,21 +850,21 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); nod = *n; nod.right = &nod1; - boolgen(&nod, true, nn); + boolgen(&nod, cond, nn); break; } if(sconst(l)) { regalloc(&nod, r, nn); cgenrel(r, &nod, 1); o = invrel[relindex(o)]; - gopcode(true ? o | BTRUE : o, l, &nod, Z); + gopcode(cond ? o | BTRUE : o, l, &nod, Z); regfree(&nod); goto com; } if(sconst(r)) { regalloc(&nod, l, nn); cgenrel(l, &nod, 1); - gopcode(true ? o | BTRUE : o, r, &nod, Z); + gopcode(cond ? o | BTRUE : o, r, &nod, Z); regfree(&nod); goto com; } @@ -879,7 +879,7 @@ boolgen(Node *n, int true, Node *nn) regalloc(&nod1, l, Z); cgenrel(l, &nod1, 1); } - gopcode(true ? o | BTRUE : o, &nod, &nod1, Z); + gopcode(cond ? o | BTRUE : o, &nod, &nod1, Z); regfree(&nod); regfree(&nod1); diff --git a/sys/src/cmd/5c/txt.c b/sys/src/cmd/5c/txt.c index a327d9ce1..38945ea06 100644 --- a/sys/src/cmd/5c/txt.c +++ b/sys/src/cmd/5c/txt.c @@ -991,13 +991,13 @@ gins(int a, Node *f, Node *t) void gopcode(int o, Node *f1, Node *f2, Node *t) { - int a, et, true; + int a, et, cond; Adr ta; et = TLONG; if(f1 != Z && f1->type != T) et = f1->type->etype; - true = o & BTRUE; + cond = o & BTRUE; o &= ~BTRUE; a = AGOK; switch(o) { @@ -1147,22 +1147,22 @@ gopcode(int o, Node *f1, Node *f2, Node *t) case OLT: a = ABLT; /* ensure NaN comparison is always false */ - if(typefd[et] && !true) + if(typefd[et] && !cond) a = ABMI; break; case OLE: a = ABLE; - if(typefd[et] && !true) + if(typefd[et] && !cond) a = ABLS; break; case OGE: a = ABGE; - if(typefd[et] && true) + if(typefd[et] && cond) a = ABPL; break; case OGT: a = ABGT; - if(typefd[et] && true) + if(typefd[et] && cond) a = ABHI; break; case OLO: diff --git a/sys/src/cmd/6c/cgen.c b/sys/src/cmd/6c/cgen.c index 427e68c08..60f0381b9 100644 --- a/sys/src/cmd/6c/cgen.c +++ b/sys/src/cmd/6c/cgen.c @@ -1223,17 +1223,17 @@ lcgen(Node *n, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { if(n->type == T) gbranch(OGOTO); else - boolgen(n, true, Z); + boolgen(n, cond, Z); } void -boolgen(Node *n, int true, Node *nn) +boolgen(Node *n, int cond, Node *nn) { int o; Prog *p1, *p2; @@ -1251,7 +1251,7 @@ boolgen(Node *n, int true, Node *nn) default: o = ONE; - if(true) + if(cond) o = OEQ; /* bad, 13 is address of external that becomes constant */ if(n->addable >= INDEXED && n->addable != 13) { @@ -1278,7 +1278,7 @@ boolgen(Node *n, int true, Node *nn) case OCONST: o = vconst(n); - if(!true) + if(!cond) o = !o; gbranch(OGOTO); if(o) { @@ -1290,22 +1290,22 @@ boolgen(Node *n, int true, Node *nn) case OCOMMA: cgen(l, Z); - boolgen(r, true, nn); + boolgen(r, cond, nn); break; case ONOT: - boolgen(l, !true, nn); + boolgen(l, !cond, nn); break; case OCOND: bcgen(l, 1); p1 = p; - bcgen(r->left, true); + bcgen(r->left, cond); p2 = p; gbranch(OGOTO); patch(p1, pc); p1 = p; - bcgen(r->right, !true); + bcgen(r->right, !cond); patch(p2, pc); p2 = p; gbranch(OGOTO); @@ -1314,13 +1314,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: - bcgen(l, true); + bcgen(l, cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -1328,13 +1328,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: - bcgen(l, !true); + bcgen(l, !cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -1352,7 +1352,7 @@ boolgen(Node *n, int true, Node *nn) case OLO: case OLS: o = n->op; - if(true) + if(cond) o = comrel[relindex(o)]; if(l->complex >= FNX && r->complex >= FNX) { regret(&nod, r); @@ -1362,7 +1362,7 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); nod = *n; nod.right = &nod1; - boolgen(&nod, true, nn); + boolgen(&nod, cond, nn); break; } if(immconst(l)) { diff --git a/sys/src/cmd/7c/cgen.c b/sys/src/cmd/7c/cgen.c index c18552e36..9a3f69a36 100644 --- a/sys/src/cmd/7c/cgen.c +++ b/sys/src/cmd/7c/cgen.c @@ -738,17 +738,17 @@ lcgen(Node *n, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { if(n->type == T) gbranch(OGOTO); else - boolgen(n, true, Z); + boolgen(n, cond, Z); } void -boolgen(Node *n, int true, Node *nn) +boolgen(Node *n, int cond, Node *nn) { int o; Prog *p1, *p2; @@ -768,12 +768,12 @@ boolgen(Node *n, int true, Node *nn) regalloc(&nod, n, nn); cgen(n, &nod); o = ONE; - if(true) + if(cond) o = OEQ; if(typefd[n->type->etype]) { regalloc(&nod1, n, Z); gmove(nodfconst(0.0), &nod1); - gopcode(true ? o | BTRUE : o, &nod1, &nod, Z); + gopcode(cond ? o | BTRUE : o, &nod1, &nod, Z); regfree(&nod1); }else gopcode(o, nodconst(0), &nod, Z); @@ -782,7 +782,7 @@ boolgen(Node *n, int true, Node *nn) case OCONST: o = vconst(n); - if(!true) + if(!cond) o = !o; gbranch(OGOTO); if(o) { @@ -794,22 +794,22 @@ boolgen(Node *n, int true, Node *nn) case OCOMMA: cgen(l, Z); - boolgen(r, true, nn); + boolgen(r, cond, nn); break; case ONOT: - boolgen(l, !true, nn); + boolgen(l, !cond, nn); break; case OCOND: bcgen(l, 1); p1 = p; - bcgen(r->left, true); + bcgen(r->left, cond); p2 = p; gbranch(OGOTO); patch(p1, pc); p1 = p; - bcgen(r->right, !true); + bcgen(r->right, !cond); patch(p2, pc); p2 = p; gbranch(OGOTO); @@ -818,13 +818,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: - bcgen(l, true); + bcgen(l, cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -832,13 +832,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: - bcgen(l, !true); + bcgen(l, !cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -856,7 +856,7 @@ boolgen(Node *n, int true, Node *nn) case OLO: case OLS: o = n->op; - if(true) + if(cond) o = comrel[relindex(o)]; if(l->complex >= FNX && r->complex >= FNX) { regret(&nod, r); @@ -866,21 +866,21 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); nod = *n; nod.right = &nod1; - boolgen(&nod, true, nn); + boolgen(&nod, cond, nn); break; } if(sconst(l)) { regalloc(&nod, r, nn); cgenrel(r, &nod, 1); o = invrel[relindex(o)]; - gopcode(true ? o | BTRUE : o, l, &nod, Z); + gopcode(cond ? o | BTRUE : o, l, &nod, Z); regfree(&nod); goto com; } if(sconst(r)) { regalloc(&nod, l, nn); cgenrel(l, &nod, 1); - gopcode(true ? o | BTRUE : o, r, &nod, Z); + gopcode(cond ? o | BTRUE : o, r, &nod, Z); regfree(&nod); goto com; } @@ -895,7 +895,7 @@ boolgen(Node *n, int true, Node *nn) regalloc(&nod1, l, Z); cgenrel(l, &nod1, 1); } - gopcode(true ? o | BTRUE : o, &nod, &nod1, Z); + gopcode(cond ? o | BTRUE : o, &nod, &nod1, Z); regfree(&nod); regfree(&nod1); diff --git a/sys/src/cmd/7c/txt.c b/sys/src/cmd/7c/txt.c index 0de577496..9f9b767af 100644 --- a/sys/src/cmd/7c/txt.c +++ b/sys/src/cmd/7c/txt.c @@ -1003,7 +1003,7 @@ zcmp(Prog *p, int as) void gopcode(int o, Node *f1, Node *f2, Node *t) { - int a, et, true; + int a, et, cond; Adr ta; et = TLONG; @@ -1016,7 +1016,7 @@ gopcode(int o, Node *f1, Node *f2, Node *t) et = f2->type->etype; } } - true = o & BTRUE; + cond = o & BTRUE; o &= ~BTRUE; a = AGOK; switch(o) { @@ -1214,24 +1214,24 @@ gopcode(int o, Node *f1, Node *f2, Node *t) goto done; a = ABLT; /* ensure NaN comparison is always false */ - if(typefd[et] && !true) + if(typefd[et] && !cond) a = ABMI; break; case OLE: a = ABLE; - if(typefd[et] && !true) + if(typefd[et] && !cond) a = ABLS; break; case OGE: if(zcmp(p, ATBZ)) goto done; a = ABGE; - if(typefd[et] && true) + if(typefd[et] && cond) a = ABPL; break; case OGT: a = ABGT; - if(typefd[et] && true) + if(typefd[et] && cond) a = ABHI; break; case OLO: diff --git a/sys/src/cmd/8c/cgen.c b/sys/src/cmd/8c/cgen.c index 46144f1e9..a3404387c 100644 --- a/sys/src/cmd/8c/cgen.c +++ b/sys/src/cmd/8c/cgen.c @@ -1229,17 +1229,17 @@ lcgen(Node *n, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { if(n->type == T) gbranch(OGOTO); else - boolgen(n, true, Z); + boolgen(n, cond, Z); } void -boolgen(Node *n, int true, Node *nn) +boolgen(Node *n, int cond, Node *nn) { int o; Prog *p1, *p2; @@ -1257,11 +1257,11 @@ boolgen(Node *n, int true, Node *nn) default: if(typev[n->type->etype]) { - testv(n, true); + testv(n, cond); goto com; } o = ONE; - if(true) + if(cond) o = OEQ; if(typefd[n->type->etype]) { if(n->addable < INDEXED) { @@ -1287,7 +1287,7 @@ boolgen(Node *n, int true, Node *nn) case OCONST: o = vconst(n); - if(!true) + if(!cond) o = !o; gbranch(OGOTO); if(o) { @@ -1299,22 +1299,22 @@ boolgen(Node *n, int true, Node *nn) case OCOMMA: cgen(l, Z); - boolgen(r, true, nn); + boolgen(r, cond, nn); break; case ONOT: - boolgen(l, !true, nn); + boolgen(l, !cond, nn); break; case OCOND: bcgen(l, 1); p1 = p; - bcgen(r->left, true); + bcgen(r->left, cond); p2 = p; gbranch(OGOTO); patch(p1, pc); p1 = p; - bcgen(r->right, !true); + bcgen(r->right, !cond); patch(p2, pc); p2 = p; gbranch(OGOTO); @@ -1323,13 +1323,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: - bcgen(l, true); + bcgen(l, cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -1337,13 +1337,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: - bcgen(l, !true); + bcgen(l, !cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -1362,12 +1362,12 @@ boolgen(Node *n, int true, Node *nn) case OLS: o = n->op; if(typev[l->type->etype]) { - if(!true) + if(!cond) n->op = comrel[relindex(o)]; cgen64(n, Z); goto com; } - if(true) + if(cond) o = comrel[relindex(o)]; if(l->complex >= FNX && r->complex >= FNX) { regret(&nod, r); @@ -1377,7 +1377,7 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); nod = *n; nod.right = &nod1; - boolgen(&nod, true, nn); + boolgen(&nod, cond, nn); break; } if(typefd[l->type->etype]) { diff --git a/sys/src/cmd/8c/cgen64.c b/sys/src/cmd/8c/cgen64.c index 7dcccd6c5..7b29d1fe2 100644 --- a/sys/src/cmd/8c/cgen64.c +++ b/sys/src/cmd/8c/cgen64.c @@ -411,13 +411,13 @@ enum /* * _testv: * CMPL lo,$0 - * JNE true + * JNE cond * CMPL hi,$0 - * JNE true + * JNE cond * GOTO false * false: * GOTO code - * true: + * cond: * GOTO patchme * code: */ @@ -1187,7 +1187,7 @@ static uchar HSargs[] = { OHI, OHS }; /* Big Generator */ static void -biggen(Node *l, Node *r, Node *t, int true, uchar code[][VLEN], uchar *a) +biggen(Node *l, Node *r, Node *t, int cond, uchar code[][VLEN], uchar *a) { int i, j, g, oc, op, lo, ro, to, xo, *xp; Type *lt; @@ -1432,11 +1432,11 @@ biggen(Node *l, Node *r, Node *t, int true, uchar code[][VLEN], uchar *a) break; case VT: - g = true; + g = cond; i++; break; case VF: - g = !true; + g = !cond; i++; break; @@ -1564,7 +1564,7 @@ cgen64(Node *n, Node *nn) { Type *dt; uchar *args, (*cp)[VLEN], (**optab)[VLEN]; - int li, ri, lri, dr, si, m, op, sh, cmp, true; + int li, ri, lri, dr, si, m, op, sh, cmp, cond; Node *c, *d, *l, *r, *t, *s, nod1, nod2, nod3, nod4, nod5; if(debug['g']) { @@ -2093,40 +2093,40 @@ cgen64(Node *n, Node *nn) break; } - true = 1; + cond = 1; optab = cmptab; switch(op) { case OEQ: optab = NEtab; - true = 0; + cond = 0; break; case ONE: optab = NEtab; break; case OLE: args = GTargs; - true = 0; + cond = 0; break; case OGT: args = GTargs; break; case OLS: args = HIargs; - true = 0; + cond = 0; break; case OHI: args = HIargs; break; case OLT: args = GEargs; - true = 0; + cond = 0; break; case OGE: args = GEargs; break; case OLO: args = HSargs; - true = 0; + cond = 0; break; case OHS: args = HSargs; @@ -2138,7 +2138,7 @@ cgen64(Node *n, Node *nn) switch(lri) { case IMM(0, 0): - biggen(l, r, Z, true, optab[T0i], args); + biggen(l, r, Z, cond, optab[T0i], args); break; case IMM(0, 1): case IMM(1, 0): @@ -2147,14 +2147,14 @@ cgen64(Node *n, Node *nn) diag(l, "bad whatof\n"); break; case WCONST: - biggen(l, r, Z, true, optab[T0i], args); + biggen(l, r, Z, cond, optab[T0i], args); break; case WHARD: reglcgen(&nod2, r, Z); r = &nod2; /* fall thru */ case WADDR: - biggen(l, r, Z, true, optab[T0i], args); + biggen(l, r, Z, cond, optab[T0i], args); if(ri == WHARD) regfree(r); break; @@ -2169,7 +2169,7 @@ cgen64(Node *n, Node *nn) reglcgen(&nod2, r, Z); r = &nod2; } - biggen(l, r, Z, true, optab[Tii], args); + biggen(l, r, Z, cond, optab[Tii], args); if(li == WHARD) regfree(l); if(ri == WHARD) @@ -2616,14 +2616,14 @@ cgen64(Node *n, Node *nn) } void -testv(Node *n, int true) +testv(Node *n, int cond) { Type *t; Node *nn, nod, *b; if(machcap(Z)) { b = &nod; - b->op = true ? ONE : OEQ; + b->op = cond ? ONE : OEQ; b->left = n; b->right = new(0, Z, Z); *b->right = *nodconst(0); @@ -2636,7 +2636,7 @@ testv(Node *n, int true) switch(n->op) { case OINDREG: case ONAME: - biggen(n, Z, Z, true, testi, nil); + biggen(n, Z, Z, cond, testi, nil); break; default: @@ -2647,14 +2647,14 @@ testv(Node *n, int true) reglcgen(&nod, n, Z); n->type = t; n = &nod; - biggen(n, Z, Z, true, testi, nil); + biggen(n, Z, Z, cond, testi, nil); if(n == &nod) regfree(n); } else { nn = regpair(Z, n); sugen(n, nn, 8); - biggen(nn, Z, Z, true, testi, nil); + biggen(nn, Z, Z, cond, testi, nil); freepair(nn); } } diff --git a/sys/src/cmd/9c/cgen.c b/sys/src/cmd/9c/cgen.c index 12a9edd20..d34e692d6 100644 --- a/sys/src/cmd/9c/cgen.c +++ b/sys/src/cmd/9c/cgen.c @@ -713,17 +713,17 @@ lcgen(Node *n, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { if(n->type == T) gbranch(OGOTO); else - boolgen(n, true, Z); + boolgen(n, cond, Z); } void -boolgen(Node *n, int true, Node *nn) +boolgen(Node *n, int cond, Node *nn) { int o, uns; Prog *p1, *p2; @@ -743,7 +743,7 @@ boolgen(Node *n, int true, Node *nn) default: if(n->op == OCONST) { o = vconst(n); - if(!true) + if(!cond) o = !o; gbranch(OGOTO); if(o) { @@ -756,7 +756,7 @@ boolgen(Node *n, int true, Node *nn) regalloc(&nod, n, nn); cgen(n, &nod); o = ONE; - if(true) + if(cond) o = comrel[relindex(o)]; if(typefd[n->type->etype]) { nodreg(&nod1, n, NREG+FREGZERO); @@ -768,22 +768,22 @@ boolgen(Node *n, int true, Node *nn) case OCOMMA: cgen(l, Z); - boolgen(r, true, nn); + boolgen(r, cond, nn); break; case ONOT: - boolgen(l, !true, nn); + boolgen(l, !cond, nn); break; case OCOND: bcgen(l, 1); p1 = p; - bcgen(r->left, true); + bcgen(r->left, cond); p2 = p; gbranch(OGOTO); patch(p1, pc); p1 = p; - bcgen(r->right, !true); + bcgen(r->right, !cond); patch(p2, pc); p2 = p; gbranch(OGOTO); @@ -792,13 +792,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: - bcgen(l, true); + bcgen(l, cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -806,13 +806,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: - bcgen(l, !true); + bcgen(l, !cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -832,7 +832,7 @@ boolgen(Node *n, int true, Node *nn) case OGE: case OGT: o = n->op; - if(true) + if(cond) o = comrel[relindex(o)]; if(l->complex >= FNX && r->complex >= FNX) { regret(&nod, r); @@ -842,7 +842,7 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); nod = *n; nod.right = &nod1; - boolgen(&nod, true, nn); + boolgen(&nod, cond, nn); break; } if(!uns && sconst(r)) { diff --git a/sys/src/cmd/kc/cgen.c b/sys/src/cmd/kc/cgen.c index af3a21c2d..ae01957bf 100644 --- a/sys/src/cmd/kc/cgen.c +++ b/sys/src/cmd/kc/cgen.c @@ -648,17 +648,17 @@ lcgen(Node *n, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { if(n->type == T) gbranch(OGOTO); else - boolgen(n, true, Z); + boolgen(n, cond, Z); } void -boolgen(Node *n, int true, Node *nn) +boolgen(Node *n, int cond, Node *nn) { int o; Prog *p1, *p2; @@ -677,7 +677,7 @@ boolgen(Node *n, int true, Node *nn) default: if(n->op == OCONST) { o = vconst(n); - if(!true) + if(!cond) o = !o; gbranch(OGOTO); if(o) { @@ -690,7 +690,7 @@ boolgen(Node *n, int true, Node *nn) regalloc(&nod, n, nn); cgen(n, &nod); o = ONE; - if(true) + if(cond) o = comrel[relindex(o)]; if(typefd[n->type->etype]) { nodreg(&nod1, n, NREG+FREGZERO); @@ -702,22 +702,22 @@ boolgen(Node *n, int true, Node *nn) case OCOMMA: cgen(l, Z); - boolgen(r, true, nn); + boolgen(r, cond, nn); break; case ONOT: - boolgen(l, !true, nn); + boolgen(l, !cond, nn); break; case OCOND: bcgen(l, 1); p1 = p; - bcgen(r->left, true); + bcgen(r->left, cond); p2 = p; gbranch(OGOTO); patch(p1, pc); p1 = p; - bcgen(r->right, !true); + bcgen(r->right, !cond); patch(p2, pc); p2 = p; gbranch(OGOTO); @@ -726,13 +726,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: - bcgen(l, true); + bcgen(l, cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -740,13 +740,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: - bcgen(l, !true); + bcgen(l, !cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -764,7 +764,7 @@ boolgen(Node *n, int true, Node *nn) case OLO: case OLS: o = n->op; - if(true) + if(cond) o = comrel[relindex(o)]; if(l->complex >= FNX && r->complex >= FNX) { regret(&nod, r); @@ -774,7 +774,7 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); nod = *n; nod.right = &nod1; - boolgen(&nod, true, nn); + boolgen(&nod, cond, nn); break; } if(sconst(r)) { diff --git a/sys/src/cmd/qc/cgen.c b/sys/src/cmd/qc/cgen.c index ac6411abe..a665c612b 100644 --- a/sys/src/cmd/qc/cgen.c +++ b/sys/src/cmd/qc/cgen.c @@ -686,17 +686,17 @@ lcgen(Node *n, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { if(n->type == T) gbranch(OGOTO); else - boolgen(n, true, Z); + boolgen(n, cond, Z); } void -boolgen(Node *n, int true, Node *nn) +boolgen(Node *n, int cond, Node *nn) { int o, uns; Prog *p1, *p2; @@ -716,7 +716,7 @@ boolgen(Node *n, int true, Node *nn) default: if(n->op == OCONST) { o = vconst(n); - if(!true) + if(!cond) o = !o; gbranch(OGOTO); if(o) { @@ -727,13 +727,13 @@ boolgen(Node *n, int true, Node *nn) goto com; } if(typev[n->type->etype]) { - testv(n, true); + testv(n, cond); goto com; } regalloc(&nod, n, nn); cgen(n, &nod); o = ONE; - if(true) + if(cond) o = comrel[relindex(o)]; if(typefd[n->type->etype]) { nodreg(&nod1, n, NREG+FREGZERO); @@ -745,22 +745,22 @@ boolgen(Node *n, int true, Node *nn) case OCOMMA: cgen(l, Z); - boolgen(r, true, nn); + boolgen(r, cond, nn); break; case ONOT: - boolgen(l, !true, nn); + boolgen(l, !cond, nn); break; case OCOND: bcgen(l, 1); p1 = p; - bcgen(r->left, true); + bcgen(r->left, cond); p2 = p; gbranch(OGOTO); patch(p1, pc); p1 = p; - bcgen(r->right, !true); + bcgen(r->right, !cond); patch(p2, pc); p2 = p; gbranch(OGOTO); @@ -769,13 +769,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: - bcgen(l, true); + bcgen(l, cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -783,13 +783,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: - bcgen(l, !true); + bcgen(l, !cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -809,11 +809,11 @@ boolgen(Node *n, int true, Node *nn) case OGE: case OGT: if(typev[l->type->etype]){ - cmpv(n, true, Z); + cmpv(n, cond, Z); goto com; } o = n->op; - if(true) + if(cond) o = comrel[relindex(o)]; if(l->complex >= FNX && r->complex >= FNX) { regret(&nod, r); @@ -823,7 +823,7 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); nod = *n; nod.right = &nod1; - boolgen(&nod, true, nn); + boolgen(&nod, cond, nn); break; } if(!uns && sconst(r) || (uns || o == OEQ || o == ONE) && uconst(r)) { @@ -1281,7 +1281,7 @@ brcondv(Node *l, Node *r, int chi, int clo) } static void -testv(Node *n, int true) +testv(Node *n, int cond) { Node nod; @@ -1292,7 +1292,7 @@ testv(Node *n, int true) *nod.right = *nodconst(0); nod.right->type = n->type; nod.type = types[TLONG]; - cmpv(&nod, true, Z); + cmpv(&nod, cond, Z); } /* @@ -1300,7 +1300,7 @@ testv(Node *n, int true) * which saves loading the latter if the high order comparison suffices */ static void -cmpv(Node *n, int true, Node *nn) +cmpv(Node *n, int cond, Node *nn) { Node *l, *r, nod, nod1; int o, f1, f2; @@ -1320,7 +1320,7 @@ cmpv(Node *n, int true, Node *nn) cgen(r, &nod1); nod = *n; nod.right = &nod1; - cmpv(&nod, true, nn); + cmpv(&nod, cond, nn); cursafe = curs; return; } @@ -1334,7 +1334,7 @@ cmpv(Node *n, int true, Node *nn) nod.type = types[TLONG]; nod1.type = types[TLONG]; o = n->op; - if(true) + if(cond) o = comrel[relindex(o)]; switch(o){ case OEQ: diff --git a/sys/src/cmd/vc/cgen.c b/sys/src/cmd/vc/cgen.c index 0dc355c76..18e121287 100644 --- a/sys/src/cmd/vc/cgen.c +++ b/sys/src/cmd/vc/cgen.c @@ -648,17 +648,17 @@ lcgen(Node *n, Node *nn) } void -bcgen(Node *n, int true) +bcgen(Node *n, int cond) { if(n->type == T) gbranch(OGOTO); else - boolgen(n, true, Z); + boolgen(n, cond, Z); } void -boolgen(Node *n, int true, Node *nn) +boolgen(Node *n, int cond, Node *nn) { int o; Prog *p1, *p2; @@ -679,7 +679,7 @@ boolgen(Node *n, int true, Node *nn) cgen(n, &nod); if(nn == Z || typefd[n->type->etype]) { o = ONE; - if(true) + if(cond) o = comrel[relindex(o)]; if(typefd[n->type->etype]) { nodreg(&nod1, n, NREG+FREGZERO); @@ -689,7 +689,7 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); goto com; } - if(true) + if(cond) gopcode(OCOND, &nod, nodconst(0), &nod); else gopcode(OCOND, nodconst(1), &nod, &nod); @@ -699,7 +699,7 @@ boolgen(Node *n, int true, Node *nn) case OCONST: o = vconst(n); - if(!true) + if(!cond) o = !o; gbranch(OGOTO); if(o) { @@ -711,22 +711,22 @@ boolgen(Node *n, int true, Node *nn) case OCOMMA: cgen(l, Z); - boolgen(r, true, nn); + boolgen(r, cond, nn); break; case ONOT: - boolgen(l, !true, nn); + boolgen(l, !cond, nn); break; case OCOND: bcgen(l, 1); p1 = p; - bcgen(r->left, true); + bcgen(r->left, cond); p2 = p; gbranch(OGOTO); patch(p1, pc); p1 = p; - bcgen(r->right, !true); + bcgen(r->right, !cond); patch(p2, pc); p2 = p; gbranch(OGOTO); @@ -735,13 +735,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OANDAND: - if(!true) + if(!cond) goto caseor; caseand: - bcgen(l, true); + bcgen(l, cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; patch(p1, pc); gbranch(OGOTO); @@ -749,13 +749,13 @@ boolgen(Node *n, int true, Node *nn) goto com; case OOROR: - if(!true) + if(!cond) goto caseand; caseor: - bcgen(l, !true); + bcgen(l, !cond); p1 = p; - bcgen(r, !true); + bcgen(r, !cond); p2 = p; gbranch(OGOTO); patch(p1, pc); @@ -773,7 +773,7 @@ boolgen(Node *n, int true, Node *nn) case OLO: case OLS: o = n->op; - if(true) + if(cond) o = comrel[relindex(o)]; if(l->complex >= FNX && r->complex >= FNX) { regret(&nod, r); @@ -783,7 +783,7 @@ boolgen(Node *n, int true, Node *nn) regfree(&nod); nod = *n; nod.right = &nod1; - boolgen(&nod, true, nn); + boolgen(&nod, cond, nn); break; } if(nn != Z && !typefd[l->type->etype]) {