OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_CPUID_ARM_H | 7 #ifndef NATIVE_CLIENT_SRC_TRUSTED_CPU_FEATURES_ARCH_ARM_CPU_ARM_H_ |
8 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_CPUID_ARM_H | 8 #define NATIVE_CLIENT_SRC_TRUSTED_CPU_FEATURES_ARCH_ARM_CPU_ARM_H_ |
9 | 9 |
10 #include "native_client/src/include/nacl_compiler_annotations.h" | 10 #include "native_client/src/include/nacl_compiler_annotations.h" |
11 #include "native_client/src/include/nacl_macros.h" | 11 #include "native_client/src/include/nacl_macros.h" |
12 #include "native_client/src/include/portability.h" | 12 #include "native_client/src/include/portability.h" |
13 #include "native_client/src/trusted/validator/ncvalidate.h" | 13 #include "native_client/src/trusted/validator/ncvalidate.h" |
14 | 14 |
15 | 15 |
16 EXTERN_C_BEGIN | 16 EXTERN_C_BEGIN |
17 | 17 |
18 /* List of features supported by ARM CPUs. */ | 18 /* List of features supported by ARM CPUs. */ |
19 typedef enum { | 19 typedef enum { |
20 #define NACL_ARM_CPU_FEATURE(name) NACL_CONCAT(NaClCPUFeatureArm_, name), | 20 #define NACL_ARM_CPU_FEATURE(name) NACL_CONCAT(NaClCPUFeatureArm_, name), |
21 #include "native_client/src/trusted/validator_arm/cpuid_arm_features.h" | 21 #include "native_client/src/trusted/cpu_features/arch/arm/cpu_arm_features.h" |
22 #undef NACL_ARM_CPU_FEATURE | 22 #undef NACL_ARM_CPU_FEATURE |
23 /* Leave the following as the last entry. */ | 23 /* Leave the following as the last entry. */ |
24 NaClCPUFeatureArm_Max | 24 NaClCPUFeatureArm_Max |
25 } NaClCPUFeatureArmID; | 25 } NaClCPUFeatureArmID; |
26 | 26 |
27 typedef struct cpu_feature_struct_arm { | 27 typedef struct cpu_feature_struct_arm { |
28 char data[NaClCPUFeatureArm_Max]; | 28 char data[NaClCPUFeatureArm_Max]; |
29 } NaClCPUFeaturesArm; | 29 } NaClCPUFeaturesArm; |
30 | 30 |
31 /* | 31 /* |
(...skipping 22 matching lines...) Expand all Loading... |
54 void NaClClearCPUFeaturesArm(NaClCPUFeaturesArm *features); | 54 void NaClClearCPUFeaturesArm(NaClCPUFeaturesArm *features); |
55 void NaClCopyCPUFeaturesArm(NaClCPUFeaturesArm *target, | 55 void NaClCopyCPUFeaturesArm(NaClCPUFeaturesArm *target, |
56 const NaClCPUFeaturesArm *source); | 56 const NaClCPUFeaturesArm *source); |
57 /* | 57 /* |
58 * TODO(jfb) The x86 CPU features also offers this function, which is | 58 * TODO(jfb) The x86 CPU features also offers this function, which is |
59 * currently not used on ARM: NaClArchSupportedArm. | 59 * currently not used on ARM: NaClArchSupportedArm. |
60 */ | 60 */ |
61 | 61 |
62 EXTERN_C_END | 62 EXTERN_C_END |
63 | 63 |
64 #endif /* NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_ARM_CPUID_ARM_H */ | 64 #endif /* NATIVE_CLIENT_SRC_TRUSTED_CPU_FEATURES_ARCH_ARM_CPU_ARM_H_ */ |
OLD | NEW |