From 76dafc7e3b197c532ba1951d13f0b0e73858b530 Mon Sep 17 00:00:00 2001 From: Guillaume Chatelet Date: Mon, 21 Sep 2020 14:54:13 +0200 Subject: [PATCH] [NFC] Remove unused `max_cpuid_leaf` variable (#131) --- src/cpuinfo_x86.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/cpuinfo_x86.c b/src/cpuinfo_x86.c index a75e52e..21bbe0c 100644 --- a/src/cpuinfo_x86.c +++ b/src/cpuinfo_x86.c @@ -1154,9 +1154,10 @@ static void ParseCpuId(const uint32_t max_cpuid_leaf, X86Info* info, OsSupport* } // Reference https://en.wikipedia.org/wiki/CPUID#EAX=80000000h:_Get_Highest_Extended_Function_Implemented. -static void ParseExtraAMDCpuId(const uint32_t max_cpuid_leaf, X86Info* info, OsSupport os_support) { +static void ParseExtraAMDCpuId(X86Info* info, OsSupport os_support) { const Leaf leaf_80000000 = CpuId(0x80000000); - const Leaf leaf_80000001 = SafeCpuId(leaf_80000000.eax, 0x80000001); + const uint32_t max_extended_cpuid_leaf = leaf_80000000.eax; + const Leaf leaf_80000001 = SafeCpuId(max_extended_cpuid_leaf, 0x80000001); X86Features* const features = &info->features; @@ -1177,13 +1178,15 @@ X86Info GetX86Info(void) { X86Info info = kEmptyX86Info; OsSupport os_support = kEmptyOsSupport; const Leaf leaf_0 = CpuId(0); - const uint32_t max_cpuid_leaf = leaf_0.eax; + const bool is_intel = IsVendor(leaf_0, "GenuineIntel"); + const bool is_amd = IsVendor(leaf_0, "AuthenticAMD"); SetVendor(leaf_0, info.vendor); - if (IsVendor(leaf_0, "GenuineIntel") || IsVendor(leaf_0, "AuthenticAMD")) { + if (is_intel || is_amd) { + const uint32_t max_cpuid_leaf = leaf_0.eax; ParseCpuId(max_cpuid_leaf, &info, &os_support); } - if (IsVendor(leaf_0, "AuthenticAMD")) { - ParseExtraAMDCpuId(max_cpuid_leaf, &info, os_support); + if (is_amd) { + ParseExtraAMDCpuId(&info, os_support); } return info; }