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

Fix SunCC compile 

Sun's compiler is mostly braindead.
pull/853/head^2
Jeffrey Walton 2019-06-09 00:00:22 -04:00
parent 6a11f00768
commit 3ce1823fd1
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 42 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chacha_avx.cpp
View File

@ -30,13 +30,6 @@
// Squash MS LNK4221 and libtool warnings // Squash MS LNK4221 and libtool warnings
extern const char CHACHA_AVX_FNAME[] = __FILE__; extern const char CHACHA_AVX_FNAME[] = __FILE__;
// Sun Studio 12.4 OK, 12.5 and 12.6 compile error.
#if (__SUNPRO_CC >= 0x5140) && (__SUNPRO_CC <= 0x5150)
# define MAYBE_CONST
#else
# define MAYBE_CONST const
#endif
// VS2017 and global optimization bug. TODO, figure out when // VS2017 and global optimization bug. TODO, figure out when
// we can re-enable full optimizations for VS2017. Also see // we can re-enable full optimizations for VS2017. Also see
// https://github.com/weidai11/cryptopp/issues/649 and // https://github.com/weidai11/cryptopp/issues/649 and

90
sse_simd.h
View File

@ -20,43 +20,40 @@ NAMESPACE_BEGIN(CryptoPP)
#if (CRYPTOPP_SSE2_INTRIN_AVAILABLE) #if (CRYPTOPP_SSE2_INTRIN_AVAILABLE)
template <class T> template <unsigned int N>
inline __m128i load_m128i(T* ptr) inline __m128i load_m128i(const byte* ptr)
{ {
enum { SCALE=sizeof(__m128i)/sizeof(byte) };
return _mm_loadu_si128( return _mm_loadu_si128(
reinterpret_cast<__m128i*>(ptr)); const_cast<__m128i*>( // SunCC workaround
reinterpret_cast<const __m128i*>(ptr+SCALE*N)));
} }
template <class T> template <unsigned int N>
inline __m128i load_m128i(const T* ptr) inline __m128i load_m128i(const word16* ptr)
{ {
enum { SCALE=sizeof(__m128i)/sizeof(word16) };
return _mm_loadu_si128( return _mm_loadu_si128(
reinterpret_cast<const __m128i*>(ptr)); const_cast<__m128i*>( // SunCC workaround
reinterpret_cast<const __m128i*>(ptr+SCALE*N)));
} }
template <class T> template <unsigned int N>
inline void store_m128i(T* ptr, __m128i val) inline __m128i load_m128i(const word32* ptr)
{ {
return _mm_storeu_si128( enum { SCALE=sizeof(__m128i)/sizeof(word32) };
reinterpret_cast<__m128i*>(ptr), val); return _mm_loadu_si128(
const_cast<__m128i*>( // SunCC workaround
reinterpret_cast<const __m128i*>(ptr+SCALE*N)));
} }
// N specifies the nth 128-bit element template <unsigned int N>
template <unsigned int N, class T> inline __m128i load_m128i(const word64* ptr)
inline __m128i load_m128i(T* ptr)
{ {
enum { SCALE=sizeof(__m128i)/sizeof(T) }; enum { SCALE=sizeof(__m128i)/sizeof(word64) };
return _mm_loadu_si128( return _mm_loadu_si128(
reinterpret_cast<__m128i*>(ptr+SCALE*N)); const_cast<__m128i*>( // SunCC workaround
} reinterpret_cast<const __m128i*>(ptr+SCALE*N)));
// N specifies the nth 128-bit element
template <unsigned int N, class T>
inline __m128i load_m128i(const T* ptr)
{
enum { SCALE=sizeof(__m128i)/sizeof(T) };
return _mm_loadu_si128(
reinterpret_cast<const __m128i*>(ptr+SCALE*N));
} }
// N specifies the nth 128-bit element // N specifies the nth 128-bit element
@ -72,43 +69,40 @@ inline void store_m128i(T* ptr, __m128i val)
#if (CRYPTOPP_AVX2_AVAILABLE) #if (CRYPTOPP_AVX2_AVAILABLE)
template <class T> template <unsigned int N>
inline __m256i load_m256i(T* ptr) inline __m256i load_m256i(const byte* ptr)
{ {
enum { SCALE=sizeof(__m256i)/sizeof(byte) };
return _mm256_loadu_si256( return _mm256_loadu_si256(
reinterpret_cast<__m256i*>(ptr)); const_cast<__m256i*>( // SunCC workaround
reinterpret_cast<const __m256i*>(ptr+SCALE*N)));
} }
template <class T> template <unsigned int N>
inline __m256i load_m256i(const T* ptr) inline __m256i load_m256i(const word16* ptr)
{ {
enum { SCALE=sizeof(__m256i)/sizeof(word16) };
return _mm256_loadu_si256( return _mm256_loadu_si256(
reinterpret_cast<const __m256i*>(ptr)); const_cast<__m256i*>( // SunCC workaround
reinterpret_cast<const __m256i*>(ptr+SCALE*N)));
} }
template <class T> template <unsigned int N>
inline void store_m256i(T* ptr, __m256i val) inline __m256i load_m256i(const word32* ptr)
{ {
return _mm256_storeu_si256( enum { SCALE=sizeof(__m256i)/sizeof(word32) };
reinterpret_cast<__m256i*>(ptr), val); return _mm256_loadu_si256(
const_cast<__m256i*>( // SunCC workaround
reinterpret_cast<const __m256i*>(ptr+SCALE*N)));
} }
// N specifies the nth 256-bit element template <unsigned int N>
template <unsigned int N, class T> inline __m256i load_m256i(const word64* ptr)
inline __m256i load_m256i(T* ptr)
{ {
enum { SCALE=sizeof(__m256i)/sizeof(T) }; enum { SCALE=sizeof(__m256i)/sizeof(word64) };
return _mm256_loadu_si256( return _mm256_loadu_si256(
reinterpret_cast<__m256i*>(ptr+SCALE*N)); const_cast<__m256i*>( // SunCC workaround
} reinterpret_cast<const __m256i*>(ptr+SCALE*N)));
// N specifies the nth 256-bit element
template <unsigned int N, class T>
inline __m256i load_m256i(const T* ptr)
{
enum { SCALE=sizeof(__m256i)/sizeof(T) };
return _mm256_loadu_si256(
reinterpret_cast<const __m256i*>(ptr+SCALE*N));
} }
// N specifies the nth 256-bit element // N specifies the nth 256-bit element