From: Rob Pike <r@golang.org>
Date: Mon, 22 Jun 2015 22:40:40 +0000 (+1000)
Subject: cmd/asm: fix shifts again, this time for sure
X-Git-Tag: go1.5beta1~145
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=989b372a5cb73c982aa5ba00081e67e89cc71ff1;p=gostls13.git

cmd/asm: fix shifts again, this time for sure

There are two conditions to worry about:

1) The shift count cannot be negative. Since the evaluator uses unsigned
arithmetic throughout, this means checking that the high bit of
the shift count is always off, which is done by converting to int64
and seeing if the result is negative.

2) For right shifts, the value cannot be negative. We don't want a
high bit in the value because right shifting a value depends on the
sign, and for clarity we always want unsigned shifts.

Next step is to build some testing infrastructure for the parser.

Change-Id: I4c46c79989d02c107fc64954403fc18613763f1d
Reviewed-on: https://go-review.googlesource.com/11326
Reviewed-by: Russ Cox <rsc@golang.org>
---

diff --git a/src/cmd/asm/internal/asm/parse.go b/src/cmd/asm/internal/asm/parse.go
index 18cc27fa83..2533256f88 100644
--- a/src/cmd/asm/internal/asm/parse.go
+++ b/src/cmd/asm/internal/asm/parse.go
@@ -797,8 +797,8 @@ func (p *Parser) term() uint64 {
 			value *= p.factor()
 		case '/':
 			p.next()
-			if value&(1<<63) != 0 {
-				p.errorf("divide with high bit set")
+			if int64(value) < 0 {
+				p.errorf("divide of value with high bit set")
 			}
 			value /= p.factor()
 		case '%':
@@ -808,14 +808,17 @@ func (p *Parser) term() uint64 {
 			p.next()
 			shift := p.factor()
 			if int64(shift) < 0 {
-				p.errorf("left shift with high bit set")
+				p.errorf("negative left shift count")
 			}
 			return value << shift
 		case lex.RSH:
 			p.next()
 			shift := p.term()
 			if int64(shift) < 0 {
-				p.errorf("right shift with high bit set")
+				p.errorf("negative right shift count")
+			}
+			if int64(value) < 0 {
+				p.errorf("right shift of value with high bit set")
 			}
 			value >>= shift
 		case '&':