From bdf20db1f351e79c441b4434ef87ab0e3ee3bf39 Mon Sep 17 00:00:00 2001
From: Andrew Ekstedt <andrew.ekstedt@gmail.com>
Date: Sat, 3 Jan 2015 02:06:18 -0800
Subject: [PATCH] gen: Split d into five separate veriables.

---
 gen.go        |  6 ++---
 keccak_gen.go | 62 +++++++++++++++++++++++++--------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/gen.go b/gen.go
index 025ee5c..183f7d0 100644
--- a/gen.go
+++ b/gen.go
@@ -87,13 +87,13 @@ func roundGo(a *[25]uint64) {
 	{{ range $x := count 5 }}
 		c{{$x}} = {{a $x 0}} ^ {{a $x 1}} ^ {{a $x 2}} ^ {{a $x 3}} ^ {{a $x 4}}
 	{{ end }}
-	var d uint64
+	var d0, d1, d2, d3, d4 uint64
 	{{ range $x := count 5 }}
 		{{ $x4 := add $x 4 | mod }}
 		{{ $x1 := add $x 1 | mod }}
-		d = c{{$x4}} ^ (c{{$x1}}<<1 | c{{$x1}}>>63)
+		d{{$x}} = c{{$x4}} ^ (c{{$x1}}<<1 | c{{$x1}}>>63)
 		{{ range $y := count 5 }}
-			{{b $x $y}} = {{a $x $y}} ^ d
+			{{b $x $y}} = {{a $x $y}} ^ d{{$x}}
 		{{ end }}
 	{{ end }}
 
diff --git a/keccak_gen.go b/keccak_gen.go
index 9d6140b..ebb0b78 100644
--- a/keccak_gen.go
+++ b/keccak_gen.go
@@ -29,67 +29,67 @@ func roundGo(a *[25]uint64) {
 
 	c4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
 
-	var d uint64
+	var d0, d1, d2, d3, d4 uint64
 
-	d = c4 ^ (c1<<1 | c1>>63)
+	d0 = c4 ^ (c1<<1 | c1>>63)
 
-	b00 = a[0] ^ d
+	b00 = a[0] ^ d0
 
-	b01 = a[5] ^ d
+	b01 = a[5] ^ d0
 
-	b02 = a[10] ^ d
+	b02 = a[10] ^ d0
 
-	b03 = a[15] ^ d
+	b03 = a[15] ^ d0
 
-	b04 = a[20] ^ d
+	b04 = a[20] ^ d0
 
-	d = c0 ^ (c2<<1 | c2>>63)
+	d1 = c0 ^ (c2<<1 | c2>>63)
 
-	b10 = a[1] ^ d
+	b10 = a[1] ^ d1
 
-	b11 = a[6] ^ d
+	b11 = a[6] ^ d1
 
-	b12 = a[11] ^ d
+	b12 = a[11] ^ d1
 
-	b13 = a[16] ^ d
+	b13 = a[16] ^ d1
 
-	b14 = a[21] ^ d
+	b14 = a[21] ^ d1
 
-	d = c1 ^ (c3<<1 | c3>>63)
+	d2 = c1 ^ (c3<<1 | c3>>63)
 
-	b20 = a[2] ^ d
+	b20 = a[2] ^ d2
 
-	b21 = a[7] ^ d
+	b21 = a[7] ^ d2
 
-	b22 = a[12] ^ d
+	b22 = a[12] ^ d2
 
-	b23 = a[17] ^ d
+	b23 = a[17] ^ d2
 
-	b24 = a[22] ^ d
+	b24 = a[22] ^ d2
 
-	d = c2 ^ (c4<<1 | c4>>63)
+	d3 = c2 ^ (c4<<1 | c4>>63)
 
-	b30 = a[3] ^ d
+	b30 = a[3] ^ d3
 
-	b31 = a[8] ^ d
+	b31 = a[8] ^ d3
 
-	b32 = a[13] ^ d
+	b32 = a[13] ^ d3
 
-	b33 = a[18] ^ d
+	b33 = a[18] ^ d3
 
-	b34 = a[23] ^ d
+	b34 = a[23] ^ d3
 
-	d = c3 ^ (c0<<1 | c0>>63)
+	d4 = c3 ^ (c0<<1 | c0>>63)
 
-	b40 = a[4] ^ d
+	b40 = a[4] ^ d4
 
-	b41 = a[9] ^ d
+	b41 = a[9] ^ d4
 
-	b42 = a[14] ^ d
+	b42 = a[14] ^ d4
 
-	b43 = a[19] ^ d
+	b43 = a[19] ^ d4
 
-	b44 = a[24] ^ d
+	b44 = a[24] ^ d4
 
 	// Rho / Pi