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

Fix compile using MSVC 2013 ARM

pull/853/head
Jeffrey Walton 2019-05-21 06:54:33 -04:00
parent 751515901b
commit 5b1cae0c63
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neon_simd.cpp
View File

@ -123,7 +123,7 @@ bool CPU_ProbeARMv7()
bool CPU_ProbeNEON() bool CPU_ProbeNEON()
{ {
#if defined(__aarch32__) || defined(__aarch64__) #if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
return true; return true;
#elif defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #elif defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
@ -132,9 +132,11 @@ bool CPU_ProbeNEON()
volatile bool result = true; volatile bool result = true;
__try __try
{ {
volatile uint32x4_t x = vdupq_n_u32(1); uint32x4_t x = vdupq_n_u32(1);
volatile uint32x4_t y = vshlq_n_u32(x, 4); uint32x4_t y = vshlq_n_u32(x, 4);
return (y[0] & y[1] & y[2] & y[3]) == 16;
word32 z[4]; vst1q_u32(z, y);
return (z[0] & z[1] & z[2] & z[3]) == 16;
} }
__except (EXCEPTION_EXECUTE_HANDLER) __except (EXCEPTION_EXECUTE_HANDLER)
{ {
@ -166,7 +168,9 @@ bool CPU_ProbeNEON()
// may escape the try block with the SIGILL guard. // may escape the try block with the SIGILL guard.
uint32x4_t x = vdupq_n_u32(1); uint32x4_t x = vdupq_n_u32(1);
uint32x4_t y = vshlq_n_u32(x, 4); uint32x4_t y = vshlq_n_u32(x, 4);
return (y[0] & y[1] & y[2] & y[3]) == 16;
word32 z[4]; vst1q_u32(z, y);
return (z[0] & z[1] & z[2] & z[3]) == 16;
} }
sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULLPTR); sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULLPTR);