diff options
| author | Lars Viklund <zao@zao.se> | 2017-11-01 12:23:09 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2017-11-01 12:23:09 (GMT) |
| commit | 388cd85e51aa9c73f8e7f35f0d06c258be7b579c (patch) | |
| tree | fa83ac45fc6ccc3dc207e0d1e4805f33ee32e1ab /Modules/_blake2 | |
| parent | 8bc7d63560024681dce9f40445f2877b2987e92c (diff) | |
| download | cpython-388cd85e51aa9c73f8e7f35f0d06c258be7b579c.zip cpython-388cd85e51aa9c73f8e7f35f0d06c258be7b579c.tar.gz cpython-388cd85e51aa9c73f8e7f35f0d06c258be7b579c.tar.bz2 | |
Remove nested comments in blake2 (#4173)
Replace occurence of nested comments in blake2 reference implementation
with preprocessor directive for disabling unused code.
`blake2s-load-xop.h` is conditionally pulled in only on chips with XOP
support, among others the AMD Bulldozer. The malformed comments in the
source file breaks the build of `hashlib`'s `_blake2` on GCC 6.3.0.
Official reference code on github uses `#if` so this change should be
uncontroversial.
Diffstat (limited to 'Modules/_blake2')
| -rw-r--r-- | Modules/_blake2/impl/blake2s-load-xop.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/_blake2/impl/blake2s-load-xop.h b/Modules/_blake2/impl/blake2s-load-xop.h index a3b5d65..2797722 100644 --- a/Modules/_blake2/impl/blake2s-load-xop.h +++ b/Modules/_blake2/impl/blake2s-load-xop.h @@ -18,8 +18,9 @@ #define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */ +#if 0 /* Basic VPPERM emulation, for testing purposes */ -/*static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const __m128i sel) +static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const __m128i sel) { const __m128i sixteen = _mm_set1_epi8(16); const __m128i t0 = _mm_shuffle_epi8(src1, sel); @@ -27,7 +28,8 @@ const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen), _mm_cmpgt_epi8(sel, sixteen)); /* (>=16) = 0xff : 00 */ return _mm_blendv_epi8(t0, s1, mask); -}*/ +} +#endif #define LOAD_MSG_0_1(buf) \ buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) ); |