Merge pull request #1990 from milanaleksic/master

Allowing Go runtime compilation to succeed under ARM
antlr · Oct 27, 2017 · 089550d · 089550d
2 parents 1f8c5bd + 98745bb
commit 089550d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/contributors.txt b/contributors.txt
@@ -161,6 +161,7 @@ YYYY/MM/DD, github id, Full name, email
 2017/07/27, matthauck, Matt Hauck, matthauck@gmail.com
 2017/07/27, shirou, WAKAYAMA Shirou, shirou.faw@gmail.com
 2017/08/20, tiagomazzutti, Tiago Mazzutti, tiagomzt@gmail.com
+2017/08/20, milanaleksic, Milan Aleksic, milanaleksic@gmail.com
 2017/08/29, Eddy Reyes, eddy@mindsight.io
 2017/09/09, brauliobz, Bráulio Bezerra, brauliobezerra@gmail.com
 2017/09/11, sachinjain024, Sachin Jain, sachinjain024@gmail.com

diff --git a/runtime/Go/antlr/utils.go b/runtime/Go/antlr/utils.go
@@ -353,36 +353,37 @@ func PrintArrayJavaStyle(sa []string) string {
 	return buffer.String()
 }
 
-
 // murmur hash
 const (
-	c1_32 = 0xCC9E2D51
-	c2_32 = 0x1B873593
-	n1_32 = 0xE6546B64
+	c1_32 uint = 0xCC9E2D51
+	c2_32 uint = 0x1B873593
+	n1_32 uint = 0xE6546B64
 )
 
 func murmurInit(seed int) int {
 	return seed
 }
 
 func murmurUpdate(h1 int, k1 int) int {
-	k1 *= c1_32
-	k1 = (k1 << 15) | (k1 >> 17) // rotl32(k1, 15)
-	k1 *= c2_32
+	var k1u uint
+	k1u = uint(k1) * c1_32
+	k1u = (k1u << 15) | (k1u >> 17) // rotl32(k1u, 15)
+	k1u *= c2_32
 
-	h1 ^= k1
-	h1 = (h1 << 13) | (h1 >> 19) // rotl32(h1, 13)
-	h1 = h1*5 + 0xe6546b64
-	return h1
+	var h1u = uint(h1) ^ k1u
+	h1u = (h1u << 13) | (h1u >> 19) // rotl32(h1u, 13)
+	h1u = h1u*5 + 0xe6546b64
+	return int(h1u)
 }
 
 func murmurFinish(h1 int, numberOfWords int) int {
-	h1 ^= (numberOfWords * 4)
-	h1 ^= h1 >> 16
-	h1 *= 0x85ebca6b
-	h1 ^= h1 >> 13
-	h1 *= 0xc2b2ae35
-	h1 ^= h1 >> 16
-
-	return h1
+	var h1u uint = uint(h1)
+	h1u ^= uint(numberOfWords * 4)
+	h1u ^= h1u >> 16
+	h1u *= uint(0x85ebca6b)
+	h1u ^= h1u >> 13
+	h1u *= 0xc2b2ae35
+	h1u ^= h1u >> 16
+
+	return int(h1u)
 }