From 9935d2d26b8bb7b83a82edb20e3e1447c5fae59f Mon Sep 17 00:00:00 2001 From: Rafal Kupiec Date: Mon, 6 Apr 2026 21:17:58 +0200 Subject: [PATCH] Update CPU identification code --- xtoskrnl/ar/amd64/procsup.cc | 14 +++++++------- xtoskrnl/ar/i686/procsup.cc | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xtoskrnl/ar/amd64/procsup.cc b/xtoskrnl/ar/amd64/procsup.cc index e8f3d40..bd4c8db 100644 --- a/xtoskrnl/ar/amd64/procsup.cc +++ b/xtoskrnl/ar/amd64/procsup.cc @@ -97,23 +97,23 @@ AR::ProcSup::IdentifyProcessor(VOID) if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD) { /* AMD CPU */ - if(Prcb->CpuId.Family >= 0xF) + if(CpuSignature.Family == 0xF) { - Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; - Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); + Prcb->CpuId.Family += CpuSignature.ExtendedFamily; + Prcb->CpuId.Model += (CpuSignature.ExtendedModel << 4); } } else if(Prcb->CpuId.Vendor == CPU_VENDOR_INTEL) { /* 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 diff --git a/xtoskrnl/ar/i686/procsup.cc b/xtoskrnl/ar/i686/procsup.cc index 1d1e190..d7e01cd 100644 --- a/xtoskrnl/ar/i686/procsup.cc +++ b/xtoskrnl/ar/i686/procsup.cc @@ -92,23 +92,23 @@ AR::ProcSup::IdentifyProcessor(VOID) if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD) { /* AMD CPU */ - if(Prcb->CpuId.Family >= 0xF) + if(CpuSignature.Family == 0xF) { - Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; - Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); + Prcb->CpuId.Family += CpuSignature.ExtendedFamily; + Prcb->CpuId.Model += (CpuSignature.ExtendedModel << 4); } } else if(Prcb->CpuId.Vendor == CPU_VENDOR_INTEL) { /* 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