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

Query sysconf for _SC_LEVEL1_DCACHE_LINESIZE on ARM and PPC

pull/507/head
Jeffrey Walton 2017-09-17 02:39:41 -04:00
parent a835443b34
commit 3e237540fe
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cpu.cpp
View File

@ -17,6 +17,10 @@
# include <sys/systemcfg.h> # include <sys/systemcfg.h>
#endif #endif
#ifdef __linux__
# include <unistd.h>
#endif
// Capability queries, requires Glibc 2.16, https://lwn.net/Articles/519085/ // Capability queries, requires Glibc 2.16, https://lwn.net/Articles/519085/
// CRYPTOPP_GLIBC_VERSION not used because config.h is missing <feature.h> // CRYPTOPP_GLIBC_VERSION not used because config.h is missing <feature.h>
#if (((__GLIBC__ * 100) + __GLIBC_MINOR__) >= 216) #if (((__GLIBC__ * 100) + __GLIBC_MINOR__) >= 216)
@ -33,8 +37,7 @@ unsigned long int getauxval(unsigned long int) { return 0; }
# include <sys/utsname.h> # include <sys/utsname.h>
#endif #endif
// http://android.googlesource.com/platform/ndk/+/master/sources/android/cpufeatures/cpu-features.h // The cpu-features header and source file are located in $ANDROID_NDK_ROOT/sources/android/cpufeatures
// The cpu-features header and source file are located in ANDROID_NDK_ROOT/sources/android
// setenv-android.sh will copy the header and source file into PWD and the makefile will build it in place. // setenv-android.sh will copy the header and source file into PWD and the makefile will build it in place.
#if defined(__ANDROID__) #if defined(__ANDROID__)
# include "cpu-features.h" # include "cpu-features.h"
@ -602,6 +605,13 @@ void DetectArmFeatures()
g_hasSHA1 = CPU_QuerySHA1() || CPU_ProbeSHA1(); g_hasSHA1 = CPU_QuerySHA1() || CPU_ProbeSHA1();
g_hasSHA2 = CPU_QuerySHA2() || CPU_ProbeSHA2(); g_hasSHA2 = CPU_QuerySHA2() || CPU_ProbeSHA2();
#if defined(__linux__)
g_cacheLineSize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
#endif
if (!g_cacheLineSize)
g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE;
g_ArmDetectionDone = true; g_ArmDetectionDone = true;
} }
@ -713,11 +723,17 @@ void DetectPowerpcFeatures()
g_hasSHA1 = CPU_QuerySHA1() || CPU_ProbeSHA1(); g_hasSHA1 = CPU_QuerySHA1() || CPU_ProbeSHA1();
g_hasSHA2 = CPU_QuerySHA2() || CPU_ProbeSHA2(); g_hasSHA2 = CPU_QuerySHA2() || CPU_ProbeSHA2();
#ifdef _AIX #if defined(_AIX)
// /usr/include/sys/systemcfg.h // /usr/include/sys/systemcfg.h
g_cacheLineSize = getsystemcfg(SC_L1C_DLS); g_cacheLineSize = getsystemcfg(SC_L1C_DLS);
#elif defined(__linux__)
// GCC112 CentOS 7 returns 0?
g_cacheLineSize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
#endif #endif
if (!g_cacheLineSize)
g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE;
g_PowerpcDetectionDone = true; g_PowerpcDetectionDone = true;
} }