Refactor the process of choosing validators.

src/trusted/validator/x86/32/ncvalidate.c

Index: src/trusted/validator/x86/32/ncvalidate.c
diff --git a/src/trusted/validator/x86/32/ncvalidate.c b/src/trusted/validator/x86/32/ncvalidate.c
index d28b56fd9f64c7be14da424da5d470ac8b1a936a..b7acfb34c45a5f0dccd3f0b275776aee51d3031f 100644
--- a/src/trusted/validator/x86/32/ncvalidate.c
+++ b/src/trusted/validator/x86/32/ncvalidate.c
@@ -23,7 +23,7 @@
 # endif
 #endif
 
-NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, NACL_TARGET_ARCH, 32) (
+static NaClValidationStatus ApplyValidator_x86_32(
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
@@ -90,12 +90,12 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, NACL_TARGET_ARCH, 32) (
       ? NaClValidationSucceeded : NaClValidationFailed;
 }
 
-NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, x86, 32)
-    (uintptr_t guest_addr,
-     uint8_t *data_old,
-     uint8_t *data_new,
-     size_t size,
-     const NaClCPUFeaturesX86 *cpu_features) {
+static NaClValidationStatus ApplyValidatorCodeReplacement_x86_32(
+    uintptr_t guest_addr,
+    uint8_t *data_old,
+    uint8_t *data_new,
+    size_t size,
+    const NaClCPUFeaturesX86 *cpu_features) {
   /* Check that the given parameter values are supported. */
   if (!NaClArchSupported(cpu_features))
     return NaClValidationFailedCpuNotSupported;
@@ -104,3 +104,20 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, x86, 32)
                                size, cpu_features)
       ? NaClValidationSucceeded : NaClValidationFailed;
 }
+
+extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy, x86, 32)
+(uintptr_t guest_addr,
+ uint8_t *data_old,
+ uint8_t *data_new,
+ size_t size,
+ const NaClCPUFeaturesX86 *cpu_features);
+
+static struct NaClValidatorInterface validator = {
+  ApplyValidator_x86_32,
+  NACL_SUBARCH_NAME(ApplyValidatorCopy, x86, 32),
+  ApplyValidatorCodeReplacement_x86_32,
+};
+
+void NaClValidatorInit_x86_32(struct NaClValidatorInterface **val) {
+  *val = &validator;
+}