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

Fix POWER7 runtime detection test (GH #742)

pull/748/head
Jeffrey Walton 2018-11-19 18:31:00 -05:00
parent 0de4556b39
commit 215f9dc164
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ppc_power7.cpp
View File

@ -38,7 +38,7 @@ extern "C" {
#endif // CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY #endif // CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
#if (CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64) #if (CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64)
bool CPU_ProbePower7() bool CPU_ProbePower7()
{ {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
@ -65,10 +65,12 @@ extern "C" {
byte b1[19] = {255, 255, 255, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, b2[17]; byte b1[19] = {255, 255, 255, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, b2[17];
// Specifically call the VSX loads and stores // Specifically call the VSX loads and stores
#if defined(__ibmxl__) || (defined(_AIX) && defined(__xlC__)) #if defined(__old_xlc__) || defined(__old_xlC__)
vec_xst(vec_xl(0, b1+3), 0, b2+1); vec_xstw4(vec_xlw4(0, b1+3), 0, b2+1);
#elif defined(__xlc__) || defined(__xlC__) || defined(__clang__)
vec_xst(vec_xl(0, b1+3), 0, b2+1);
#else #else
vec_vsx_st(vec_vsx_ld(0, b1+3), 0, b2+1); vec_vsx_st(vec_vsx_ld(0, b1+3), 0, b2+1);
#endif #endif
result = (0 == std::memcmp(b1+3, b2+1, 16)); result = (0 == std::memcmp(b1+3, b2+1, 16));