Refactor the process of choosing validators.

src/trusted/validator_ragel/unreviewed/dfa_validate_64.c

Index: src/trusted/validator_ragel/unreviewed/dfa_validate_64.c
diff --git a/src/trusted/validator_ragel/unreviewed/dfa_validate_64.c b/src/trusted/validator_ragel/unreviewed/dfa_validate_64.c
index 22b920b236e40f993535d280b9f25b2d4244ede4..089cfd7da3c129cf3b684ec212cb907f9b18b625 100644
--- a/src/trusted/validator_ragel/unreviewed/dfa_validate_64.c
+++ b/src/trusted/validator_ragel/unreviewed/dfa_validate_64.c
@@ -4,7 +4,7 @@
  * found in the LICENSE file.
  */
 
-/* Implement the ApplyDfaValidator API for the x86-64 architecture. */
+/* Implement the Validator API for the x86-64 architecture. */
 #include <assert.h>
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
@@ -25,7 +25,7 @@ static void ProcessError(const uint8_t *ptr, void *userdata) {
   UNREFERENCED_PARAMETER(userdata);
 }
 
-NaClValidationStatus NACL_SUBARCH_NAME(ApplyDfaValidator, x86, 64) (
+static NaClValidationStatus ApplyDfaValidator_x86_64(
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
@@ -47,3 +47,43 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyDfaValidator, x86, 64) (
   }
   return NaClValidationFailed;
 }
+
+static NaClValidationStatus ValidatorCopyNotImplemented(
+    uintptr_t guest_addr,
+    uint8_t *data_old,
+    uint8_t *data_new,
+    size_t size,
+    const NaClCPUFeatures *cpu_features,
+    NaClCopyInstructionFunc copy_func) {
+  UNREFERENCED_PARAMETER(guest_addr);
+  UNREFERENCED_PARAMETER(data_old);
+  UNREFERENCED_PARAMETER(data_new);
+  UNREFERENCED_PARAMETER(size);
+  UNREFERENCED_PARAMETER(cpu_features);
+  UNREFERENCED_PARAMETER(copy_func);
+  return NaClValidationFailedNotImplemented;
+}
+
+static NaClValidationStatus ValidatorCodeReplacementNotImplemented(
+    uintptr_t guest_addr,
+    uint8_t *data_old,
+    uint8_t *data_new,
+    size_t size,
+    const NaClCPUFeatures *cpu_features) {
+  UNREFERENCED_PARAMETER(guest_addr);
+  UNREFERENCED_PARAMETER(data_old);
+  UNREFERENCED_PARAMETER(data_new);
+  UNREFERENCED_PARAMETER(size);
+  UNREFERENCED_PARAMETER(cpu_features);
+  return NaClValidationFailedNotImplemented;
+}
+
+static const struct NaClValidatorInterface validator = {
+  ApplyDfaValidator_x86_64,
+  ValidatorCopyNotImplemented,
+  ValidatorCodeReplacementNotImplemented,
+};
+
+const struct NaClValidatorInterface* NaClDfaValidatorCreate_x86_64() {

[Mark Seaborn, 2012/06/21 18:42:01]

Use " *" spacing style

[pasko-google - do not use, 2012/06/22 10:11:27]

Done.

+  return &validator;
+}