Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 22:37:30 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'upstream-KWSys' into update-kwsys

Browse Source 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-01-05 (a72d59e1)
This commit is contained in:
Brad King
2021-01-05 06:56:08 -05:00
parent 764ce15ffb 3887390a37
commit b6ae9ddc41
1 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Source/kwsys/SystemInformation.cxx
View File

@@ -447,6 +447,7 @@ public:
Motorola, Motorola,
HP, HP,
Hygon, Hygon,
Zhaoxin,
UnknownManufacturer UnknownManufacturer
}; };
@@ -1731,7 +1732,8 @@ const char* SystemInformationImplementation::GetVendorID()
case NexGen: case NexGen:
return "NexGen Inc., Advanced Micro Devices"; return "NexGen Inc., Advanced Micro Devices";
case IDT: case IDT:
return "IDT\\Centaur, Via Inc."; return "IDT\\Centaur, Via Inc., Shanghai Zhaoxin Semiconductor Co., "
"Ltd.";
case UMC: case UMC:
return "United Microelectronics Corp."; return "United Microelectronics Corp.";
case Rise: case Rise:
@@ -1748,6 +1750,8 @@ const char* SystemInformationImplementation::GetVendorID()
return "Hewlett-Packard"; return "Hewlett-Packard";
case Hygon: case Hygon:
return "Chengdu Haiguang IC Design Co., Ltd."; return "Chengdu Haiguang IC Design Co., Ltd.";
case Zhaoxin:
return "Shanghai Zhaoxin Semiconductor Co., Ltd.";
case UnknownManufacturer: case UnknownManufacturer:
default: default:
return "Unknown Manufacturer"; return "Unknown Manufacturer";
@@ -2109,7 +2113,10 @@ void SystemInformationImplementation::FindManufacturer(
else if (this->ChipID.Vendor == "NexGenDriven") else if (this->ChipID.Vendor == "NexGenDriven")
this->ChipManufacturer = NexGen; // NexGen Inc. (now AMD) this->ChipManufacturer = NexGen; // NexGen Inc. (now AMD)
else if (this->ChipID.Vendor == "CentaurHauls") else if (this->ChipID.Vendor == "CentaurHauls")
this->ChipManufacturer = IDT; // IDT/Centaur (now VIA) this->ChipManufacturer = IDT; // original IDT/Centaur/VIA (now Zhaoxin)
else if (this->ChipID.Vendor == " Shanghai ")
this->ChipManufacturer =
Zhaoxin; // Shanghai Zhaoxin Semiconductor Co., Ltd.
else if (this->ChipID.Vendor == "RiseRiseRise") else if (this->ChipID.Vendor == "RiseRiseRise")
this->ChipManufacturer = Rise; // Rise this->ChipManufacturer = Rise; // Rise
else if (this->ChipID.Vendor == "GenuineTMx86") else if (this->ChipID.Vendor == "GenuineTMx86")
@@ -3223,7 +3230,8 @@ bool SystemInformationImplementation::RetrieveClassicalCPUIdentity()
this->ChipID.ProcessorName = "C3"; this->ChipID.ProcessorName = "C3";
break; break;
default: default:
this->ChipID.ProcessorName = "Unknown IDT\\Centaur family"; this->ChipID.ProcessorName =
"Unknown IDT\\Centaur\\VIA\\Zhaoxin family";
return false; return false;
} }
break; break;
@@ -3232,13 +3240,63 @@ bool SystemInformationImplementation::RetrieveClassicalCPUIdentity()
case 6: case 6:
this->ChipID.ProcessorName = "VIA Cyrix III - Samuel"; this->ChipID.ProcessorName = "VIA Cyrix III - Samuel";
break; break;
case 0xf:
this->ChipID.ProcessorName = "Zhaoxin zxc";
break;
default: default:
this->ChipID.ProcessorName = "Unknown IDT\\Centaur family"; this->ChipID.ProcessorName =
"Unknown IDT\\Centaur\\VIA\\Zhaoxin family";
return false;
}
break;
case 7:
switch (this->ChipID.Model) {
case 0x1b:
this->ChipID.ProcessorName = "Zhaoxin kx5000";
break;
case 0x3b:
this->ChipID.ProcessorName = "Zhaoxin kx6000";
break;
default:
this->ChipID.ProcessorName =
"Unknown IDT\\Centaur\\VIA\\Zhaoxin family";
return false; return false;
} }
break; break;
default: default:
this->ChipID.ProcessorName = "Unknown IDT\\Centaur family"; this->ChipID.ProcessorName =
"Unknown IDT\\Centaur\\VIA\\Zhaoxin family";
return false;
}
break;
case Zhaoxin:
switch (this->ChipID.Family) {
case 6:
switch (this->ChipID.Model) {
case 0x19:
this->ChipID.ProcessorName = "Zhaoxin zxc";
break;
default:
this->ChipID.ProcessorName = "Unknown Zhaoxin family";
return false;
}
break;
case 7:
switch (this->ChipID.Model) {
case 0x1b:
this->ChipID.ProcessorName = "Zhaoxin kx5000";
break;
case 0x3b:
this->ChipID.ProcessorName = "Zhaoxin kx6000";
break;
default:
this->ChipID.ProcessorName = "Unknown Zhaoxin family";
return false;
}
break;
default:
this->ChipID.ProcessorName = "Unknown Zhaoxin family";
return false; return false;
} }
break; break;