Index: src/trusted/cpu_features/arch/mips/cpu_mips.c |
diff --git a/src/trusted/validator_mips/cpuid_mips.c b/src/trusted/cpu_features/arch/mips/cpu_mips.c |
similarity index 91% |
rename from src/trusted/validator_mips/cpuid_mips.c |
rename to src/trusted/cpu_features/arch/mips/cpu_mips.c |
index b5b04a52f83d11da96264a0a6f8676bde13f8e11..7c17009aa95b7e9153b2f5915523be2519c5c501 100644 |
--- a/src/trusted/validator_mips/cpuid_mips.c |
+++ b/src/trusted/cpu_features/arch/mips/cpu_mips.c |
@@ -7,13 +7,13 @@ |
#include <string.h> |
#include "native_client/src/shared/platform/nacl_log.h" |
-#include "native_client/src/trusted/validator_mips/cpuid_mips.h" |
+#include "native_client/src/trusted/cpu_features/arch/mips/cpu_mips.h" |
void NaClSetAllCPUFeaturesMips(NaClCPUFeatures *f) { |
/* TODO(jfb) Use a safe cast in this interface. */ |
NaClCPUFeaturesMips *features = (NaClCPUFeaturesMips *) f; |
- /* Pedantic: avoid using memset, as in x86's nacl_cpuid.c. */ |
+ /* Pedantic: avoid using memset, as in x86's cpu_x86.c. */ |
int id; |
/* Ensure any padding is zeroed. */ |
NaClClearCPUFeaturesMips(features); |
@@ -66,7 +66,7 @@ void NaClSetCPUFeatureMips(NaClCPUFeaturesMips *f, NaClCPUFeatureMipsID id, |
const char *NaClGetCPUFeatureMipsName(NaClCPUFeatureMipsID id) { |
static const char *kFeatureMipsNames[NaClCPUFeatureMips_Max] = { |
# define NACL_MIPS_CPU_FEATURE(name) NACL_TO_STRING(name), |
-# include "native_client/src/trusted/validator_mips/cpuid_mips_features.h" |
+# include "native_client/src/trusted/cpu_features/arch/mips/cpu_mips_features.h" |
# undef NACL_MIPS_CPU_FEATURE |
}; |
return ((unsigned)id < NaClCPUFeatureMips_Max) ? |