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

Fix compile on MIPS due to missing definition of NULL 

Whitespace check-in
pull/548/head
Jeffrey Walton 2017-11-24 17:53:25 -05:00
parent 3b80ead695
commit 2abf7d7bc4
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
sse-simd.cpp
View File

@ -10,6 +10,9 @@
#include "config.h" #include "config.h"
#include "cpu.h" #include "cpu.h"
// Needed by MIPS for definition of NULL
#include "stdcpp.h"
#ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY
# include <signal.h> # include <signal.h>
# include <setjmp.h> # include <setjmp.h>
@ -33,71 +36,71 @@ extern "C" {
extern "C" extern "C"
{ {
static jmp_buf s_jmpNoSSE2; static jmp_buf s_jmpNoSSE2;
static void SigIllHandlerSSE2(int) static void SigIllHandlerSSE2(int)
{ {
longjmp(s_jmpNoSSE2, 1); longjmp(s_jmpNoSSE2, 1);
} }
} }
#endif // Not CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY #endif // Not CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
bool CPU_ProbeSSE2() bool CPU_ProbeSSE2()
{ {
// Apple switched to Intel desktops in 2005/2006 using // Apple switched to Intel desktops in 2005/2006 using
// Core2 Duo's, which provides SSE2 and above. // Core2 Duo's, which provides SSE2 and above.
#if CRYPTOPP_BOOL_X64 || defined(__APPLE__) #if CRYPTOPP_BOOL_X64 || defined(__APPLE__)
return true; return true;
#elif defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #elif defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
#elif defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY) #elif defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
__try __try
{ {
# if CRYPTOPP_SSE2_ASM_AVAILABLE # if CRYPTOPP_SSE2_ASM_AVAILABLE
AS2(por xmm0, xmm0) // executing SSE2 instruction AS2(por xmm0, xmm0) // executing SSE2 instruction
# elif CRYPTOPP_SSE2_INTRIN_AVAILABLE # elif CRYPTOPP_SSE2_INTRIN_AVAILABLE
__m128i x = _mm_setzero_si128(); __m128i x = _mm_setzero_si128();
return _mm_cvtsi128_si32(x) == 0; return _mm_cvtsi128_si32(x) == 0;
# endif # endif
} }
// GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION // GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION
__except (EXCEPTION_EXECUTE_HANDLER) __except (EXCEPTION_EXECUTE_HANDLER)
{ {
return false; return false;
} }
return true; return true;
#else #else
// longjmp and clobber warnings. Volatile is required. // longjmp and clobber warnings. Volatile is required.
// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854 // http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
volatile bool result = true; volatile bool result = true;
volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerSSE2); volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerSSE2);
if (oldHandler == SIG_ERR) if (oldHandler == SIG_ERR)
return false; return false;
# ifndef __MINGW32__ # ifndef __MINGW32__
volatile sigset_t oldMask; volatile sigset_t oldMask;
if (sigprocmask(0, NULLPTR, (sigset_t*)&oldMask)) if (sigprocmask(0, NULLPTR, (sigset_t*)&oldMask))
return false; return false;
# endif # endif
if (setjmp(s_jmpNoSSE2)) if (setjmp(s_jmpNoSSE2))
result = false; result = false;
else else
{ {
# if CRYPTOPP_SSE2_ASM_AVAILABLE # if CRYPTOPP_SSE2_ASM_AVAILABLE
__asm __volatile ("por %xmm0, %xmm0"); __asm __volatile ("por %xmm0, %xmm0");
# elif CRYPTOPP_SSE2_INTRIN_AVAILABLE # elif CRYPTOPP_SSE2_INTRIN_AVAILABLE
__m128i x = _mm_setzero_si128(); __m128i x = _mm_setzero_si128();
result = _mm_cvtsi128_si32(x) == 0; result = _mm_cvtsi128_si32(x) == 0;
# endif # endif
} }
# ifndef __MINGW32__ # ifndef __MINGW32__
sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULLPTR); sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULLPTR);
# endif # endif
signal(SIGILL, oldHandler); signal(SIGILL, oldHandler);
return result; return result;
#endif #endif
} }