Merge commit '7f595ca' into ocl_update_20130512

poclbm121016.cl

@@ -13,7 +13,7 @@
 	typedef uint u;
 #endif
 
-__constant uint K[64] = { 
+__constant uint K[87] = {
     0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
     0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
     0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
@@ -21,9 +21,56 @@ __constant uint K[64] = {
     0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
     0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
     0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
+
+	0xc19bf3f4U,
+	0x80000000U,
+	0x00000280U,
+	0x00a00055U,
+	0xf377ed68U,
+	0xa54ff53aU,
+	0x08909ae5U,
+	0x90bb1e3cU,
+	0x9b05688cU,
+	0xca0b3af3U,
+	0x3c6ef372U,
+	0xbb67ae85U,
+	0x6a09e667U,
+	0x50c6645bU,
+	0x510e527fU,
+	0x3ac42e24U,
+	0x5807aa98U,
+	0xc19bf274U,
+	0x00a00000U,
+	0x00000100U,
+	0x11002000U,
+	0x00400022U,
+	0x136032edU
 };
 
+#define	xc19bf3f4U	K[64]
+#define	x80000000U	K[65]
+#define	x00000280U	K[66]
+#define	x00a00055U	K[67]
+#define	xf377ed68U	K[68]
+#define	xa54ff53aU	K[69]
+#define	x08909ae5U	K[70]
+#define	x90bb1e3cU	K[71]
+#define	x9b05688cU	K[72]
+#define	xca0b3af3U	K[73]
+#define	x3c6ef372U	K[74]
+#define	xbb67ae85U	K[75]
+#define	x6a09e667U	K[76]
+#define	x50c6645bU	K[77]
+#define	x510e527fU	K[78]
+#define	x3ac42e24U	K[79]
+#define	x5807aa98U	K[80]
+#define	xc19bf274U	K[81]
+#define	x00a00000U	K[82]
+#define	x00000100U	K[83]
+#define	x11002000U	K[84]
+#define	x00400022U	K[85]
+#define	x136032edU	K[86]
 
 // This part is not from the stock poclbm kernel. It's part of an optimization
 // added in the Phoenix Miner.
@@ -183,7 +230,7 @@ Vals[7]+=Ma(Vals[1],Vals[6],Vals[0]);
 
 Vals[5]+=(rotr(Vals[4],6)^rotr(Vals[4],11)^rotr(Vals[4],25));
 Vals[5]+=ch(Vals[4],Vals[3],Vals[2]);
-Vals[5]+=0xC19BF3F4U;
+Vals[5]+=xc19bf3f4U;
 Vals[1]+=Vals[5];
 Vals[5]+=(rotr(Vals[7],2)^rotr(Vals[7],13)^rotr(Vals[7],22));
 Vals[5]+=Ma(Vals[0],Vals[7],Vals[6]);
@@ -223,7 +270,7 @@ Vals[1]+=(rotr(Vals[4],2)^rotr(Vals[4],13)^rotr(Vals[4],22));
 Vals[1]+=Ma(Vals[2],Vals[4],Vals[3]);
 
 W[4]=(rotr(W[2],17)^rotr(W[2],19)^(W[2]>>10U));
-W[4]+=0x80000000U;
+W[4]+=x80000000U;
 Vals[0]+=W[4];
 Vals[0]+=(rotr(Vals[5],6)^rotr(Vals[5],11)^rotr(Vals[5],25));
 Vals[0]+=ch(Vals[5],Vals[7],Vals[6]);
@@ -242,7 +289,7 @@ Vals[6]+=(rotr(Vals[0],2)^rotr(Vals[0],13)^rotr(Vals[0],22));
 Vals[6]+=Ma(Vals[4],Vals[0],Vals[1]);
 
 W[6]=(rotr(W[4],17)^rotr(W[4],19)^(W[4]>>10U));
-W[6]+=0x00000280U;
+W[6]+=x00000280U;
 Vals[7]+=W[6];
 Vals[7]+=(rotr(Vals[3],6)^rotr(Vals[3],11)^rotr(Vals[3],25));
 Vals[7]+=ch(Vals[3],Vals[2],Vals[5]);
@@ -321,7 +368,7 @@ Vals[3]+=Vals[6];
 Vals[6]+=(rotr(Vals[0],2)^rotr(Vals[0],13)^rotr(Vals[0],22));
 Vals[6]+=Ma(Vals[4],Vals[0],Vals[1]);
 
-W[14]=0x00a00055U;
+W[14]=x00a00055U;
 W[14]+=W[7];
 W[14]+=(rotr(W[12],17)^rotr(W[12],19)^(W[12]>>10U));
 Vals[7]+=W[14];
@@ -701,61 +748,58 @@ Vals[5]+=state0;
 W[7]=state7;
 W[7]+=Vals[2];
 
-Vals[2]=0xF377ED68U;
+Vals[2]=xf377ed68U;
 Vals[2]+=Vals[5];
+W[0]=Vals[5];
+Vals[5]=x6a09e667U;
 
 W[3]=state3;
 W[3]+=Vals[0];
 
-Vals[0]=0xa54ff53aU;
+Vals[0]=xa54ff53aU;
 Vals[0]+=Vals[2];
-Vals[2]+=0x08909ae5U;
+Vals[2]+=x08909ae5U;
 
 W[6]=state6;
 W[6]+=Vals[3];
 
-Vals[3]=0x90BB1E3CU;
+Vals[3]=x90bb1e3cU;
 Vals[3]+=(rotr(Vals[0],6)^rotr(Vals[0],11)^rotr(Vals[0],25));
-Vals[3]+=(0x9b05688cU^(Vals[0]&0xca0b3af3U));
+Vals[3]+=(x9b05688cU^(Vals[0]&xca0b3af3U));
 
 Vals[7]+=state1;
 Vals[3]+=Vals[7];
+W[1]=Vals[7];
+Vals[7]=xbb67ae85U;
 
 W[2]=state2;
 W[2]+=Vals[6];
 
-Vals[6]=0x3c6ef372U;
+Vals[6]=x3c6ef372U;
 Vals[6]+=Vals[3];
 Vals[3]+=(rotr(Vals[2],2)^rotr(Vals[2],13)^rotr(Vals[2],22));
-Vals[3]+=Ma2(0xbb67ae85U,Vals[2],0x6a09e667U);
+Vals[3]+=Ma2(Vals[7],Vals[2],Vals[5]);
 
 W[5]=state5;
 W[5]+=Vals[4];
 
-Vals[4]=0x50C6645BU;
+Vals[4]=x50c6645bU;
 Vals[4]+=(rotr(Vals[6],6)^rotr(Vals[6],11)^rotr(Vals[6],25));
-Vals[4]+=ch(Vals[6],Vals[0],0x510e527fU);
+Vals[4]+=ch(Vals[6],Vals[0],x510e527fU);
 Vals[4]+=W[2];
 
-W[1]=Vals[7];
-Vals[7]=0xbb67ae85U;
 Vals[7]+=Vals[4];
 Vals[4]+=(rotr(Vals[3],2)^rotr(Vals[3],13)^rotr(Vals[3],22));
-Vals[4]+=Ma2(0x6a09e667U,Vals[3],Vals[2]);
+Vals[4]+=Ma2(Vals[5],Vals[3],Vals[2]);
 
 W[4]=state4;
 W[4]+=Vals[1];
 
-Vals[1]=0x3AC42E24U;
+Vals[1]=x3ac42e24U;
 Vals[1]+=(rotr(Vals[7],6)^rotr(Vals[7],11)^rotr(Vals[7],25));
 Vals[1]+=ch(Vals[7],Vals[6],Vals[0]);
 Vals[1]+=W[3];
-
-W[0]=Vals[5];
-
-Vals[5]=Vals[1];
-Vals[5]+=0x6a09e667U;
-
+Vals[5]+=Vals[1];
 Vals[1]+=(rotr(Vals[4],2)^rotr(Vals[4],13)^rotr(Vals[4],22));
 Vals[1]+=Ma(Vals[2],Vals[4],Vals[3]);
 
@@ -793,7 +837,7 @@ Vals[5]+=Ma(Vals[0],Vals[7],Vals[6]);
 
 Vals[2]+=(rotr(Vals[1],6)^rotr(Vals[1],11)^rotr(Vals[1],25));
 Vals[2]+=ch(Vals[1],Vals[4],Vals[3]);
-Vals[2]+=0x5807AA98U;
+Vals[2]+=x5807aa98U;
 Vals[0]+=Vals[2];
 Vals[2]+=(rotr(Vals[5],2)^rotr(Vals[5],13)^rotr(Vals[5],22));
 Vals[2]+=Ma(Vals[6],Vals[5],Vals[7]);
@@ -842,7 +886,7 @@ Vals[7]+=Ma(Vals[1],Vals[6],Vals[0]);
 
 Vals[5]+=(rotr(Vals[4],6)^rotr(Vals[4],11)^rotr(Vals[4],25));
 Vals[5]+=ch(Vals[4],Vals[3],Vals[2]);
-Vals[5]+=0xC19BF274U;
+Vals[5]+=xc19bf274U;
 Vals[1]+=Vals[5];
 Vals[5]+=(rotr(Vals[7],2)^rotr(Vals[7],13)^rotr(Vals[7],22));
 Vals[5]+=Ma(Vals[0],Vals[7],Vals[6]);
@@ -857,7 +901,7 @@ Vals[2]+=(rotr(Vals[5],2)^rotr(Vals[5],13)^rotr(Vals[5],22));
 Vals[2]+=Ma(Vals[6],Vals[5],Vals[7]);
 
 W[1]+=(rotr(W[2],7)^rotr(W[2],18)^(W[2]>>3U));
-W[1]+=0x00a00000U;
+W[1]+=x00a00000U;
 Vals[3]+=W[1];
 Vals[3]+=(rotr(Vals[0],6)^rotr(Vals[0],11)^rotr(Vals[0],25));
 Vals[3]+=ch(Vals[0],Vals[1],Vals[4]);
@@ -907,7 +951,7 @@ Vals[6]+=(rotr(Vals[0],2)^rotr(Vals[0],13)^rotr(Vals[0],22));
 Vals[6]+=Ma(Vals[4],Vals[0],Vals[1]);
 
 W[6]+=(rotr(W[7],7)^rotr(W[7],18)^(W[7]>>3U));
-W[6]+=0x00000100U;
+W[6]+=x00000100U;
 W[6]+=(rotr(W[4],17)^rotr(W[4],19)^(W[4]>>10U));
 Vals[7]+=W[6];
 Vals[7]+=(rotr(Vals[3],6)^rotr(Vals[3],11)^rotr(Vals[3],25));
@@ -917,7 +961,7 @@ Vals[4]+=Vals[7];
 Vals[7]+=(rotr(Vals[6],2)^rotr(Vals[6],13)^rotr(Vals[6],22));
 Vals[7]+=Ma(Vals[1],Vals[6],Vals[0]);
 
-W[7]+=0x11002000U;
+W[7]+=x11002000U;
 W[7]+=W[0];
 W[7]+=(rotr(W[5],17)^rotr(W[5],19)^(W[5]>>10U));
 Vals[5]+=W[7];
@@ -928,7 +972,7 @@ Vals[1]+=Vals[5];
 Vals[5]+=(rotr(Vals[7],2)^rotr(Vals[7],13)^rotr(Vals[7],22));
 Vals[5]+=Ma(Vals[0],Vals[7],Vals[6]);
 
-W[8]=0x80000000U;
+W[8]=x80000000U;
 W[8]+=W[1];
 W[8]+=(rotr(W[6],17)^rotr(W[6],19)^(W[6]>>10U));
 Vals[2]+=W[8];
@@ -989,7 +1033,7 @@ Vals[3]+=Vals[6];
 Vals[6]+=(rotr(Vals[0],2)^rotr(Vals[0],13)^rotr(Vals[0],22));
 Vals[6]+=Ma(Vals[4],Vals[0],Vals[1]);
 
-W[14]=0x00400022U;
+W[14]=x00400022U;
 W[14]+=W[7];
 W[14]+=(rotr(W[12],17)^rotr(W[12],19)^(W[12]>>10U));
 Vals[7]+=W[14];
@@ -1000,7 +1044,7 @@ Vals[4]+=Vals[7];
 Vals[7]+=(rotr(Vals[6],2)^rotr(Vals[6],13)^rotr(Vals[6],22));
 Vals[7]+=Ma(Vals[1],Vals[6],Vals[0]);
 
-W[15]=0x00000100U;
+W[15]=x00000100U;
 W[15]+=(rotr(W[0],7)^rotr(W[0],18)^(W[0]>>3U));
 W[15]+=W[8];
 W[15]+=(rotr(W[13],17)^rotr(W[13],19)^(W[13]>>10U));
@@ -1325,20 +1369,20 @@ Vals[2]+=ch(Vals[1],Vals[4],Vals[3]);
 #define SETFOUND(Xnonce) output[output[FOUND]++] = Xnonce
 
 #if defined(VECTORS2) || defined(VECTORS4)
-	if (any(Vals[2] == 0x136032edU)) {
-		if (Vals[2].x == 0x136032edU)
+	if (any(Vals[2] == x136032edU)) {
+		if (Vals[2].x == x136032edU)
 			SETFOUND(nonce.x);
-		if (Vals[2].y == 0x136032edU)
+		if (Vals[2].y == x136032edU)
 			SETFOUND(nonce.y);
 #if defined(VECTORS4)
-		if (Vals[2].z == 0x136032edU)
+		if (Vals[2].z == x136032edU)
 			SETFOUND(nonce.z);
-		if (Vals[2].w == 0x136032edU)
+		if (Vals[2].w == x136032edU)
 			SETFOUND(nonce.w);
 #endif
 	}
 #else
-	if (Vals[2] == 0x136032edU)
+	if (Vals[2] == x136032edU)
 		SETFOUND(nonce);
 #endif
 }

scrypt121016.cl

@@ -1,18 +1,144 @@
+/*-
+ * Copyright 2009 Colin Percival, 2011 ArtForz, 2011 pooler, 2012 mtrlt,
+ * 2012-2013 Con Kolivas.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
+
+__constant uint ES[2] = { 0x00FF00FF, 0xFF00FF00 };
+__constant uint K[] = {
+	0x428a2f98U,
+	0x71374491U,
+	0xb5c0fbcfU,
+	0xe9b5dba5U,
+	0x3956c25bU,
+	0x59f111f1U,
+	0x923f82a4U,
+	0xab1c5ed5U,
+	0xd807aa98U,
+	0x12835b01U,
+	0x243185beU, // 10
+	0x550c7dc3U,
+	0x72be5d74U,
+	0x80deb1feU,
+	0x9bdc06a7U,
+	0xe49b69c1U,
+	0xefbe4786U,
+	0x0fc19dc6U,
+	0x240ca1ccU,
+	0x2de92c6fU,
+	0x4a7484aaU, // 20
+	0x5cb0a9dcU,
+	0x76f988daU,
+	0x983e5152U,
+	0xa831c66dU,
+	0xb00327c8U,
+	0xbf597fc7U,
+	0xc6e00bf3U,
+	0xd5a79147U,
+	0x06ca6351U,
+	0x14292967U, // 30
+	0x27b70a85U,
+	0x2e1b2138U,
+	0x4d2c6dfcU,
+	0x53380d13U,
+	0x650a7354U,
+	0x766a0abbU,
+	0x81c2c92eU,
+	0x92722c85U,
+	0xa2bfe8a1U,
+	0xa81a664bU, // 40
+	0xc24b8b70U,
+	0xc76c51a3U,
+	0xd192e819U,
+	0xd6990624U,
+	0xf40e3585U,
+	0x106aa070U,
+	0x19a4c116U,
+	0x1e376c08U,
+	0x2748774cU,
+	0x34b0bcb5U, // 50
+	0x391c0cb3U,
+	0x4ed8aa4aU,
+	0x5b9cca4fU,
+	0x682e6ff3U,
+	0x748f82eeU,
+	0x78a5636fU,
+	0x84c87814U,
+	0x8cc70208U,
+	0x90befffaU,
+	0xa4506cebU, // 60
+	0xbef9a3f7U,
+	0xc67178f2U,
+	0x98c7e2a2U,
+	0xfc08884dU,
+	0xcd2a11aeU,
+	0x510e527fU,
+	0x9b05688cU,
+	0xC3910C8EU,
+	0xfb6feee7U,
+	0x2a01a605U, // 70
+	0x0c2e12e0U,
+	0x4498517BU,
+	0x6a09e667U,
+	0xa4ce148bU,
+	0x95F61999U,
+	0xc19bf174U,
+	0xBB67AE85U,
+	0x3C6EF372U,
+	0xA54FF53AU,
+	0x1F83D9ABU, // 80
+	0x5BE0CD19U,
+	0x5C5C5C5CU,
+	0x36363636U,
+	0x80000000U,
+	0x000003FFU,
+	0x00000280U,
+	0x000004a0U,
+	0x00000300U
+};
+
 #define rotl(x,y) rotate(x,y)
 #define Ch(x,y,z) bitselect(z,y,x)
 #define Maj(x,y,z) Ch((x^z),y,z)
 
-#define EndianSwap(n) (rotl(n&0x00FF00FF,24U)|rotl(n&0xFF00FF00,8U))
+#define EndianSwap(n) (rotl(n & ES[0], 24U)|rotl(n & ES[1], 8U))
 
 #define Tr2(x)		(rotl(x, 30U) ^ rotl(x, 19U) ^ rotl(x, 10U))
 #define Tr1(x)		(rotl(x, 26U) ^ rotl(x, 21U) ^ rotl(x, 7U))
 #define Wr2(x)		(rotl(x, 25U) ^ rotl(x, 14U) ^ (x>>3U))
 #define Wr1(x)		(rotl(x, 15U) ^ rotl(x, 13U) ^ (x>>10U))
 
-#define RND(a, b, c, d, e, f, g, h, k)			\
-	h += Tr1(e) + Ch(e, f, g) + k;		\
-	d += h;					\
-	h += Tr2(a) + Maj(a, b, c);
+#define RND(a, b, c, d, e, f, g, h, k)	\
+	h += Tr1(e); 			\
+	h += Ch(e, f, g); 		\
+	h += k;				\
+	d += h;				\
+	h += Tr2(a); 			\
+	h += Maj(a, b, c);
 
 void SHA256(uint4*restrict state0,uint4*restrict state1, const uint4 block0, const uint4 block1, const uint4 block2, const uint4 block3)
 {
@@ -31,184 +157,184 @@ void SHA256(uint4*restrict state0,uint4*restrict state1, const uint4 block0, con
 	uint4 W[4];
 
 	W[ 0].x = block0.x;
-	RND(A,B,C,D,E,F,G,H, W[0].x+0x428a2f98U);
+	RND(A,B,C,D,E,F,G,H, W[0].x+ K[0]);
 	W[ 0].y = block0.y;
-	RND(H,A,B,C,D,E,F,G, W[0].y+0x71374491U);
+	RND(H,A,B,C,D,E,F,G, W[0].y+ K[1]);
 	W[ 0].z = block0.z;
-	RND(G,H,A,B,C,D,E,F, W[0].z+0xb5c0fbcfU);
+	RND(G,H,A,B,C,D,E,F, W[0].z+ K[2]);
 	W[ 0].w = block0.w;
-	RND(F,G,H,A,B,C,D,E, W[0].w+0xe9b5dba5U);
+	RND(F,G,H,A,B,C,D,E, W[0].w+ K[3]);
 
 	W[ 1].x = block1.x;
-	RND(E,F,G,H,A,B,C,D, W[1].x+0x3956c25bU);
+	RND(E,F,G,H,A,B,C,D, W[1].x+ K[4]);
 	W[ 1].y = block1.y;
-	RND(D,E,F,G,H,A,B,C, W[1].y+0x59f111f1U);
+	RND(D,E,F,G,H,A,B,C, W[1].y+ K[5]);
 	W[ 1].z = block1.z;
-	RND(C,D,E,F,G,H,A,B, W[1].z+0x923f82a4U);
+	RND(C,D,E,F,G,H,A,B, W[1].z+ K[6]);
 	W[ 1].w = block1.w;
-	RND(B,C,D,E,F,G,H,A, W[1].w+0xab1c5ed5U);
+	RND(B,C,D,E,F,G,H,A, W[1].w+ K[7]);
 
 	W[ 2].x = block2.x;
-	RND(A,B,C,D,E,F,G,H, W[2].x+0xd807aa98U);
+	RND(A,B,C,D,E,F,G,H, W[2].x+ K[8]);
 	W[ 2].y = block2.y;
-	RND(H,A,B,C,D,E,F,G, W[2].y+0x12835b01U);
+	RND(H,A,B,C,D,E,F,G, W[2].y+ K[9]);
 	W[ 2].z = block2.z;
-	RND(G,H,A,B,C,D,E,F, W[2].z+0x243185beU);
+	RND(G,H,A,B,C,D,E,F, W[2].z+ K[10]);
 	W[ 2].w = block2.w;
-	RND(F,G,H,A,B,C,D,E, W[2].w+0x550c7dc3U);
+	RND(F,G,H,A,B,C,D,E, W[2].w+ K[11]);
 
 	W[ 3].x = block3.x;
-	RND(E,F,G,H,A,B,C,D, W[3].x+0x72be5d74U);
+	RND(E,F,G,H,A,B,C,D, W[3].x+ K[12]);
 	W[ 3].y = block3.y;
-	RND(D,E,F,G,H,A,B,C, W[3].y+0x80deb1feU);
+	RND(D,E,F,G,H,A,B,C, W[3].y+ K[13]);
 	W[ 3].z = block3.z;
-	RND(C,D,E,F,G,H,A,B, W[3].z+0x9bdc06a7U);
+	RND(C,D,E,F,G,H,A,B, W[3].z+ K[14]);
 	W[ 3].w = block3.w;
-	RND(B,C,D,E,F,G,H,A, W[3].w+0xc19bf174U);
+	RND(B,C,D,E,F,G,H,A, W[3].w+ K[76]);
 
 	W[ 0].x += Wr1(W[ 3].z) + W[ 2].y + Wr2(W[ 0].y);
-	RND(A,B,C,D,E,F,G,H, W[0].x+0xe49b69c1U);
+	RND(A,B,C,D,E,F,G,H, W[0].x+ K[15]);
 
 	W[ 0].y += Wr1(W[ 3].w) + W[ 2].z + Wr2(W[ 0].z);
-	RND(H,A,B,C,D,E,F,G, W[0].y+0xefbe4786U);
+	RND(H,A,B,C,D,E,F,G, W[0].y+ K[16]);
 
 	W[ 0].z += Wr1(W[ 0].x) + W[ 2].w + Wr2(W[ 0].w);
-	RND(G,H,A,B,C,D,E,F, W[0].z+0x0fc19dc6U);
+	RND(G,H,A,B,C,D,E,F, W[0].z+ K[17]);
 
 	W[ 0].w += Wr1(W[ 0].y) + W[ 3].x + Wr2(W[ 1].x);
-	RND(F,G,H,A,B,C,D,E, W[0].w+0x240ca1ccU);
+	RND(F,G,H,A,B,C,D,E, W[0].w+ K[18]);
 
 	W[ 1].x += Wr1(W[ 0].z) + W[ 3].y + Wr2(W[ 1].y);
-	RND(E,F,G,H,A,B,C,D, W[1].x+0x2de92c6fU);
+	RND(E,F,G,H,A,B,C,D, W[1].x+ K[19]);
 
 	W[ 1].y += Wr1(W[ 0].w) + W[ 3].z + Wr2(W[ 1].z);
-	RND(D,E,F,G,H,A,B,C, W[1].y+0x4a7484aaU);
+	RND(D,E,F,G,H,A,B,C, W[1].y+ K[20]);
 
 	W[ 1].z += Wr1(W[ 1].x) + W[ 3].w + Wr2(W[ 1].w);
-	RND(C,D,E,F,G,H,A,B, W[1].z+0x5cb0a9dcU);
+	RND(C,D,E,F,G,H,A,B, W[1].z+ K[21]);
 
 	W[ 1].w += Wr1(W[ 1].y) + W[ 0].x + Wr2(W[ 2].x);
-	RND(B,C,D,E,F,G,H,A, W[1].w+0x76f988daU);
+	RND(B,C,D,E,F,G,H,A, W[1].w+ K[22]);
 
 	W[ 2].x += Wr1(W[ 1].z) + W[ 0].y + Wr2(W[ 2].y);
-	RND(A,B,C,D,E,F,G,H, W[2].x+0x983e5152U);
+	RND(A,B,C,D,E,F,G,H, W[2].x+ K[23]);
 
 	W[ 2].y += Wr1(W[ 1].w) + W[ 0].z + Wr2(W[ 2].z);
-	RND(H,A,B,C,D,E,F,G, W[2].y+0xa831c66dU);
+	RND(H,A,B,C,D,E,F,G, W[2].y+ K[24]);
 
 	W[ 2].z += Wr1(W[ 2].x) + W[ 0].w + Wr2(W[ 2].w);
-	RND(G,H,A,B,C,D,E,F, W[2].z+0xb00327c8U);
+	RND(G,H,A,B,C,D,E,F, W[2].z+ K[25]);
 
 	W[ 2].w += Wr1(W[ 2].y) + W[ 1].x + Wr2(W[ 3].x);
-	RND(F,G,H,A,B,C,D,E, W[2].w+0xbf597fc7U);
+	RND(F,G,H,A,B,C,D,E, W[2].w+ K[26]);
 
 	W[ 3].x += Wr1(W[ 2].z) + W[ 1].y + Wr2(W[ 3].y);
-	RND(E,F,G,H,A,B,C,D, W[3].x+0xc6e00bf3U);
+	RND(E,F,G,H,A,B,C,D, W[3].x+ K[27]);
 
 	W[ 3].y += Wr1(W[ 2].w) + W[ 1].z + Wr2(W[ 3].z);
-	RND(D,E,F,G,H,A,B,C, W[3].y+0xd5a79147U);
+	RND(D,E,F,G,H,A,B,C, W[3].y+ K[28]);
 
 	W[ 3].z += Wr1(W[ 3].x) + W[ 1].w + Wr2(W[ 3].w);
-	RND(C,D,E,F,G,H,A,B, W[3].z+0x06ca6351U);
+	RND(C,D,E,F,G,H,A,B, W[3].z+ K[29]);
 
 	W[ 3].w += Wr1(W[ 3].y) + W[ 2].x + Wr2(W[ 0].x);
-	RND(B,C,D,E,F,G,H,A, W[3].w+0x14292967U);
+	RND(B,C,D,E,F,G,H,A, W[3].w+ K[30]);
 
 	W[ 0].x += Wr1(W[ 3].z) + W[ 2].y + Wr2(W[ 0].y);
-	RND(A,B,C,D,E,F,G,H, W[0].x+0x27b70a85U);
+	RND(A,B,C,D,E,F,G,H, W[0].x+ K[31]);
 
 	W[ 0].y += Wr1(W[ 3].w) + W[ 2].z + Wr2(W[ 0].z);
-	RND(H,A,B,C,D,E,F,G, W[0].y+0x2e1b2138U);
+	RND(H,A,B,C,D,E,F,G, W[0].y+ K[32]);
 
 	W[ 0].z += Wr1(W[ 0].x) + W[ 2].w + Wr2(W[ 0].w);
-	RND(G,H,A,B,C,D,E,F, W[0].z+0x4d2c6dfcU);
+	RND(G,H,A,B,C,D,E,F, W[0].z+ K[33]);
 
 	W[ 0].w += Wr1(W[ 0].y) + W[ 3].x + Wr2(W[ 1].x);
-	RND(F,G,H,A,B,C,D,E, W[0].w+0x53380d13U);
+	RND(F,G,H,A,B,C,D,E, W[0].w+ K[34]);
 
 	W[ 1].x += Wr1(W[ 0].z) + W[ 3].y + Wr2(W[ 1].y);
-	RND(E,F,G,H,A,B,C,D, W[1].x+0x650a7354U);
+	RND(E,F,G,H,A,B,C,D, W[1].x+ K[35]);
 
 	W[ 1].y += Wr1(W[ 0].w) + W[ 3].z + Wr2(W[ 1].z);
-	RND(D,E,F,G,H,A,B,C, W[1].y+0x766a0abbU);
+	RND(D,E,F,G,H,A,B,C, W[1].y+ K[36]);
 
 	W[ 1].z += Wr1(W[ 1].x) + W[ 3].w + Wr2(W[ 1].w);
-	RND(C,D,E,F,G,H,A,B, W[1].z+0x81c2c92eU);
+	RND(C,D,E,F,G,H,A,B, W[1].z+ K[37]);
 
 	W[ 1].w += Wr1(W[ 1].y) + W[ 0].x + Wr2(W[ 2].x);
-	RND(B,C,D,E,F,G,H,A, W[1].w+0x92722c85U);
+	RND(B,C,D,E,F,G,H,A, W[1].w+ K[38]);
 
 	W[ 2].x += Wr1(W[ 1].z) + W[ 0].y + Wr2(W[ 2].y);
-	RND(A,B,C,D,E,F,G,H, W[2].x+0xa2bfe8a1U);
+	RND(A,B,C,D,E,F,G,H, W[2].x+ K[39]);
 
 	W[ 2].y += Wr1(W[ 1].w) + W[ 0].z + Wr2(W[ 2].z);
-	RND(H,A,B,C,D,E,F,G, W[2].y+0xa81a664bU);
+	RND(H,A,B,C,D,E,F,G, W[2].y+ K[40]);
 
 	W[ 2].z += Wr1(W[ 2].x) + W[ 0].w + Wr2(W[ 2].w);
-	RND(G,H,A,B,C,D,E,F, W[2].z+0xc24b8b70U);
+	RND(G,H,A,B,C,D,E,F, W[2].z+ K[41]);
 
 	W[ 2].w += Wr1(W[ 2].y) + W[ 1].x + Wr2(W[ 3].x);
-	RND(F,G,H,A,B,C,D,E, W[2].w+0xc76c51a3U);
+	RND(F,G,H,A,B,C,D,E, W[2].w+ K[42]);
 
 	W[ 3].x += Wr1(W[ 2].z) + W[ 1].y + Wr2(W[ 3].y);
-	RND(E,F,G,H,A,B,C,D, W[3].x+0xd192e819U);
+	RND(E,F,G,H,A,B,C,D, W[3].x+ K[43]);
 
 	W[ 3].y += Wr1(W[ 2].w) + W[ 1].z + Wr2(W[ 3].z);
-	RND(D,E,F,G,H,A,B,C, W[3].y+0xd6990624U);
+	RND(D,E,F,G,H,A,B,C, W[3].y+ K[44]);
 
 	W[ 3].z += Wr1(W[ 3].x) + W[ 1].w + Wr2(W[ 3].w);
-	RND(C,D,E,F,G,H,A,B, W[3].z+0xf40e3585U);
+	RND(C,D,E,F,G,H,A,B, W[3].z+ K[45]);
 
 	W[ 3].w += Wr1(W[ 3].y) + W[ 2].x + Wr2(W[ 0].x);
-	RND(B,C,D,E,F,G,H,A, W[3].w+0x106aa070U);
+	RND(B,C,D,E,F,G,H,A, W[3].w+ K[46]);
 
 	W[ 0].x += Wr1(W[ 3].z) + W[ 2].y + Wr2(W[ 0].y);
-	RND(A,B,C,D,E,F,G,H, W[0].x+0x19a4c116U);
+	RND(A,B,C,D,E,F,G,H, W[0].x+ K[47]);
 
 	W[ 0].y += Wr1(W[ 3].w) + W[ 2].z + Wr2(W[ 0].z);
-	RND(H,A,B,C,D,E,F,G, W[0].y+0x1e376c08U);
+	RND(H,A,B,C,D,E,F,G, W[0].y+ K[48]);
 
 	W[ 0].z += Wr1(W[ 0].x) + W[ 2].w + Wr2(W[ 0].w);
-	RND(G,H,A,B,C,D,E,F, W[0].z+0x2748774cU);
+	RND(G,H,A,B,C,D,E,F, W[0].z+ K[49]);
 
 	W[ 0].w += Wr1(W[ 0].y) + W[ 3].x + Wr2(W[ 1].x);
-	RND(F,G,H,A,B,C,D,E, W[0].w+0x34b0bcb5U);
+	RND(F,G,H,A,B,C,D,E, W[0].w+ K[50]);
 
 	W[ 1].x += Wr1(W[ 0].z) + W[ 3].y + Wr2(W[ 1].y);
-	RND(E,F,G,H,A,B,C,D, W[1].x+0x391c0cb3U);
+	RND(E,F,G,H,A,B,C,D, W[1].x+ K[51]);
 
 	W[ 1].y += Wr1(W[ 0].w) + W[ 3].z + Wr2(W[ 1].z);
-	RND(D,E,F,G,H,A,B,C, W[1].y+0x4ed8aa4aU);
+	RND(D,E,F,G,H,A,B,C, W[1].y+ K[52]);
 
 	W[ 1].z += Wr1(W[ 1].x) + W[ 3].w + Wr2(W[ 1].w);
-	RND(C,D,E,F,G,H,A,B, W[1].z+0x5b9cca4fU);
+	RND(C,D,E,F,G,H,A,B, W[1].z+ K[53]);
 
 	W[ 1].w += Wr1(W[ 1].y) + W[ 0].x + Wr2(W[ 2].x);
-	RND(B,C,D,E,F,G,H,A, W[1].w+0x682e6ff3U);
+	RND(B,C,D,E,F,G,H,A, W[1].w+ K[54]);
 
 	W[ 2].x += Wr1(W[ 1].z) + W[ 0].y + Wr2(W[ 2].y);
-	RND(A,B,C,D,E,F,G,H, W[2].x+0x748f82eeU);
+	RND(A,B,C,D,E,F,G,H, W[2].x+ K[55]);
 
 	W[ 2].y += Wr1(W[ 1].w) + W[ 0].z + Wr2(W[ 2].z);
-	RND(H,A,B,C,D,E,F,G, W[2].y+0x78a5636fU);
+	RND(H,A,B,C,D,E,F,G, W[2].y+ K[56]);
 
 	W[ 2].z += Wr1(W[ 2].x) + W[ 0].w + Wr2(W[ 2].w);
-	RND(G,H,A,B,C,D,E,F, W[2].z+0x84c87814U);
+	RND(G,H,A,B,C,D,E,F, W[2].z+ K[57]);
 
 	W[ 2].w += Wr1(W[ 2].y) + W[ 1].x + Wr2(W[ 3].x);
-	RND(F,G,H,A,B,C,D,E, W[2].w+0x8cc70208U);
+	RND(F,G,H,A,B,C,D,E, W[2].w+ K[58]);
 
 	W[ 3].x += Wr1(W[ 2].z) + W[ 1].y + Wr2(W[ 3].y);
-	RND(E,F,G,H,A,B,C,D, W[3].x+0x90befffaU);
+	RND(E,F,G,H,A,B,C,D, W[3].x+ K[59]);
 
 	W[ 3].y += Wr1(W[ 2].w) + W[ 1].z + Wr2(W[ 3].z);
-	RND(D,E,F,G,H,A,B,C, W[3].y+0xa4506cebU);
+	RND(D,E,F,G,H,A,B,C, W[3].y+ K[60]);
 
 	W[ 3].z += Wr1(W[ 3].x) + W[ 1].w + Wr2(W[ 3].w);
-	RND(C,D,E,F,G,H,A,B, W[3].z+0xbef9a3f7U);
+	RND(C,D,E,F,G,H,A,B, W[3].z+ K[61]);
 
 	W[ 3].w += Wr1(W[ 3].y) + W[ 2].x + Wr2(W[ 0].x);
-	RND(B,C,D,E,F,G,H,A, W[3].w+0xc67178f2U);
+	RND(B,C,D,E,F,G,H,A, W[3].w+ K[62]);
 	
 #undef A
 #undef B
@@ -237,191 +363,191 @@ void SHA256_fresh(uint4*restrict state0,uint4*restrict state1, const uint4 block
 	uint4 W[4];
 
 	W[0].x = block0.x;
-	D=0x98c7e2a2U+W[0].x;
-	H=0xfc08884dU+W[0].x;
+	D= K[63] +W[0].x;
+	H= K[64] +W[0].x;
 
 	W[0].y = block0.y;
-	C=0xcd2a11aeU+Tr1(D)+Ch(D,0x510e527fU,0x9b05688cU)+W[0].y;
-	G=0xC3910C8EU+C+Tr2(H)+Ch(H,0xfb6feee7U,0x2a01a605U);
+	C= K[65] +Tr1(D)+Ch(D, K[66], K[67])+W[0].y;
+	G= K[68] +C+Tr2(H)+Ch(H, K[69] ,K[70]);
 
 	W[0].z = block0.z;
-	B=0x0c2e12e0U+Tr1(C)+Ch(C,D,0x510e527fU)+W[0].z;
-	F=0x4498517BU+B+Tr2(G)+Maj(G,H,0x6a09e667U);
+	B= K[71] +Tr1(C)+Ch(C,D,K[66])+W[0].z;
+	F= K[72] +B+Tr2(G)+Maj(G,H, K[73]);
 
 	W[0].w = block0.w;
-	A=0xa4ce148bU+Tr1(B)+Ch(B,C,D)+W[0].w; 
-	E=0x95F61999U+A+Tr2(F)+Maj(F,G,H);
+	A= K[74] +Tr1(B)+Ch(B,C,D)+W[0].w;
+	E= K[75] +A+Tr2(F)+Maj(F,G,H);
 
 	W[1].x = block1.x;
-	RND(E,F,G,H,A,B,C,D, W[1].x+0x3956c25bU);
+	RND(E,F,G,H,A,B,C,D, W[1].x+ K[4]);
 	W[1].y = block1.y;
-	RND(D,E,F,G,H,A,B,C, W[1].y+0x59f111f1U);
+	RND(D,E,F,G,H,A,B,C, W[1].y+ K[5]);
 	W[1].z = block1.z;
-	RND(C,D,E,F,G,H,A,B, W[1].z+0x923f82a4U);
+	RND(C,D,E,F,G,H,A,B, W[1].z+ K[6]);
 	W[1].w = block1.w;
-	RND(B,C,D,E,F,G,H,A, W[1].w+0xab1c5ed5U);
+	RND(B,C,D,E,F,G,H,A, W[1].w+ K[7]);
 	
 	W[2].x = block2.x;
-	RND(A,B,C,D,E,F,G,H, W[2].x+0xd807aa98U);
+	RND(A,B,C,D,E,F,G,H, W[2].x+ K[8]);
 	W[2].y = block2.y;
-	RND(H,A,B,C,D,E,F,G, W[2].y+0x12835b01U);
+	RND(H,A,B,C,D,E,F,G, W[2].y+ K[9]);
 	W[2].z = block2.z;
-	RND(G,H,A,B,C,D,E,F, W[2].z+0x243185beU);
+	RND(G,H,A,B,C,D,E,F, W[2].z+ K[10]);
 	W[2].w = block2.w;
-	RND(F,G,H,A,B,C,D,E, W[2].w+0x550c7dc3U);
+	RND(F,G,H,A,B,C,D,E, W[2].w+ K[11]);
 	
 	W[3].x = block3.x;
-	RND(E,F,G,H,A,B,C,D, W[3].x+0x72be5d74U);
+	RND(E,F,G,H,A,B,C,D, W[3].x+ K[12]);
 	W[3].y = block3.y;
-	RND(D,E,F,G,H,A,B,C, W[3].y+0x80deb1feU);
+	RND(D,E,F,G,H,A,B,C, W[3].y+ K[13]);
 	W[3].z = block3.z;
-	RND(C,D,E,F,G,H,A,B, W[3].z+0x9bdc06a7U);
+	RND(C,D,E,F,G,H,A,B, W[3].z+ K[14]);
 	W[3].w = block3.w;
-	RND(B,C,D,E,F,G,H,A, W[3].w+0xc19bf174U);
+	RND(B,C,D,E,F,G,H,A, W[3].w+ K[76]);
 
 	W[0].x += Wr1(W[3].z) + W[2].y + Wr2(W[0].y);
-	RND(A,B,C,D,E,F,G,H, W[0].x+0xe49b69c1U);
+	RND(A,B,C,D,E,F,G,H, W[0].x+ K[15]);
 
 	W[0].y += Wr1(W[3].w) + W[2].z + Wr2(W[0].z);
-	RND(H,A,B,C,D,E,F,G, W[0].y+0xefbe4786U);
+	RND(H,A,B,C,D,E,F,G, W[0].y+ K[16]);
 
 	W[0].z += Wr1(W[0].x) + W[2].w + Wr2(W[0].w);
-	RND(G,H,A,B,C,D,E,F, W[0].z+0x0fc19dc6U);
+	RND(G,H,A,B,C,D,E,F, W[0].z+ K[17]);
 
 	W[0].w += Wr1(W[0].y) + W[3].x + Wr2(W[1].x);
-	RND(F,G,H,A,B,C,D,E, W[0].w+0x240ca1ccU);
+	RND(F,G,H,A,B,C,D,E, W[0].w+ K[18]);
 
 	W[1].x += Wr1(W[0].z) + W[3].y + Wr2(W[1].y);
-	RND(E,F,G,H,A,B,C,D, W[1].x+0x2de92c6fU);
+	RND(E,F,G,H,A,B,C,D, W[1].x+ K[19]);
 
 	W[1].y += Wr1(W[0].w) + W[3].z + Wr2(W[1].z);
-	RND(D,E,F,G,H,A,B,C, W[1].y+0x4a7484aaU);
+	RND(D,E,F,G,H,A,B,C, W[1].y+ K[20]);
 
 	W[1].z += Wr1(W[1].x) + W[3].w + Wr2(W[1].w);
-	RND(C,D,E,F,G,H,A,B, W[1].z+0x5cb0a9dcU);
+	RND(C,D,E,F,G,H,A,B, W[1].z+ K[21]);
 
 	W[1].w += Wr1(W[1].y) + W[0].x + Wr2(W[2].x);
-	RND(B,C,D,E,F,G,H,A, W[1].w+0x76f988daU);
+	RND(B,C,D,E,F,G,H,A, W[1].w+ K[22]);
 
 	W[2].x += Wr1(W[1].z) + W[0].y + Wr2(W[2].y);
-	RND(A,B,C,D,E,F,G,H, W[2].x+0x983e5152U);
+	RND(A,B,C,D,E,F,G,H, W[2].x+ K[23]);
 
 	W[2].y += Wr1(W[1].w) + W[0].z + Wr2(W[2].z);
-	RND(H,A,B,C,D,E,F,G, W[2].y+0xa831c66dU);
+	RND(H,A,B,C,D,E,F,G, W[2].y+ K[24]);
 
 	W[2].z += Wr1(W[2].x) + W[0].w + Wr2(W[2].w);
-	RND(G,H,A,B,C,D,E,F, W[2].z+0xb00327c8U);
+	RND(G,H,A,B,C,D,E,F, W[2].z+ K[25]);
 
 	W[2].w += Wr1(W[2].y) + W[1].x + Wr2(W[3].x);
-	RND(F,G,H,A,B,C,D,E, W[2].w+0xbf597fc7U);
+	RND(F,G,H,A,B,C,D,E, W[2].w+ K[26]);
 
 	W[3].x += Wr1(W[2].z) + W[1].y + Wr2(W[3].y);
-	RND(E,F,G,H,A,B,C,D, W[3].x+0xc6e00bf3U);
+	RND(E,F,G,H,A,B,C,D, W[3].x+ K[27]);
 
 	W[3].y += Wr1(W[2].w) + W[1].z + Wr2(W[3].z);
-	RND(D,E,F,G,H,A,B,C, W[3].y+0xd5a79147U);
+	RND(D,E,F,G,H,A,B,C, W[3].y+ K[28]);
 
 	W[3].z += Wr1(W[3].x) + W[1].w + Wr2(W[3].w);
-	RND(C,D,E,F,G,H,A,B, W[3].z+0x06ca6351U);
+	RND(C,D,E,F,G,H,A,B, W[3].z+ K[29]);
 
 	W[3].w += Wr1(W[3].y) + W[2].x + Wr2(W[0].x);
-	RND(B,C,D,E,F,G,H,A, W[3].w+0x14292967U);
+	RND(B,C,D,E,F,G,H,A, W[3].w+ K[30]);
 
 	W[0].x += Wr1(W[3].z) + W[2].y + Wr2(W[0].y);
-	RND(A,B,C,D,E,F,G,H, W[0].x+0x27b70a85U);
+	RND(A,B,C,D,E,F,G,H, W[0].x+ K[31]);
 
 	W[0].y += Wr1(W[3].w) + W[2].z + Wr2(W[0].z);
-	RND(H,A,B,C,D,E,F,G, W[0].y+0x2e1b2138U);
+	RND(H,A,B,C,D,E,F,G, W[0].y+ K[32]);
 
 	W[0].z += Wr1(W[0].x) + W[2].w + Wr2(W[0].w);
-	RND(G,H,A,B,C,D,E,F, W[0].z+0x4d2c6dfcU);
+	RND(G,H,A,B,C,D,E,F, W[0].z+ K[33]);
 
 	W[0].w += Wr1(W[0].y) + W[3].x + Wr2(W[1].x);
-	RND(F,G,H,A,B,C,D,E, W[0].w+0x53380d13U);
+	RND(F,G,H,A,B,C,D,E, W[0].w+ K[34]);
 
 	W[1].x += Wr1(W[0].z) + W[3].y + Wr2(W[1].y);
-	RND(E,F,G,H,A,B,C,D, W[1].x+0x650a7354U);
+	RND(E,F,G,H,A,B,C,D, W[1].x+ K[35]);
 
 	W[1].y += Wr1(W[0].w) + W[3].z + Wr2(W[1].z);
-	RND(D,E,F,G,H,A,B,C, W[1].y+0x766a0abbU);
+	RND(D,E,F,G,H,A,B,C, W[1].y+ K[36]);
 
 	W[1].z += Wr1(W[1].x) + W[3].w + Wr2(W[1].w);
-	RND(C,D,E,F,G,H,A,B, W[1].z+0x81c2c92eU);
+	RND(C,D,E,F,G,H,A,B, W[1].z+ K[37]);
 
 	W[1].w += Wr1(W[1].y) + W[0].x + Wr2(W[2].x);
-	RND(B,C,D,E,F,G,H,A, W[1].w+0x92722c85U);
+	RND(B,C,D,E,F,G,H,A, W[1].w+ K[38]);
 
 	W[2].x += Wr1(W[1].z) + W[0].y + Wr2(W[2].y);
-	RND(A,B,C,D,E,F,G,H, W[2].x+0xa2bfe8a1U);
+	RND(A,B,C,D,E,F,G,H, W[2].x+ K[39]);
 
 	W[2].y += Wr1(W[1].w) + W[0].z + Wr2(W[2].z);
-	RND(H,A,B,C,D,E,F,G, W[2].y+0xa81a664bU);
+	RND(H,A,B,C,D,E,F,G, W[2].y+ K[40]);
 
 	W[2].z += Wr1(W[2].x) + W[0].w + Wr2(W[2].w);
-	RND(G,H,A,B,C,D,E,F, W[2].z+0xc24b8b70U);
+	RND(G,H,A,B,C,D,E,F, W[2].z+ K[41]);
 
 	W[2].w += Wr1(W[2].y) + W[1].x + Wr2(W[3].x);
-	RND(F,G,H,A,B,C,D,E, W[2].w+0xc76c51a3U);
+	RND(F,G,H,A,B,C,D,E, W[2].w+ K[42]);
 
 	W[3].x += Wr1(W[2].z) + W[1].y + Wr2(W[3].y);
-	RND(E,F,G,H,A,B,C,D, W[3].x+0xd192e819U);
+	RND(E,F,G,H,A,B,C,D, W[3].x+ K[43]);
 
 	W[3].y += Wr1(W[2].w) + W[1].z + Wr2(W[3].z);
-	RND(D,E,F,G,H,A,B,C, W[3].y+0xd6990624U);
+	RND(D,E,F,G,H,A,B,C, W[3].y+ K[44]);
 
 	W[3].z += Wr1(W[3].x) + W[1].w + Wr2(W[3].w);
-	RND(C,D,E,F,G,H,A,B, W[3].z+0xf40e3585U);
+	RND(C,D,E,F,G,H,A,B, W[3].z+ K[45]);
 
 	W[3].w += Wr1(W[3].y) + W[2].x + Wr2(W[0].x);
-	RND(B,C,D,E,F,G,H,A, W[3].w+0x106aa070U);
+	RND(B,C,D,E,F,G,H,A, W[3].w+ K[46]);
 
 	W[0].x += Wr1(W[3].z) + W[2].y + Wr2(W[0].y);
-	RND(A,B,C,D,E,F,G,H, W[0].x+0x19a4c116U);
+	RND(A,B,C,D,E,F,G,H, W[0].x+ K[47]);
 
 	W[0].y += Wr1(W[3].w) + W[2].z + Wr2(W[0].z);
-	RND(H,A,B,C,D,E,F,G, W[0].y+0x1e376c08U);
+	RND(H,A,B,C,D,E,F,G, W[0].y+ K[48]);
 
 	W[0].z += Wr1(W[0].x) + W[2].w + Wr2(W[0].w);
-	RND(G,H,A,B,C,D,E,F, W[0].z+0x2748774cU);
+	RND(G,H,A,B,C,D,E,F, W[0].z+ K[49]);
 
 	W[0].w += Wr1(W[0].y) + W[3].x + Wr2(W[1].x);
-	RND(F,G,H,A,B,C,D,E, W[0].w+0x34b0bcb5U);
+	RND(F,G,H,A,B,C,D,E, W[0].w+ K[50]);
 
 	W[1].x += Wr1(W[0].z) + W[3].y + Wr2(W[1].y);
-	RND(E,F,G,H,A,B,C,D, W[1].x+0x391c0cb3U);
+	RND(E,F,G,H,A,B,C,D, W[1].x+ K[51]);
 
 	W[1].y += Wr1(W[0].w) + W[3].z + Wr2(W[1].z);
-	RND(D,E,F,G,H,A,B,C, W[1].y+0x4ed8aa4aU);
+	RND(D,E,F,G,H,A,B,C, W[1].y+ K[52]);
 
 	W[1].z += Wr1(W[1].x) + W[3].w + Wr2(W[1].w);
-	RND(C,D,E,F,G,H,A,B, W[1].z+0x5b9cca4fU);
+	RND(C,D,E,F,G,H,A,B, W[1].z+ K[53]);
 
 	W[1].w += Wr1(W[1].y) + W[0].x + Wr2(W[2].x);
-	RND(B,C,D,E,F,G,H,A, W[1].w+0x682e6ff3U);
+	RND(B,C,D,E,F,G,H,A, W[1].w+ K[54]);
 
 	W[2].x += Wr1(W[1].z) + W[0].y + Wr2(W[2].y);
-	RND(A,B,C,D,E,F,G,H, W[2].x+0x748f82eeU);
+	RND(A,B,C,D,E,F,G,H, W[2].x+ K[55]);
 
 	W[2].y += Wr1(W[1].w) + W[0].z + Wr2(W[2].z);
-	RND(H,A,B,C,D,E,F,G, W[2].y+0x78a5636fU);
+	RND(H,A,B,C,D,E,F,G, W[2].y+ K[56]);
 
 	W[2].z += Wr1(W[2].x) + W[0].w + Wr2(W[2].w);
-	RND(G,H,A,B,C,D,E,F, W[2].z+0x84c87814U);
+	RND(G,H,A,B,C,D,E,F, W[2].z+ K[57]);
 
 	W[2].w += Wr1(W[2].y) + W[1].x + Wr2(W[3].x);
-	RND(F,G,H,A,B,C,D,E, W[2].w+0x8cc70208U);
+	RND(F,G,H,A,B,C,D,E, W[2].w+ K[58]);
 
 	W[3].x += Wr1(W[2].z) + W[1].y + Wr2(W[3].y);
-	RND(E,F,G,H,A,B,C,D, W[3].x+0x90befffaU);
+	RND(E,F,G,H,A,B,C,D, W[3].x+ K[59]);
 
 	W[3].y += Wr1(W[2].w) + W[1].z + Wr2(W[3].z);
-	RND(D,E,F,G,H,A,B,C, W[3].y+0xa4506cebU);
+	RND(D,E,F,G,H,A,B,C, W[3].y+ K[60]);
 
 	W[3].z += Wr1(W[3].x) + W[1].w + Wr2(W[3].w);
-	RND(C,D,E,F,G,H,A,B, W[3].z+0xbef9a3f7U);
+	RND(C,D,E,F,G,H,A,B, W[3].z+ K[61]);
 
 	W[3].w += Wr1(W[3].y) + W[2].x + Wr2(W[0].x);
-	RND(B,C,D,E,F,G,H,A, W[3].w+0xc67178f2U);
+	RND(B,C,D,E,F,G,H,A, W[3].w+ K[62]);
 	
 #undef A
 #undef B
@@ -432,8 +558,8 @@ void SHA256_fresh(uint4*restrict state0,uint4*restrict state1, const uint4 block
 #undef G
 #undef H
 
-	*state0 += (uint4)(0x6A09E667U,0xBB67AE85U,0x3C6EF372U,0xA54FF53AU);
-	*state1 += (uint4)(0x510E527FU,0x9B05688CU,0x1F83D9ABU,0x5BE0CD19U);
+	*state0 += (uint4)(K[73], K[77], K[78], K[79]);
+	*state1 += (uint4)(K[66], K[67], K[80], K[81]);
 }
 
 __constant uint fixedW[64] =
@@ -658,7 +784,7 @@ void scrypt_core(uint4 X[8], __global uint4*restrict lookup)
 	for (uint i=0; i<1024; ++i) 
 	{
 		uint4 V[8];
-		uint j = X[7].x & 0x3FF;
+		uint j = X[7].x & K[85];
 		uint y = (j/LOOKUP_GAP);
 #pragma unroll
 		for(uint z=0; z<zSIZE; ++z)
@@ -696,9 +822,9 @@ const uint4 midstate0, const uint4 midstate16, const uint target)
 	uint4 data = (uint4)(input[4].x,input[4].y,input[4].z,gid);
 	uint4 pad0 = midstate0, pad1 = midstate16;
 
-	SHA256(&pad0,&pad1, data, (uint4)(0x80000000U,0,0,0), (uint4)(0,0,0,0), (uint4)(0,0,0,0x280));
-	SHA256_fresh(&ostate0,&ostate1, pad0^0x5C5C5C5CU, pad1^0x5C5C5C5CU, 0x5C5C5C5CU, 0x5C5C5C5CU);
-	SHA256_fresh(&tstate0,&tstate1, pad0^0x36363636U, pad1^0x36363636U, 0x36363636U, 0x36363636U);
+	SHA256(&pad0,&pad1, data, (uint4)(K[84],0,0,0), (uint4)(0,0,0,0), (uint4)(0,0,0, K[86]));
+	SHA256_fresh(&ostate0,&ostate1, pad0^ K[82], pad1^ K[82], K[82], K[82]);
+	SHA256_fresh(&tstate0,&tstate1, pad0^ K[83], pad1^ K[83], K[83], K[83]);
 
 	tmp0 = tstate0;
 	tmp1 = tstate1;
@@ -712,46 +838,16 @@ const uint4 midstate0, const uint4 midstate16, const uint target)
 		X[i*2 ] = ostate0;
 		X[i*2+1] = ostate1;
 
-		SHA256(&pad0,&pad1, data, (uint4)(i+1,0x80000000U,0,0), (uint4)(0,0,0,0), (uint4)(0,0,0,0x4a0U));
-		SHA256(X+i*2,X+i*2+1, pad0, pad1, (uint4)(0x80000000U, 0U, 0U, 0U), (uint4)(0U, 0U, 0U, 0x300U));
+		SHA256(&pad0,&pad1, data, (uint4)(i+1,K[84],0,0), (uint4)(0,0,0,0), (uint4)(0,0,0, K[87]));
+		SHA256(X+i*2,X+i*2+1, pad0, pad1, (uint4)(K[84], 0U, 0U, 0U), (uint4)(0U, 0U, 0U, K[88]));
 	}
 	scrypt_core(X,padcache);
 	SHA256(&tmp0,&tmp1, X[0], X[1], X[2], X[3]);
 	SHA256(&tmp0,&tmp1, X[4], X[5], X[6], X[7]);
 	SHA256_fixed(&tmp0,&tmp1);
-	SHA256(&ostate0,&ostate1, tmp0, tmp1, (uint4)(0x80000000U, 0U, 0U, 0U), (uint4)(0U, 0U, 0U, 0x300U));
+	SHA256(&ostate0,&ostate1, tmp0, tmp1, (uint4)(K[84], 0U, 0U, 0U), (uint4)(0U, 0U, 0U, K[88]));
 
 	bool result = (EndianSwap(ostate1.w) <= target);
 	if (result)
 		SETFOUND(gid);
 }
-
-/*-
- * Copyright 2009 Colin Percival, 2011 ArtForz, 2011 pooler, 2012 mtrlt,
- * 2012 Con Kolivas.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file was originally written by Colin Percival as part of the Tarsnap
- * online backup system.
- */