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

Switch from 'static const' to 'enum' for class constants 

Enums do not take up space in a class. It should lead to smaller objects and faster runtimes
pull/461/head
Jeffrey Walton 2017-08-11 16:09:28 -04:00
parent 93a8f9e9b7
commit 9ab233b52a
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.h
View File

@ -616,11 +616,12 @@ NAMESPACE_END
#endif #endif
// How to declare class constants // How to declare class constants
#if (_MSC_VER == 1300) || defined(__INTEL_COMPILER) || defined(__BORLANDC__) //#if (_MSC_VER == 1300) || defined(__INTEL_COMPILER) || defined(__BORLANDC__)
//# define CRYPTOPP_CONSTANT(x) enum {x};
//#else
//# define CRYPTOPP_CONSTANT(x) static const int x;
//#endif
#define CRYPTOPP_CONSTANT(x) enum {x}; #define CRYPTOPP_CONSTANT(x) enum {x};
#else
# define CRYPTOPP_CONSTANT(x) static const int x;
#endif
// ***************** Initialization and Constructor priorities ******************** // ***************** Initialization and Constructor priorities ********************

88
cpu.cpp
View File

@ -220,78 +220,76 @@ static inline bool IsVIA(const word32 output[4])
void DetectX86Features() void DetectX86Features()
{ {
// Coverity finding CID 171239... // Coverity finding CID 171239...
word32 cpuid1[4]={0}, cpuid2[4]={0}, cpuid3[4]={0}; word32 cpuid0[4]={0}, cpuid1[4]={0}, cpuid2[4]={0};
if (!CpuId(0, cpuid1)) if (!CpuId(0, cpuid0))
return; return;
if (!CpuId(1, cpuid2)) if (!CpuId(1, cpuid1))
return; return;
if ((cpuid2[3] & (1 << 26)) != 0) if ((cpuid1[3] & (1 << 26)) != 0)
g_hasSSE2 = TrySSE2(); g_hasSSE2 = TrySSE2();
g_hasSSSE3 = g_hasSSE2 && (cpuid2[2] & (1<<9)); g_hasSSSE3 = g_hasSSE2 && (cpuid1[2] & (1<<9));
g_hasSSE41 = g_hasSSE2 && (cpuid2[2] & (1<<19)); g_hasSSE41 = g_hasSSE2 && (cpuid1[2] & (1<<19));
g_hasSSE42 = g_hasSSE2 && (cpuid2[2] & (1<<20)); g_hasSSE42 = g_hasSSE2 && (cpuid1[2] & (1<<20));
g_hasAESNI = g_hasSSE2 && (cpuid2[2] & (1<<25)); g_hasAESNI = g_hasSSE2 && (cpuid1[2] & (1<<25));
g_hasCLMUL = g_hasSSE2 && (cpuid2[2] & (1<<1)); g_hasCLMUL = g_hasSSE2 && (cpuid1[2] & (1<<1));
if (IsIntel(cpuid1)) if (IsIntel(cpuid0))
{ {
static const unsigned int RDRAND_FLAG = (1 << 30); enum { RDRAND_FLAG = (1 << 30) };
static const unsigned int RDSEED_FLAG = (1 << 18); enum { RDSEED_FLAG = (1 << 18) };
static const unsigned int SHA_FLAG = (1 << 29); enum { SHA_FLAG = (1 << 29) };
g_isP4 = ((cpuid2[0] >> 8) & 0xf) == 0xf; g_isP4 = ((cpuid1[0] >> 8) & 0xf) == 0xf;
g_cacheLineSize = 8 * GETBYTE(cpuid2[1], 1); g_cacheLineSize = 8 * GETBYTE(cpuid1[1], 1);
g_hasRDRAND = !!(cpuid2[2] /*ECX*/ & RDRAND_FLAG); g_hasRDRAND = !!(cpuid1[2] /*ECX*/ & RDRAND_FLAG);
if (cpuid1[0] /*EAX*/ >= 7) if (cpuid0[0] /*EAX*/ >= 7)
{ {
if (CpuId(7, cpuid3)) if (CpuId(7, cpuid2))
{ {
g_hasRDSEED = !!(cpuid3[1] /*EBX*/ & RDSEED_FLAG); g_hasRDSEED = !!(cpuid2[1] /*EBX*/ & RDSEED_FLAG);
g_hasSHA = !!(cpuid3[1] /*EBX*/ & SHA_FLAG); g_hasSHA = !!(cpuid2[1] /*EBX*/ & SHA_FLAG);
} }
} }
} }
else if (IsAMD(cpuid1)) else if (IsAMD(cpuid0))
{ {
static const unsigned int RDRAND_FLAG = (1 << 30); enum { RDRAND_FLAG = (1 << 30) };
static const unsigned int RDSEED_FLAG = (1 << 18); enum { RDSEED_FLAG = (1 << 18) };
static const unsigned int SHA_FLAG = (1 << 29); enum { SHA_FLAG = (1 << 29) };
CpuId(0x01, cpuid1); CpuId(0x80000005, cpuid2);
g_cacheLineSize = GETBYTE(cpuid2[2], 0);
g_hasRDRAND = !!(cpuid1[2] /*ECX*/ & RDRAND_FLAG); g_hasRDRAND = !!(cpuid1[2] /*ECX*/ & RDRAND_FLAG);
if (cpuid1[0] /*EAX*/ >= 7) if (cpuid1[0] /*EAX*/ >= 7)
{ {
if (CpuId(7, cpuid3)) if (CpuId(7, cpuid2))
{ {
g_hasRDSEED = !!(cpuid3[1] /*EBX*/ & RDSEED_FLAG); g_hasRDSEED = !!(cpuid2[1] /*EBX*/ & RDSEED_FLAG);
g_hasSHA = !!(cpuid3[1] /*EBX*/ & SHA_FLAG); g_hasSHA = !!(cpuid2[1] /*EBX*/ & SHA_FLAG);
} }
} }
CpuId(0x80000005, cpuid1);
g_cacheLineSize = GETBYTE(cpuid1[2], 0);
} }
else if (IsVIA(cpuid1)) else if (IsVIA(cpuid0))
{ {
static const unsigned int RNG_FLAGS = (0x3 << 2); enum { RNG_FLAGS = (0x3 << 2) };
static const unsigned int ACE_FLAGS = (0x3 << 6); enum { ACE_FLAGS = (0x3 << 6) };
static const unsigned int ACE2_FLAGS = (0x3 << 8); enum { ACE2_FLAGS = (0x3 << 8) };
static const unsigned int PHE_FLAGS = (0x3 << 10); enum { PHE_FLAGS = (0x3 << 10) };
static const unsigned int PMM_FLAGS = (0x3 << 12); enum { PMM_FLAGS = (0x3 << 12) };
CpuId(0xC0000000, cpuid1); CpuId(0xC0000000, cpuid0);
if (cpuid1[0] >= 0xC0000001) if (cpuid0[0] >= 0xC0000001)
{ {
// Extended features available // Extended features available
CpuId(0xC0000001, cpuid1); CpuId(0xC0000001, cpuid0);
g_hasPadlockRNG = !!(cpuid1[3] /*EDX*/ & RNG_FLAGS); g_hasPadlockRNG = !!(cpuid0[3] /*EDX*/ & RNG_FLAGS);
g_hasPadlockACE = !!(cpuid1[3] /*EDX*/ & ACE_FLAGS); g_hasPadlockACE = !!(cpuid0[3] /*EDX*/ & ACE_FLAGS);
g_hasPadlockACE2 = !!(cpuid1[3] /*EDX*/ & ACE2_FLAGS); g_hasPadlockACE2 = !!(cpuid0[3] /*EDX*/ & ACE2_FLAGS);
g_hasPadlockPHE = !!(cpuid1[3] /*EDX*/ & PHE_FLAGS); g_hasPadlockPHE = !!(cpuid0[3] /*EDX*/ & PHE_FLAGS);
g_hasPadlockPMM = !!(cpuid1[3] /*EDX*/ & PMM_FLAGS); g_hasPadlockPMM = !!(cpuid0[3] /*EDX*/ & PMM_FLAGS);
} }
} }

16
default.cpp
View File

@ -80,16 +80,16 @@ template <class BC, class H, class Info>
DataEncryptor<BC,H,Info>::DataEncryptor(const char *passphrase, BufferedTransformation *attachment) DataEncryptor<BC,H,Info>::DataEncryptor(const char *passphrase, BufferedTransformation *attachment)
: ProxyFilter(NULLPTR, 0, 0, attachment), m_passphrase((const byte *)passphrase, strlen(passphrase)) : ProxyFilter(NULLPTR, 0, 0, attachment), m_passphrase((const byte *)passphrase, strlen(passphrase))
{ {
CRYPTOPP_COMPILE_ASSERT(SALTLENGTH <= DIGESTSIZE); CRYPTOPP_COMPILE_ASSERT((int)SALTLENGTH <= DIGESTSIZE);
CRYPTOPP_COMPILE_ASSERT(BLOCKSIZE <= DIGESTSIZE); CRYPTOPP_COMPILE_ASSERT((int)BLOCKSIZE <= (int)DIGESTSIZE);
} }
template <class BC, class H, class Info> template <class BC, class H, class Info>
DataEncryptor<BC,H,Info>::DataEncryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment) DataEncryptor<BC,H,Info>::DataEncryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment)
: ProxyFilter(NULLPTR, 0, 0, attachment), m_passphrase(passphrase, passphraseLength) : ProxyFilter(NULLPTR, 0, 0, attachment), m_passphrase(passphrase, passphraseLength)
{ {
CRYPTOPP_COMPILE_ASSERT(SALTLENGTH <= DIGESTSIZE); CRYPTOPP_COMPILE_ASSERT((int)SALTLENGTH <= (int)DIGESTSIZE);
CRYPTOPP_COMPILE_ASSERT(BLOCKSIZE <= DIGESTSIZE); CRYPTOPP_COMPILE_ASSERT((int)BLOCKSIZE <= (int)DIGESTSIZE);
} }
template <class BC, class H, class Info> template <class BC, class H, class Info>
@ -140,8 +140,8 @@ DataDecryptor<BC,H,Info>::DataDecryptor(const char *p, BufferedTransformation *a
, m_passphrase((const byte *)p, strlen(p)) , m_passphrase((const byte *)p, strlen(p))
, m_throwException(throwException) , m_throwException(throwException)
{ {
CRYPTOPP_COMPILE_ASSERT(SALTLENGTH <= DIGESTSIZE); CRYPTOPP_COMPILE_ASSERT((int)SALTLENGTH <= (int)DIGESTSIZE);
CRYPTOPP_COMPILE_ASSERT(BLOCKSIZE <= DIGESTSIZE); CRYPTOPP_COMPILE_ASSERT((int)BLOCKSIZE <= (int)DIGESTSIZE);
} }
template <class BC, class H, class Info> template <class BC, class H, class Info>
@ -151,8 +151,8 @@ DataDecryptor<BC,H,Info>::DataDecryptor(const byte *passphrase, size_t passphras
, m_passphrase(passphrase, passphraseLength) , m_passphrase(passphrase, passphraseLength)
, m_throwException(throwException) , m_throwException(throwException)
{ {
CRYPTOPP_COMPILE_ASSERT(SALTLENGTH <= DIGESTSIZE); CRYPTOPP_COMPILE_ASSERT((int)SALTLENGTH <= (int)DIGESTSIZE);
CRYPTOPP_COMPILE_ASSERT(BLOCKSIZE <= DIGESTSIZE); CRYPTOPP_COMPILE_ASSERT((int)BLOCKSIZE <= (int)DIGESTSIZE);
} }
template <class BC, class H, class Info> template <class BC, class H, class Info>