From 338484f6f2176c3d8ede0ed2f3fbd6cf1eb0274c Mon Sep 17 00:00:00 2001 From: Guillaume Chatelet Date: Thu, 8 Feb 2018 11:35:31 +0100 Subject: [PATCH] Fixes #2 - vpclmulqdq should be pclmulqdq. --- include/cpuinfo_x86.h | 4 ++-- src/cpuinfo_x86.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/cpuinfo_x86.h b/include/cpuinfo_x86.h index 6baf04b..b153e6a 100644 --- a/include/cpuinfo_x86.h +++ b/include/cpuinfo_x86.h @@ -25,7 +25,7 @@ typedef struct { int erms : 1; int f16c : 1; int fma3 : 1; - int vpclmulqdq : 1; + int pclmulqdq : 1; int bmi1 : 1; int bmi2 : 1; @@ -110,7 +110,7 @@ typedef enum { X86_ERMS, X86_F16C, X86_FMA3, - X86_VPCLMULQDQ, + X86_PCLMULQDQ, X86_BMI1, X86_BMI2, X86_SSSE3, diff --git a/src/cpuinfo_x86.c b/src/cpuinfo_x86.c index 3238ab1..d4eb2d5 100644 --- a/src/cpuinfo_x86.c +++ b/src/cpuinfo_x86.c @@ -100,7 +100,7 @@ static void ParseCpuId(const uint32_t max_cpuid_leaf, X86Info* info) { features->f16c = IsBitSet(leaf_1.ecx, 29); features->bmi1 = IsBitSet(leaf_7.ebx, 3); features->bmi2 = IsBitSet(leaf_7.ebx, 8); - features->vpclmulqdq = IsBitSet(leaf_7.ecx, 10); + features->pclmulqdq = IsBitSet(leaf_7.ecx, 10); if (have_sse_os_support) { features->ssse3 = IsBitSet(leaf_1.ecx, 9); @@ -267,8 +267,8 @@ int GetX86FeaturesEnumValue(const X86Features* features, return features->f16c; case X86_FMA3: return features->fma3; - case X86_VPCLMULQDQ: - return features->vpclmulqdq; + case X86_PCLMULQDQ: + return features->pclmulqdq; case X86_BMI1: return features->bmi1; case X86_BMI2: @@ -329,8 +329,8 @@ const char* GetX86FeaturesEnumName(X86FeaturesEnum value) { return "f16c"; case X86_FMA3: return "fma3"; - case X86_VPCLMULQDQ: - return "vpclmulqdq"; + case X86_PCLMULQDQ: + return "pclmulqdq"; case X86_BMI1: return "bmi1"; case X86_BMI2: