piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the brand/cpu_string reversal.

Browse Source 
Before this commit, the two were reversed ("cpu_string" had the brand, e.g. "AuthenticAMD"; and "brand_string" had the CPU type, e.g. "AMD Phenom II X4 925").
This commit is contained in:
Augustin Cavalier
2014-10-20 14:01:50 -04:00
parent 8d4068527b
commit 51700a2b68
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/CPUDetect.h
View File

@ -20,8 +20,8 @@ struct CPUInfo
{ {
CPUVendor vendor; CPUVendor vendor;
char cpu_string[0x21]; char cpu_string[0x41];
char brand_string[0x41]; char brand_string[0x21];
bool OS64bit; bool OS64bit;
bool CPU64bit; bool CPU64bit;
bool Mode64bit; bool Mode64bit;

26
Source/Core/Common/x64CPUDetect.cpp
View File

@ -102,25 +102,25 @@ void CPUInfo::Detect()
// Assume CPU supports the CPUID instruction. Those that don't can barely // Assume CPU supports the CPUID instruction. Those that don't can barely
// boot modern OS:es anyway. // boot modern OS:es anyway.
int cpu_id[4]; int cpu_id[4];
memset(cpu_string, 0, sizeof(cpu_string)); memset(brand_string, 0, sizeof(brand_string));
// Detect CPU's CPUID capabilities, and grab cpu string // Detect CPU's CPUID capabilities, and grab cpu string
__cpuid(cpu_id, 0x00000000); __cpuid(cpu_id, 0x00000000);
u32 max_std_fn = cpu_id[0]; // EAX u32 max_std_fn = cpu_id[0]; // EAX
*((int *)cpu_string) = cpu_id[1]; *((int *)brand_string) = cpu_id[1];
*((int *)(cpu_string + 4)) = cpu_id[3]; *((int *)(brand_string + 4)) = cpu_id[3];
*((int *)(cpu_string + 8)) = cpu_id[2]; *((int *)(brand_string + 8)) = cpu_id[2];
__cpuid(cpu_id, 0x80000000); __cpuid(cpu_id, 0x80000000);
u32 max_ex_fn = cpu_id[0]; u32 max_ex_fn = cpu_id[0];
if (!strcmp(cpu_string, "GenuineIntel")) if (!strcmp(brand_string, "GenuineIntel"))
vendor = VENDOR_INTEL; vendor = VENDOR_INTEL;
else if (!strcmp(cpu_string, "AuthenticAMD")) else if (!strcmp(brand_string, "AuthenticAMD"))
vendor = VENDOR_AMD; vendor = VENDOR_AMD;
else else
vendor = VENDOR_OTHER; vendor = VENDOR_OTHER;
// Set reasonable default brand string even if brand string not available. // Set reasonable default brand string even if brand string not available.
strcpy(brand_string, cpu_string); strcpy(cpu_string, brand_string);
// Detect family and other misc stuff. // Detect family and other misc stuff.
bool ht = false; bool ht = false;
@ -178,13 +178,13 @@ void CPUInfo::Detect()
if (max_ex_fn >= 0x80000004) if (max_ex_fn >= 0x80000004)
{ {
// Extract brand string // Extract CPU model string
__cpuid(cpu_id, 0x80000002); __cpuid(cpu_id, 0x80000002);
memcpy(brand_string, cpu_id, sizeof(cpu_id)); memcpy(cpu_string, cpu_id, sizeof(cpu_id));
__cpuid(cpu_id, 0x80000003); __cpuid(cpu_id, 0x80000003);
memcpy(brand_string + 16, cpu_id, sizeof(cpu_id)); memcpy(cpu_string + 16, cpu_id, sizeof(cpu_id));
__cpuid(cpu_id, 0x80000004); __cpuid(cpu_id, 0x80000004);
memcpy(brand_string + 32, cpu_id, sizeof(cpu_id)); memcpy(cpu_string + 32, cpu_id, sizeof(cpu_id));
} }
if (max_ex_fn >= 0x80000001) if (max_ex_fn >= 0x80000001)
{ {
@ -229,6 +229,10 @@ void CPUInfo::Detect()
std::string CPUInfo::Summarize() std::string CPUInfo::Summarize()
{ {
std::string sum(cpu_string); std::string sum(cpu_string);
sum += " (";
sum += brand_string;
sum += ")";
if (bSSE) sum += ", SSE"; if (bSSE) sum += ", SSE";
if (bSSE2) if (bSSE2)
{ {