Move CPU features into its own static library.

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

 /*
  * 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.
  */
 
-#include "native_client/src/trusted/validator/x86/nacl_cpuid.h"
+#include "native_client/src/trusted/cpu_features/arch/x86/cpu_x86.h"
 
 /*
- * nacl_cpuid.c
+ * cpu_x86.c
  * Retrieve and decode CPU model specific feature mask.
  */
 #if NACL_WINDOWS
 #include <intrin.h>  /* __cpuid intrinsic */
 #endif  /* NACL_WINDOWS  */
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
@@ skipping 216 matching lines @@
 static const char Cyrix_CPUID0[kVendorIDLength]   = "CyrixInstead";
 static const char NexGen_CPUID0[kVendorIDLength]  = "NexGenDriven";
 static const char Cantaur_CPUID0[kVendorIDLength] = "CentaurHauls";
 static const char Rise_CPUID0[kVendorIDLength]    = "RiseRiseRise";
 static const char SiS_CPUID0[kVendorIDLength]     = "SiS SiS SiS ";
 static const char TM_CPUID0[kVendorIDLength]      = "GenuineTMx86";
 static const char NSC_CPUID0[kVendorIDLength]     = "Geode by NSC";
 #endif
 
 static int asm_HasCPUID(void) {
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86
   volatile int before, after, result;
 #if NACL_BUILD_SUBARCH == 64
   /* Note: If we are running in x86-64, then cpuid must be defined,
    * since CPUID dates from DX2 486, and x86-64 was added after this.
    */
   return 1;
 /* TODO(bradchen): split into separate Windows, etc., files */
 #elif defined(__GNUC__)
   __asm__ volatile("pushfl                \n\t" /* save EFLAGS to eax */
                    "pop %%eax             \n\t"
@@ skipping 21 matching lines @@
     push eax
     popfd
     pushfd
     pop after
   }
 #else
 # error Unsupported platform
 #endif
   result = (before ^ after) & 0x0200000;
   return result;
+#else /* NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 */
+  return 0;
+#endif
 }
 
 static void asm_CPUID(uint32_t op, volatile uint32_t reg[4]) {
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86
 #if defined(__GNUC__)
 #if NACL_BUILD_SUBARCH == 64
  __asm__ volatile("push %%rbx       \n\t" /* save %ebx */
 #else
  __asm__ volatile("pushl %%ebx      \n\t"
 #endif
                    "cpuid            \n\t"
                    "movl %%ebx, %1   \n\t"
                    /* save what cpuid just put in %ebx */
 #if NACL_BUILD_SUBARCH == 64
                    "pop %%rbx        \n\t"
 #else
                    "popl %%ebx       \n\t" /* restore the old %ebx */
 #endif
                    : "=a"(reg[0]), "=S"(reg[1]), "=c"(reg[2]), "=d"(reg[3])
                    : "a"(op)
                    : "cc");
 #elif NACL_WINDOWS
   __cpuid((uint32_t*)reg, op);
 #else
 # error Unsupported platform
 #endif
+#else /* NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 */
+  UNREFERENCED_PARAMETER(op);
+  reg[0] = 0;
+  reg[1] = 0;
+  reg[2] = 0;
+  reg[3] = 0;
+  return;
+#endif
 }
 
 /*
  * Historically CPUID only used eax to select "CPUID function". Function 07h
  * broke this tradition: it's now required to specify "leaf" in ECX register.
  *
  * We can specify leaf in all cases (older "CPUID functions" will just ignore
  * it), but there is a catch: MSVC 2005 or below don't include __cpuidex
  * intrinsic required to call CPUID with leaf support!
  *
  * Thus we have two functions: asm_CPUID (for "CPUID functions" without leaves)
  * and asm_CPUIDx (for "CPUID functions" with leaves). If code is compiled using
  * MSVC 2005 or MSVC 2008 then features detected using function 07h will not be
  * available.
  *
  * Note: MSVC 2008 is particularly problematic: MSVC 2008 does not support
  * __cpuidex while MSVC 2008 SP1 does. Unfortunatelly there are no easy way
  * to distinguish MSVC 2008 SP1 from MSVC 2008 using ifdef's thus we disable
  * __cpuidex for MSVC 2008 unconditionally.
  */
 static void asm_CPUIDx(uint32_t op, volatile uint32_t reg[4], uint32_t ecx) {
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86
 #if defined(__GNUC__)
 #if NACL_BUILD_SUBARCH == 64
  __asm__ volatile("push %%rbx       \n\t" /* save %ebx */
 #else
  __asm__ volatile("pushl %%ebx      \n\t"
 #endif
                    "cpuid            \n\t"
                    "movl %%ebx, %1   \n\t"
                    /* save what cpuid just put in %ebx */
 #if NACL_BUILD_SUBARCH == 64
@@ skipping 14 matching lines @@
 #else
   __cpuidex((uint32_t*)reg, op, ecx);
 #endif
 #else /* NACL_WINDOWS, but _MSC_VER is not defined */
 /* This is Windows but not MSVC: who knows if __cpuidex is available?  */
 # error Unsupported compiler
 #endif
 #else
 # error Unsupported platform
 #endif
+#else /* NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 */
+  UNREFERENCED_PARAMETER(op);
+  UNREFERENCED_PARAMETER(ecx);
+  reg[0] = 0;
+  reg[1] = 0;
+  reg[2] = 0;
+  reg[3] = 0;
+  return;
+#endif
 }
 
 static void CacheCPUVersionID(NaClCPUData* data) {
   uint32_t reg[4] = {0, 0, 0, 0 };
   asm_CPUID(0, reg);
   data->_vidwords[0] = reg[1];
   data->_vidwords[1] = reg[3];
   data->_vidwords[2] = reg[2];
   data->_vidwords[3] = 0;
 }
@@ skipping 250 matching lines @@
 
 void NaClCopyCPUFeaturesX86(NaClCPUFeaturesX86 *target,
                             const NaClCPUFeaturesX86 *source) {
   memcpy(target, source, sizeof(*target));
 }
 
 int NaClArchSupportedX86(const NaClCPUFeaturesX86 *f) {
   return (NaClGetCPUFeatureX86(f, NaClCPUFeatureX86_CPUIDSupported) &&
           NaClGetCPUFeatureX86(f, NaClCPUFeatureX86_CPUSupported));
 }