Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-04 23:10:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix brace placement in CPUID

Browse source
This commit is contained in:
Ryan Huffman 2016-03-25 16:23:48 -07:00
parent f2a28efcd2
commit b155a0534b
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libraries/shared/src/CPUID.h
View file

@ -125,8 +125,7 @@ private:
__cpuid(cpui.data(), 0); __cpuid(cpui.data(), 0);
nIds_ = cpui[0]; nIds_ = cpui[0];
for (int i = 0; i <= nIds_; ++i) for (int i = 0; i <= nIds_; ++i) {
{
__cpuidex(cpui.data(), i, 0); __cpuidex(cpui.data(), i, 0);
data_.push_back(cpui); data_.push_back(cpui);
} }
@ -138,25 +137,20 @@ private:
*reinterpret_cast<int*>(vendor + 4) = data_[0][3]; *reinterpret_cast<int*>(vendor + 4) = data_[0][3];
*reinterpret_cast<int*>(vendor + 8) = data_[0][2]; *reinterpret_cast<int*>(vendor + 8) = data_[0][2];
vendor_ = vendor; vendor_ = vendor;
if (vendor_ == "GenuineIntel") if (vendor_ == "GenuineIntel") {
{
isIntel_ = true; isIntel_ = true;
} } else if (vendor_ == "AuthenticAMD") {
else if (vendor_ == "AuthenticAMD")
{
isAMD_ = true; isAMD_ = true;
} }
// load bitset with flags for function 0x00000001 // load bitset with flags for function 0x00000001
if (nIds_ >= 1) if (nIds_ >= 1) {
{
f_1_ECX_ = data_[1][2]; f_1_ECX_ = data_[1][2];
f_1_EDX_ = data_[1][3]; f_1_EDX_ = data_[1][3];
} }
// load bitset with flags for function 0x00000007 // load bitset with flags for function 0x00000007
if (nIds_ >= 7) if (nIds_ >= 7) {
{
f_7_EBX_ = data_[7][1]; f_7_EBX_ = data_[7][1];
f_7_ECX_ = data_[7][2]; f_7_ECX_ = data_[7][2];
} }
@ -169,22 +163,19 @@ private:
char brand[0x40]; char brand[0x40];
memset(brand, 0, sizeof(brand)); memset(brand, 0, sizeof(brand));
for (int i = 0x80000000; i <= nExIds_; ++i) for (int i = 0x80000000; i <= nExIds_; ++i) {
{
__cpuidex(cpui.data(), i, 0); __cpuidex(cpui.data(), i, 0);
extdata_.push_back(cpui); extdata_.push_back(cpui);
} }
// load bitset with flags for function 0x80000001 // load bitset with flags for function 0x80000001
if (nExIds_ >= 0x80000001) if (nExIds_ >= 0x80000001) {
{
f_81_ECX_ = extdata_[1][2]; f_81_ECX_ = extdata_[1][2];
f_81_EDX_ = extdata_[1][3]; f_81_EDX_ = extdata_[1][3];
} }
// Interpret CPU brand string if reported // Interpret CPU brand string if reported
if (nExIds_ >= 0x80000004) if (nExIds_ >= 0x80000004) {
{
memcpy(brand, extdata_[2].data(), sizeof(cpui)); memcpy(brand, extdata_[2].data(), sizeof(cpui));
memcpy(brand + 16, extdata_[3].data(), sizeof(cpui)); memcpy(brand + 16, extdata_[3].data(), sizeof(cpui));
memcpy(brand + 32, extdata_[4].data(), sizeof(cpui)); memcpy(brand + 32, extdata_[4].data(), sizeof(cpui));