From 839657a730bd3c82d1b7932f996dd87448eb7d38 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Sat, 2 May 2015 10:02:54 -0600 Subject: Imported Upstream version 1.4.2 --- src/cmd/5g/cgen.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/cmd/5g/cgen.c') diff --git a/src/cmd/5g/cgen.c b/src/cmd/5g/cgen.c index c535cfbef..87c64f6e8 100644 --- a/src/cmd/5g/cgen.c +++ b/src/cmd/5g/cgen.c @@ -236,18 +236,14 @@ cgen(Node *n, Node *res) cgen(nl, &n1); nodconst(&n2, nl->type, -1); gins(a, &n2, &n1); - gmove(&n1, res); - regfree(&n1); - goto ret; + goto norm; case OMINUS: regalloc(&n1, nl->type, N); cgen(nl, &n1); nodconst(&n2, nl->type, 0); gins(optoas(OMINUS, nl->type), &n2, &n1); - gmove(&n1, res); - regfree(&n1); - goto ret; + goto norm; // symmetric binary case OAND: @@ -483,12 +479,15 @@ abop: // asymmetric binary cgen(nl, &n1); } gins(a, &n2, &n1); +norm: // Normalize result for types smaller than word. if(n->type->width < widthptr) { switch(n->op) { case OADD: case OSUB: case OMUL: + case OCOM: + case OMINUS: gins(optoas(OAS, n->type), &n1, &n1); break; } -- cgit v1.2.3