Move CPU features into its own static library.

src/trusted/cpu_features/arch/x86/cpu_x86.h

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * This module provides a simple abstraction for using the CPUID
  * instruction to determine instruction set extensions supported by
  * the current processor.
  */
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NACL_CPUID_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NACL_CPUID_H_
+#ifndef NATIVE_CLIENT_SRC_TRUSTED_CPU_FEATURES_ARCH_X86_CPU_X86_H_
+#define NATIVE_CLIENT_SRC_TRUSTED_CPU_FEATURES_ARCH_X86_CPU_X86_H_
 
 #include "native_client/src/include/portability.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
 
 
 EXTERN_C_BEGIN
 
 /* The list of features we can get from the CPUID instruction.
  * Do not modify this enum without making similar modifications to
- * CPUFeatureDescriptions in nacl_cpuid.c.
+ * CPUFeatureDescriptions in cpu_x86.c.
  */
 typedef enum {
   NaClCPUFeatureX86_CPUIDSupported,
   NaClCPUFeatureX86_CPUSupported,  /* CPU is one we support. */
   NaClCPUFeatureX86_3DNOW, /* AMD-specific */
   NaClCPUFeatureX86_AES,
   NaClCPUFeatureX86_AVX,
   NaClCPUFeatureX86_BMI1,
   NaClCPUFeatureX86_CLFLUSH,
   NaClCPUFeatureX86_CLMUL,
@@ skipping 31 matching lines @@
 } NaClCPUFeatureX86ID;
 
 /* Features we can get about the x86 hardware. */
 typedef struct cpu_feature_struct_X86 {
   char data[NaClCPUFeatureX86_Max];
 } NaClCPUFeaturesX86;
 
 /* Define the maximum length of a CPUID string.
  *
  * Note: If you change this length, fix the static initialization of wlid
- * in nacl_cpuid.c to be initialized with an appropriate string.
+ * in cpu_x86.c to be initialized with an appropriate string.
  */
 #define /* static const int */ kCPUIDStringLength 21
 
 /* Defines the maximum number of feature registers used to hold CPUID.
  * Note: This value corresponds to the number of enumerated elements in
- * enum CPUFeatureReg defined in nacl_cpuid.c.
+ * enum CPUFeatureReg defined in cpu_x86.c.
  */
 #define kMaxCPUFeatureReg 12
 
 /* Defines the maximum number of extended control registers.
  */
 #define kMaxCPUXCRReg 1
 
 /* Define a cache for collected CPU runtime information, from which
  * queries can answer questions.
  */
@@ skipping 52 matching lines @@
  * TODO(jfb) The ARM and MIPS CPU feature do not offer NaClCopyCPUFeaturesX86
  * and NaClArchSupportedX86, should they be removed?
  */
 void NaClClearCPUFeaturesX86(NaClCPUFeaturesX86 *features);
 void NaClCopyCPUFeaturesX86(NaClCPUFeaturesX86 *target,
                             const NaClCPUFeaturesX86 *source);
 int NaClArchSupportedX86(const NaClCPUFeaturesX86 *features);
 
 EXTERN_C_END
 
-#endif /* NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NACL_CPUID_H_ */
+#endif /* NATIVE_CLIENT_SRC_TRUSTED_CPU_FEATURES_ARCH_X86_CPU_X86_H_ */