Skip to content

Commit aa576fc

Browse files
authored
Merge pull request #130 from staalmannen/claude/upgrade-ape-c-library-mmZGd
8c/cgen64.c: rename local var cond→vcond to unshadow cond() function
2 parents 157c218 + b487739 commit aa576fc

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

sys/src/cmd/8c/cgen64.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ cgen64(Node *n, Node *nn)
15641564
{
15651565
Type *dt;
15661566
uchar *args, (*cp)[VLEN], (**optab)[VLEN];
1567-
int li, ri, lri, dr, si, m, op, sh, cmp, cond;
1567+
int li, ri, lri, dr, si, m, op, sh, cmp, vcond;
15681568
Node *c, *d, *l, *r, *t, *s, nod1, nod2, nod3, nod4, nod5;
15691569

15701570
if(debug['g']) {
@@ -2093,40 +2093,40 @@ cgen64(Node *n, Node *nn)
20932093
break;
20942094
}
20952095

2096-
cond = 1;
2096+
vcond = 1;
20972097
optab = cmptab;
20982098
switch(op) {
20992099
case OEQ:
21002100
optab = NEtab;
2101-
cond = 0;
2101+
vcond = 0;
21022102
break;
21032103
case ONE:
21042104
optab = NEtab;
21052105
break;
21062106
case OLE:
21072107
args = GTargs;
2108-
cond = 0;
2108+
vcond = 0;
21092109
break;
21102110
case OGT:
21112111
args = GTargs;
21122112
break;
21132113
case OLS:
21142114
args = HIargs;
2115-
cond = 0;
2115+
vcond = 0;
21162116
break;
21172117
case OHI:
21182118
args = HIargs;
21192119
break;
21202120
case OLT:
21212121
args = GEargs;
2122-
cond = 0;
2122+
vcond = 0;
21232123
break;
21242124
case OGE:
21252125
args = GEargs;
21262126
break;
21272127
case OLO:
21282128
args = HSargs;
2129-
cond = 0;
2129+
vcond = 0;
21302130
break;
21312131
case OHS:
21322132
args = HSargs;
@@ -2138,7 +2138,7 @@ cgen64(Node *n, Node *nn)
21382138

21392139
switch(lri) {
21402140
case IMM(0, 0):
2141-
biggen(l, r, Z, cond, optab[T0i], args);
2141+
biggen(l, r, Z, vcond, optab[T0i], args);
21422142
break;
21432143
case IMM(0, 1):
21442144
case IMM(1, 0):
@@ -2147,14 +2147,14 @@ cgen64(Node *n, Node *nn)
21472147
diag(l, "bad whatof\n");
21482148
break;
21492149
case WCONST:
2150-
biggen(l, r, Z, cond, optab[T0i], args);
2150+
biggen(l, r, Z, vcond, optab[T0i], args);
21512151
break;
21522152
case WHARD:
21532153
reglcgen(&nod2, r, Z);
21542154
r = &nod2;
21552155
/* fall thru */
21562156
case WADDR:
2157-
biggen(l, r, Z, cond, optab[T0i], args);
2157+
biggen(l, r, Z, vcond, optab[T0i], args);
21582158
if(ri == WHARD)
21592159
regfree(r);
21602160
break;
@@ -2169,7 +2169,7 @@ cgen64(Node *n, Node *nn)
21692169
reglcgen(&nod2, r, Z);
21702170
r = &nod2;
21712171
}
2172-
biggen(l, r, Z, cond, optab[Tii], args);
2172+
biggen(l, r, Z, vcond, optab[Tii], args);
21732173
if(li == WHARD)
21742174
regfree(l);
21752175
if(ri == WHARD)

0 commit comments

Comments
 (0)