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

Merge branch 'master' of https://github.com/AxioDL/MathLib

This commit is contained in:
Jack Andersen 2016-02-16 17:38:32 -10:00
parent fc122384bd bfb1f4fee3
commit b4ed5b78dc
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Math.hpp
View File

@ -16,8 +16,8 @@ namespace Zeus
{ {
struct CPUInfo struct CPUInfo
{ {
const char cpuBrand [32] = {0}; const char cpuBrand [48] = {0};
const char cpuVendor[64] = {0}; const char cpuVendor[32] = {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;

6
src/Math.cpp
View File

@ -35,7 +35,10 @@ void detectCPU()
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor) = regs[1]; *reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor) = regs[1];
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor + 4) = regs[3]; *reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor + 4) = regs[3];
*reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor + 8) = regs[2]; *reinterpret_cast<int*>((char*)g_cpuFeatures.cpuVendor + 8) = regs[2];
for (unsigned int i = 0x80000002; i < 0x80000004; i++) getCpuInfo(0x80000000, regs);
if (regs[0] >= 0x80000004)
{
for (unsigned int i = 0x80000002; i <= 0x80000004; i++)
{ {
getCpuInfo(i, regs); getCpuInfo(i, regs);
// Interpret CPU brand string and cache information. // Interpret CPU brand string and cache information.
@ -46,6 +49,7 @@ void detectCPU()
else if( i == 0x80000004 ) else if( i == 0x80000004 )
memcpy((char*)g_cpuFeatures.cpuBrand + 32, regs, sizeof(regs)); memcpy((char*)g_cpuFeatures.cpuBrand + 32, regs, sizeof(regs));
} }
}
getCpuInfo(1, regs); getCpuInfo(1, regs);