diff options
| author | Keith Randall <khr@golang.org> | 2015-01-15 14:39:58 -0800 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2015-01-15 23:50:01 +0000 |
| commit | daa64ddfe64dda368e80cf224dc485fa63386f81 (patch) | |
| tree | 63eb28ed8d74e3599cd2e3180bb8a86043b6c513 /src | |
| parent | fdb855420b5d8690d9ad0f5d4833375f085637c1 (diff) | |
| download | go-daa64ddfe64dda368e80cf224dc485fa63386f81.tar.xz | |
cmd/5g: make sure we normalize after unary ops on small types
We were failing ^uint16(0xffff) == 0, as we computed 0xffff0000 instead.
I could only trigger a failure for the above case, the other two tests
^uint16(0xfffe) == 1 and -uint16(0xffff) == 1 didn't seem to fail
previously. Somehow they get MOVHUs inserted for other reasons (used
by CMP instead of TST?). I fixed OMINUS anyway, better safe than
sorry.
Fixes #9604
Change-Id: I4c2d5bdc667742873ac029fdbe3db0cf12893c27
Reviewed-on: https://go-review.googlesource.com/2940
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/5g/cgen.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cmd/5g/cgen.c b/src/cmd/5g/cgen.c index c535cfbefb..87c64f6e81 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; } |