diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2022-01-20 17:26:00 +0100 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2022-01-28 09:43:55 +0100 |
| commit | c2b79342506e24e9b7100fb7a6025dc870375ef6 (patch) | |
| tree | eafaa6401957e3e66e0cca1eca1596a3e8b48789 /src/crypto/sha256.cpp | |
| parent | d4e92d843650b0480b86d15ce46ed02b6fd9b5be (diff) | |
| download | bitcoin-c2b79342506e24e9b7100fb7a6025dc870375ef6.tar.xz | |
Rename SHANI to X86_SHANI to allow future implementation of ARM_SHANI
Diffstat (limited to 'src/crypto/sha256.cpp')
| -rw-r--r-- | src/crypto/sha256.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index e35d526d35..48ee121e2d 100644 --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -29,12 +29,12 @@ namespace sha256d64_avx2 void Transform_8way(unsigned char* out, const unsigned char* in); } -namespace sha256d64_shani +namespace sha256d64_x86_shani { void Transform_2way(unsigned char* out, const unsigned char* in); } -namespace sha256_shani +namespace sha256_x86_shani { void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks); } @@ -567,7 +567,7 @@ std::string SHA256AutoDetect() bool have_xsave = false; bool have_avx = false; bool have_avx2 = false; - bool have_shani = false; + bool have_x86_shani = false; bool enabled_avx = false; (void)AVXEnabled; @@ -575,7 +575,7 @@ std::string SHA256AutoDetect() (void)have_avx; (void)have_xsave; (void)have_avx2; - (void)have_shani; + (void)have_x86_shani; (void)enabled_avx; uint32_t eax, ebx, ecx, edx; @@ -589,15 +589,15 @@ std::string SHA256AutoDetect() if (have_sse4) { GetCPUID(7, 0, eax, ebx, ecx, edx); have_avx2 = (ebx >> 5) & 1; - have_shani = (ebx >> 29) & 1; + have_x86_shani = (ebx >> 29) & 1; } -#if defined(ENABLE_SHANI) && !defined(BUILD_BITCOIN_INTERNAL) - if (have_shani) { - Transform = sha256_shani::Transform; - TransformD64 = TransformD64Wrapper<sha256_shani::Transform>; - TransformD64_2way = sha256d64_shani::Transform_2way; - ret = "shani(1way,2way)"; +#if defined(ENABLE_X86_SHANI) && !defined(BUILD_BITCOIN_INTERNAL) + if (have_x86_shani) { + Transform = sha256_x86_shani::Transform; + TransformD64 = TransformD64Wrapper<sha256_x86_shani::Transform>; + TransformD64_2way = sha256d64_x86_shani::Transform_2way; + ret = "x86_shani(1way,2way)"; have_sse4 = false; // Disable SSE4/AVX2; have_avx2 = false; } |