From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 15 Jan 2013 20:50:41 +0000 (+0100)
Subject: sha3: tweak choice of a fast code path for 64-bit
X-Git-Tag: 1_21_0~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8e7312e12fb088ba99f4f875903926f2ef9ed235;p=oweals%2Fbusybox.git

sha3: tweak choice of a fast code path for 64-bit

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 18e426079..7ae0b6385 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -1057,7 +1057,7 @@ static void KeccakF(uint64_t *state)
 
 		/* Chi */
 		for (y = 0; y <= 20; y += 5) {
-			if (SHA3_SMALL) {
+			if (SHA3_SMALL && !ARCH_IS_64BIT) {
 				uint64_t BC[5];
 				BC[0] = state[y + 0];
 				BC[1] = state[y + 1];
@@ -1071,6 +1071,7 @@ static void KeccakF(uint64_t *state)
 				}
 			} else {
 				/* 32-bit x86: +50 bytes code, 10% faster */
+				/* 64-bit x86: ~same code size, 30% faster */
 				uint64_t BC0, BC1, BC2, BC3, BC4;
 				BC0 = state[y + 0];
 				BC1 = state[y + 1];