traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Lars Viklund 2017-11-01 13:23:09 +01:00 committed by Christian Heimes
parent 8bc7d63560
commit 388cd85e51
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/_blake2/impl/blake2s-load-xop.h
View File

@ -18,8 +18,9 @@
#define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */ #define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */
#if 0
/* Basic VPPERM emulation, for testing purposes */ /* 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 sixteen = _mm_set1_epi8(16);
const __m128i t0 = _mm_shuffle_epi8(src1, sel); const __m128i t0 = _mm_shuffle_epi8(src1, sel);
@ -27,7 +28,8 @@
const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen), const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen),
_mm_cmpgt_epi8(sel, sixteen)); /* (>=16) = 0xff : 00 */ _mm_cmpgt_epi8(sel, sixteen)); /* (>=16) = 0xff : 00 */
return _mm_blendv_epi8(t0, s1, mask); return _mm_blendv_epi8(t0, s1, mask);
}*/ }
#endif
#define LOAD_MSG_0_1(buf) \ #define LOAD_MSG_0_1(buf) \
buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) ); buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) );