xt-sys/exectos
3
5
Fork 2
Code Issues 4 Pull Requests Actions Projects 1 Releases Wiki Activity

Update CPU identification code
Some checks failed
Builds / ExectOS (amd64, debug) (push) Successful in 39s
Details
Builds / ExectOS (i686, debug) (push) Successful in 36s
Details
Builds / ExectOS (i686, release) (push) Failing after 1m3s
Details
Builds / ExectOS (amd64, release) (push) Successful in 1m5s
Details

Browse Source
This commit is contained in:
Rafal Kupiec
2026-04-06 21:17:58 +02:00
parent 9eff9874c5
commit 9935d2d26b
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xtoskrnl/ar/amd64/procsup.cc
View File

@@ -97,23 +97,23 @@ AR::ProcSup::IdentifyProcessor(VOID)
if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD) if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD)
{ {
/* AMD CPU */ /* AMD CPU */
if(Prcb->CpuId.Family >= 0xF) if(CpuSignature.Family == 0xF)
{ {
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; Prcb->CpuId.Family += CpuSignature.ExtendedFamily;
Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); Prcb->CpuId.Model += (CpuSignature.ExtendedModel << 4);
} }
} }
else if(Prcb->CpuId.Vendor == CPU_VENDOR_INTEL) else if(Prcb->CpuId.Vendor == CPU_VENDOR_INTEL)
{ {
/* Intel CPU */ /* Intel CPU */
if(Prcb->CpuId.Family == 0xF) if(CpuSignature.Family == 0xF)
{ {
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; Prcb->CpuId.Family += CpuSignature.ExtendedFamily;
} }
if((Prcb->CpuId.Family == 0x6) || (Prcb->CpuId.Family == 0xF)) if((CpuSignature.Family == 0x6) || (CpuSignature.Family == 0xF))
{ {
Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); Prcb->CpuId.Model += (CpuSignature.ExtendedModel << 4);
} }
} }
else else

14
xtoskrnl/ar/i686/procsup.cc
View File

@@ -92,23 +92,23 @@ AR::ProcSup::IdentifyProcessor(VOID)
if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD) if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD)
{ {
/* AMD CPU */ /* AMD CPU */
if(Prcb->CpuId.Family >= 0xF) if(CpuSignature.Family == 0xF)
{ {
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; Prcb->CpuId.Family += CpuSignature.ExtendedFamily;
Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); Prcb->CpuId.Model += (CpuSignature.ExtendedModel << 4);
} }
} }
else if(Prcb->CpuId.Vendor == CPU_VENDOR_INTEL) else if(Prcb->CpuId.Vendor == CPU_VENDOR_INTEL)
{ {
/* Intel CPU */ /* Intel CPU */
if(Prcb->CpuId.Family == 0xF) if(CpuSignature.Family == 0xF)
{ {
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; Prcb->CpuId.Family += CpuSignature.ExtendedFamily;
} }
if((Prcb->CpuId.Family == 0x6) || (Prcb->CpuId.Family == 0xF)) if((CpuSignature.Family == 0x6) || (CpuSignature.Family == 0xF))
{ {
Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); Prcb->CpuId.Model += (CpuSignature.ExtendedModel << 4);
} }
} }
else else