Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:CM] Refactor full CPU identifier values

Browse source 
Dedicated to Victor Perevertkin.
This commit is contained in:
Stanislav Motylkov 2022-01-05 02:48:54 +03:00
parent 84cc81ee29
commit 77fd33c99c
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ntoskrnl/config/i386/cmhardwr.c
View file

@ -14,14 +14,7 @@
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
#ifdef _M_IX86 PCHAR CmpFullCpuID = "%s Family %u Model %u Stepping %u";
PCHAR CmpID1 = "80%u86-%c%x";
PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u";
#else
PCHAR CmpID1 = "EM64T Family %u Model %u Stepping %u";
PCHAR CmpID2 = "AMD64 Family %u Model %u Stepping %u";
PCHAR CmpID3 = "VIA64 Family %u Model %u Stepping %u";
#endif
PCHAR CmpBiosStrings[] = PCHAR CmpBiosStrings[] =
{ {
"Ver", "Ver",
@ -353,7 +346,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
for (i = 0; i < KeNumberProcessors; i++) for (i = 0; i < KeNumberProcessors; i++)
{ {
#ifdef _M_AMD64 #ifdef _M_AMD64
PCHAR CmpID; PCHAR FamilyId;
#endif #endif
/* Get the PRCB */ /* Get the PRCB */
Prcb = KiProcessorBlock[i]; Prcb = KiProcessorBlock[i];
@ -370,18 +363,19 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
/* Check if the CPU doesn't support CPUID */ /* Check if the CPU doesn't support CPUID */
if (!Prcb->CpuID) if (!Prcb->CpuID)
{ {
/* Build ID1-style string for older CPUs */ /* Build 80x86-style string for older CPUs */
sprintf(Buffer, sprintf(Buffer,
CmpID1, "80%u86-%c%x",
Prcb->CpuType, Prcb->CpuType,
(Prcb->CpuStep >> 8) + 'A', (Prcb->CpuStep >> 8) + 'A',
Prcb->CpuStep & 0xff); Prcb->CpuStep & 0xff);
} }
else else
{ {
/* Build ID2-style string for newer CPUs */ /* Build full ID string for newer CPUs */
sprintf(Buffer, sprintf(Buffer,
CmpID2, CmpFullCpuID,
"x86",
Prcb->CpuType, Prcb->CpuType,
(Prcb->CpuStep >> 8), (Prcb->CpuStep >> 8),
Prcb->CpuStep & 0xff); Prcb->CpuStep & 0xff);
@ -390,22 +384,23 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
if (Prcb->CpuVendor == CPU_VIA) if (Prcb->CpuVendor == CPU_VIA)
{ {
/* This is VIA64 family */ /* This is VIA64 family */
CmpID = CmpID3; FamilyId = "VIA64";
} }
else if (Prcb->CpuVendor == CPU_AMD) else if (Prcb->CpuVendor == CPU_AMD)
{ {
/* This is AMD64 family */ /* This is AMD64 family */
CmpID = CmpID2; FamilyId = "AMD64";
} }
else else
{ {
/* This is generic EM64T family */ /* This is generic EM64T family */
CmpID = CmpID1; FamilyId = "EM64T";
} }
/* ID string has the same style for all 64-bit CPUs */ /* ID string has the same style for all 64-bit CPUs */
sprintf(Buffer, sprintf(Buffer,
CmpID, CmpFullCpuID,
FamilyId,
Prcb->CpuType, Prcb->CpuType,
(Prcb->CpuStep >> 8), (Prcb->CpuStep >> 8),
Prcb->CpuStep & 0xff); Prcb->CpuStep & 0xff);