xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cc/6c: fix return type of mixed asop expressions, preserve type for moves so fixed<->float conversions work correctly

Browse source
This commit is contained in:
cinap_lenrek 2015-10-04 20:02:58 +02:00
parent 9e3ef5c777
commit bfd0cb0db4
2 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/src/cmd/6c/txt.c
View file

@ -677,14 +677,10 @@ gmove(Node *f, Node *t)
return; return;
} }
case TUVLONG: case TUVLONG:
a = AMOVQ;
goto ld;
case TIND: case TIND:
a = AMOVQ; a = AMOVQ;
ld: ld:
regalloc(&nod, f, t); regalloc(&nod, f, t);
nod.type = t64? types[TVLONG]: types[TINT];
gins(a, f, &nod); gins(a, f, &nod);
gmove(&nod, t); gmove(&nod, t);
regfree(&nod); regfree(&nod);
@ -692,19 +688,10 @@ gmove(Node *f, Node *t)
case TFLOAT: case TFLOAT:
a = AMOVSS; a = AMOVSS;
goto fld; goto ld;
case TDOUBLE: case TDOUBLE:
a = AMOVSD; a = AMOVSD;
fld: goto ld;
regalloc(&nod, f, t);
if(tt != TDOUBLE && tt != TFLOAT){ /* TO DO: why is this here */
prtree(f, "odd tree");
nod.type = t64? types[TVLONG]: types[TINT];
}
gins(a, f, &nod);
gmove(&nod, t);
regfree(&nod);
return;
} }
/* /*
@ -1077,7 +1064,7 @@ gmove(Node *f, Node *t)
case CASE( TUSHORT,TFLOAT): case CASE( TUSHORT,TFLOAT):
case CASE( TINT, TFLOAT): case CASE( TINT, TFLOAT):
case CASE( TLONG, TFLOAT): case CASE( TLONG, TFLOAT):
case CASE( TVLONG, TFLOAT): case CASE( TVLONG, TFLOAT):
case CASE( TIND, TFLOAT): case CASE( TIND, TFLOAT):
case CASE( TCHAR, TDOUBLE): case CASE( TCHAR, TDOUBLE):

26
sys/src/cmd/cc/com.c
View file

@ -178,12 +178,15 @@ tcomo(Node *n, int f)
arith(n, 0); arith(n, 0);
while(n->left->op == OCAST) while(n->left->op == OCAST)
n->left = n->left->left; n->left = n->left->left;
if(!sametype(t, n->type) && !mixedasop(t, n->type)) { if(!mixedasop(t, n->type)) {
r = new1(OCAST, n->right, Z); if(!sametype(t, n->type)) {
r->type = t; r = new1(OCAST, n->right, Z);
n->right = r; r->type = t;
n->right = r;
n->type = t;
}
} else
n->type = t; n->type = t;
}
break; break;
case OASMUL: case OASMUL:
@ -205,11 +208,16 @@ tcomo(Node *n, int f)
arith(n, 0); arith(n, 0);
while(n->left->op == OCAST) while(n->left->op == OCAST)
n->left = n->left->left; n->left = n->left->left;
if(!sametype(t, n->type) && !mixedasop(t, n->type)) { if(!mixedasop(t, n->type)) {
r = new1(OCAST, n->right, Z); if(!sametype(t, n->type)) {
r->type = t; r = new1(OCAST, n->right, Z);
n->right = r; r->type = t;
n->right = r;
n->type = t;
}
} else {
n->type = t; n->type = t;
break;
} }
if(typeu[n->type->etype]) { if(typeu[n->type->etype]) {
if(n->op == OASDIV) if(n->op == OASDIV)