AxioDL
/
nod
mirror of https://github.com/AxioDL/nod.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MSVC AES-NI support

This commit is contained in:
Jack Andersen 2015-07-13 14:38:16 -10:00
parent 01f269e8e2
commit 83f29da294
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/NOD/Util.hpp
View File

@ -1,6 +1,14 @@
#ifndef __NOD_UTIL_HPP__ #ifndef __NOD_UTIL_HPP__
#define __NOD_UTIL_HPP__ #define __NOD_UTIL_HPP__
#if _WIN32 && UNICODE
#include <wctype.h>
#include <direct.h>
#else
#include <ctype.h>
#endif
#include <sys/stat.h>
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include <LogVisor/LogVisor.hpp> #include <LogVisor/LogVisor.hpp>
@ -13,16 +21,11 @@ extern LogVisor::LogModule LogModule;
/* filesystem char type */ /* filesystem char type */
#if _WIN32 && UNICODE #if _WIN32 && UNICODE
#include <wctype.h>
#include <direct.h>
#include <sys/stat.h>
#define NOD_UCS2 1 #define NOD_UCS2 1
typedef struct _stat Sstat; typedef struct _stat Sstat;
static inline int Mkdir(const wchar_t* path, int) {return _wmkdir(path);} static inline int Mkdir(const wchar_t* path, int) {return _wmkdir(path);}
static inline int Stat(const wchar_t* path, Sstat* statout) {return _wstat(path, statout);} static inline int Stat(const wchar_t* path, Sstat* statout) {return _wstat(path, statout);}
#else #else
#include <ctype.h>
#include <sys/stat.h>
typedef struct stat Sstat; typedef struct stat Sstat;
static inline int Mkdir(const char* path, mode_t mode) {return mkdir(path, mode);} static inline int Mkdir(const char* path, mode_t mode) {return mkdir(path, mode);}
static inline int Stat(const char* path, Sstat* statout) {return stat(path, statout);} static inline int Stat(const char* path, Sstat* statout) {return stat(path, statout);}

10
lib/aes.cpp
View File

@ -478,7 +478,7 @@ void SoftwareAES::encrypt(const uint8_t* iv, const uint8_t* inbuf, uint8_t* outb
} }
} }
#if __AES__ #if __AES__ || _MSC_VER >= 1800
#include <wmmintrin.h> #include <wmmintrin.h>
@ -598,12 +598,18 @@ public:
static int HAS_AES_NI = -1; static int HAS_AES_NI = -1;
std::unique_ptr<IAES> NewAES() std::unique_ptr<IAES> NewAES()
{ {
#if __AES__ #if __AES__ || _MSC_VER >= 1800
if (HAS_AES_NI == -1) if (HAS_AES_NI == -1)
{ {
#if _MSC_VER
int info[4];
__cpuid(info, 1);
HAS_AES_NI = ((info[2] & 0x2000000) != 0);
#else
unsigned int a,b,c,d; unsigned int a,b,c,d;
__cpuid(1, a,b,c,d); __cpuid(1, a,b,c,d);
HAS_AES_NI = ((c & 0x2000000) != 0); HAS_AES_NI = ((c & 0x2000000) != 0);
#endif
} }
if (HAS_AES_NI) if (HAS_AES_NI)
return std::unique_ptr<IAES>(new NiAES); return std::unique_ptr<IAES>(new NiAES);