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

Fix brand retrieval

This commit is contained in:
Phillip Stephens 2016-02-15 09:32:49 -08:00
parent bd88f654a9
commit ce2256c457
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Math.hpp
View File

@ -17,7 +17,7 @@ namespace Zeus
struct CPUInfo struct CPUInfo
{ {
const char cpuBrand [32] = {0}; const char cpuBrand [32] = {0};
const char cpuVendor[32] = {0}; const char cpuVendor[64] = {0};
const bool isIntel = false; const bool isIntel = false;
const bool SSE1 = false; const bool SSE1 = false;
const bool SSE2 = false; const bool SSE2 = false;

55
src/Math.cpp
View File

@ -12,22 +12,13 @@ namespace Zeus
static CPUInfo g_cpuFeatures; static CPUInfo g_cpuFeatures;
void getCpuInfo(int level, void getCpuInfo(int level, int regs[4])
unsigned int* eax,
unsigned int* ebx,
unsigned int* ecx,
unsigned int* edx)
{ {
#if !GEKKO #if !GEKKO
#if _WIN32 #if _WIN32
int regs[4];
__cpuid(regs, level); __cpuid(regs, level);
*eax = regs[0];
*ebx = regs[1];
*ecx = regs[2];
*edx = regs[3];
#else #else
__cpuid(level, *eax, *ebx, *ecx, *edx); __cpuid(level, regs[0], regs[1], regs[2], regs[3]);
#endif #endif
#endif #endif
} }
@ -39,24 +30,32 @@ void detectCPU()
if (isInit) if (isInit)
return; return;
unsigned int eax, ebx, ecx, edx; int regs[4];
getCpuInfo(0, &eax, &ebx, &ecx, &edx); getCpuInfo(0, regs);
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor) = ebx; *reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor) = regs[1];
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor + 4) = edx; *reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor + 4) = regs[3];
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor + 8) = ecx; *reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor + 8) = regs[2];
getCpuInfo(0x80000000, &eax, &ebx, &ecx, &edx); for (unsigned int i = 0x80000002; i < 0x80000004; i++)
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuBrand) = ebx; {
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuBrand + 4) = edx; getCpuInfo(i, regs);
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuBrand + 8) = ecx; // Interpret CPU brand string and cache information.
getCpuInfo(1, &eax, &ebx, &ecx, &edx); if (i == 0x80000002)
memcpy((char*)g_cpuFeatures.cpuBrand, regs, sizeof(regs));
else if( i == 0x80000003 )
memcpy((char*)g_cpuFeatures.cpuBrand + 16, regs, sizeof(regs));
else if( i == 0x80000004 )
memcpy((char*)g_cpuFeatures.cpuBrand + 32, regs, sizeof(regs));
}
memset((bool*)&g_cpuFeatures.AESNI, ((ecx & 0x02000000) != 0), 1); getCpuInfo(1, regs);
memset((bool*)&g_cpuFeatures.SSE1, ((edx & 0x02000000) != 0), 1);
memset((bool*)&g_cpuFeatures.SSE2, ((edx & 0x04000000) != 0), 1); memset((bool*)&g_cpuFeatures.AESNI, ((regs[2] & 0x02000000) != 0), 1);
memset((bool*)&g_cpuFeatures.SSE3, ((ecx & 0x00000001) != 0), 1); memset((bool*)&g_cpuFeatures.SSE1, ((regs[3] & 0x02000000) != 0), 1);
memset((bool*)&g_cpuFeatures.SSSE3, ((ecx & 0x00000200) != 0), 1); memset((bool*)&g_cpuFeatures.SSE2, ((regs[3] & 0x04000000) != 0), 1);
memset((bool*)&g_cpuFeatures.SSE41, ((ecx & 0x00080000) != 0), 1); memset((bool*)&g_cpuFeatures.SSE3, ((regs[2] & 0x00000001) != 0), 1);
memset((bool*)&g_cpuFeatures.SSE42, ((ecx & 0x00100000) != 0), 1); memset((bool*)&g_cpuFeatures.SSSE3, ((regs[2] & 0x00000200) != 0), 1);
memset((bool*)&g_cpuFeatures.SSE41, ((regs[2] & 0x00080000) != 0), 1);
memset((bool*)&g_cpuFeatures.SSE42, ((regs[2] & 0x00100000) != 0), 1);
isInit = true; isInit = true;