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

Compose the AMD family and model IDs according to the AMD CPUID manual, section 2
All checks were successful
Builds / ExectOS (i686) (push) Successful in 39s
Details
Builds / ExectOS (amd64) (push) Successful in 41s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2024-05-14 19:39:07 +02:00
parent 2a8cc7397e
commit 9f1a4f0ced
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xtoskrnl/ar/amd64/procsup.c
View File

@ -167,9 +167,9 @@ ArpIdentifyProcessor(VOID)
if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD) if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD)
{ {
/* AMD CPU */ /* AMD CPU */
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; if(Prcb->CpuId.Family >= 0xF)
if(Prcb->CpuId.Model == 0xF)
{ {
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily;
Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4);
} }
} }
@ -181,7 +181,7 @@ ArpIdentifyProcessor(VOID)
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily;
} }
if((Prcb->CpuId.Family == 0xF) || (Prcb->CpuId.Family == 0x6)) if((Prcb->CpuId.Family == 0x6) || (Prcb->CpuId.Family == 0xF))
{ {
Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4);
} }

6
xtoskrnl/ar/i686/procsup.c
View File

@ -162,9 +162,9 @@ ArpIdentifyProcessor(VOID)
if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD) if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD)
{ {
/* AMD CPU */ /* AMD CPU */
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; if(Prcb->CpuId.Family >= 0xF)
if(Prcb->CpuId.Model == 0xF)
{ {
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily;
Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4);
} }
} }
@ -176,7 +176,7 @@ ArpIdentifyProcessor(VOID)
Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily; Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily;
} }
if((Prcb->CpuId.Family == 0xF) || (Prcb->CpuId.Family == 0x6)) if((Prcb->CpuId.Family == 0x6) || (Prcb->CpuId.Family == 0xF))
{ {
Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4); Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4);
} }