arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use M128_CAST and CONST_M128_CAST for Clang 

Also see http://bugs.llvm.org/show_bug.cgi?id=20670
pull/552/head
Jeffrey Walton 2017-12-26 11:16:52 -05:00
parent bee2598ecd
commit 8e916e7bac
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
aria-simd.cpp
View File

@ -22,6 +22,10 @@
# include <tmmintrin.h> # include <tmmintrin.h>
#endif #endif
// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
#define M128_CAST(x) ((__m128i *)(void *)(x))
#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(ARIATab) NAMESPACE_BEGIN(ARIATab)
@ -128,17 +132,17 @@ void ARIA_ProcessAndXorBlock_Xor_SSSE3(const byte* xorBlock, byte* outBlock, con
outBlock[15] = (byte)(S2[ARIA_BRF(t[3],0)] ); outBlock[15] = (byte)(S2[ARIA_BRF(t[3],0)] );
// 'outBlock' may be unaligned. // 'outBlock' may be unaligned.
_mm_storeu_si128(reinterpret_cast<__m128i*>(outBlock), _mm_storeu_si128(M128_CAST(outBlock),
_mm_xor_si128(_mm_loadu_si128((const __m128i*)(outBlock)), _mm_xor_si128(_mm_loadu_si128(CONST_M128_CAST(outBlock)),
_mm_shuffle_epi8(_mm_load_si128((const __m128i*)(rk)), MASK))); _mm_shuffle_epi8(_mm_load_si128(CONST_M128_CAST(rk)), MASK)));
// 'outBlock' and 'xorBlock' may be unaligned. // 'outBlock' and 'xorBlock' may be unaligned.
if (xorBlock != NULLPTR) if (xorBlock != NULLPTR)
{ {
_mm_storeu_si128((__m128i*)(outBlock), _mm_storeu_si128(M128_CAST(outBlock),
_mm_xor_si128( _mm_xor_si128(
_mm_loadu_si128((const __m128i*)(outBlock)), _mm_loadu_si128(CONST_M128_CAST(outBlock)),
_mm_loadu_si128((const __m128i*)(xorBlock)))); _mm_loadu_si128(CONST_M128_CAST(xorBlock))));
} }
} }

4
rijndael-simd.cpp
View File

@ -63,6 +63,10 @@
# define EXCEPTION_EXECUTE_HANDLER 1 # define EXCEPTION_EXECUTE_HANDLER 1
#endif #endif
// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
#define M128_CAST(x) ((__m128i *)(void *)(x))
#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
#ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY