shadps4-emu/ext-cryptopp
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-cryptopp.git synced 2024-11-23 09:59:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update cpu.cpp features for Apple M1

Browse Source
This commit is contained in:
Jeffrey Walton 2021-03-05 09:15:52 -05:00
parent bc1b5f7922
commit 8b237f5381
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
cpu.cpp
View File

@ -48,6 +48,7 @@ unsigned long int getauxval(unsigned long int) { return 0; }
#if defined(__APPLE__)
# include <sys/utsname.h>
# include <sys/sysctl.h>
#endif
// The cpu-features header and source file are located in
@ -140,7 +141,7 @@ class AppleMachineInfo
{
public:
enum { PowerMac=1, Mac, iPhone, iPod, iPad, AppleTV, AppleWatch };
enum { PowerPC=1, I386, I686, X86_64, ARM32, ARMV8, ARMV82, ARMV83, ARMV84 };
enum { PowerPC=1, I386, I686, X86_64, ARM32, ARMV8, ARMV82, ARMV83 };
AppleMachineInfo() : m_device(0), m_version(0), m_arch(0)
{
@ -210,9 +211,36 @@ public:
}
else if (machine.find("arm64") != std::string::npos)
{
// M1 machine.
m_device = Mac;
m_arch = ARMV82;
// M1 machine?
std::string brand;
size_t size = 0;
if (sysctlbyname("machdep.cpu.brand_string", NULL, &size, NULL, 0) == 0 && size > 0)
{
brand.resize(size);
if (sysctlbyname("machdep.cpu.brand_string", &brand[0], &size, NULL, 0) == 0 && size > 0)
{
if (brand[size-1] == '\0')
size--;
brand.resize(size);
}
}
if (brand == "Apple M1")
{
m_device = Mac;
m_arch = ARMV82;
}
else
{
// ???
m_device = 0;
m_arch = ARMV8;
}
}
else
{
CRYPTOPP_ASSERT(0);
}
}
@ -244,10 +272,6 @@ public:
return m_arch >= ARMV83;
}
bool IsARMv84() const {
return m_arch >= ARMV84;
}
private:
unsigned int m_device, m_version, m_arch;
};
@ -310,17 +334,6 @@ inline bool IsAppleMachineARMv83()
return arch >= AppleMachineInfo::ARMV83;
}
inline bool IsAppleMachineARMv84()
{
static unsigned int arch;
if (arch == 0)
{
unsigned int unused;
GetAppleMachineInfo(unused, unused, arch);
}
return arch >= AppleMachineInfo::ARMV84;
}
#endif // __APPLE__
ANONYMOUS_NAMESPACE_END
@ -1040,10 +1053,6 @@ inline bool CPU_QuerySM3()
if ((getauxval(AT_HWCAP2) & HWCAP2_SM3) != 0)
return true;
#elif defined(__APPLE__) && defined(__aarch64__) && 0
// M1 processor
if (IsAppleMachineARMv83())
return true;
// Nope...
return false;
#endif
return false;
@ -1067,10 +1076,6 @@ inline bool CPU_QuerySM4()
if ((getauxval(AT_HWCAP2) & HWCAP2_SM4) != 0)
return true;
#elif defined(__APPLE__) && defined(__aarch64__) && 0
// M1 processor
if (IsAppleMachineARMv83())
return true;
// Nope...
return false;
#endif
return false;