Refactor the process of choosing validators.

src/trusted/validator/x86/64/ncvalidate.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.
  */
 
 /* Implement the ApplyValidator 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"
@@ skipping 15 matching lines @@
     int readonly_text,
     const NaClCPUFeaturesX86 *cpu_features,
     struct NaClValidatorState** vstate_ptr) {
   *vstate_ptr = NaClValidatorStateCreate(guest_addr, size, RegR15,
                                          readonly_text, cpu_features);
   return (*vstate_ptr == NULL)
       ? NaClValidationFailedOutOfMemory
       : NaClValidationSucceeded;     /* or at least to this point! */
 }
 
-NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, x86, 64) (
+static NaClValidationStatus ApplyValidator_x86_64(
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
     int stubout_mode,
     int readonly_text,
     const NaClCPUFeaturesX86 *cpu_features,
     struct NaClValidationCache *cache) {
   struct NaClValidatorState *vstate;
   NaClValidationStatus status;
   void *query = NULL;
@@ skipping 44 matching lines @@
     /* Don't cache the result if the code is modified. */
     if (status == NaClValidationSucceeded && !NaClValidatorDidStubOut(vstate))
       cache->SetKnownToValidate(query);
     cache->DestroyQuery(query);
   }
 
   NaClValidatorStateDestroy(vstate);
   return status;
 }
 
-NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, x86, 64)
-    (uintptr_t guest_addr,
-     uint8_t *data_old,
-     uint8_t *data_new,
-     size_t size,
-     const NaClCPUFeaturesX86 *cpu_features) {
+static NaClValidationStatus ApplyValidatorCodeReplacement_x86_64(
+    uintptr_t guest_addr,
+    uint8_t *data_old,
+    uint8_t *data_new,
+    size_t size,
+    const NaClCPUFeaturesX86 *cpu_features) {
   NaClValidationStatus status;
   struct NaClValidatorState *vstate;
 
   /* Check that the given parameter values are supported. */
   if (!NaClArchSupported(cpu_features))
     return NaClValidationFailedCpuNotSupported;
 
   /* Init then validator state. */
   status = NaClValidatorSetup_x86_64(guest_addr, size, FALSE,
                                      cpu_features, &vstate);
   if (status != NaClValidationSucceeded)
     return status;
   NaClValidatorStateSetLogVerbosity(vstate, LOG_ERROR);
 
   /* Validate. */
   NaClValidateSegmentPair(data_old, data_new, guest_addr, size, vstate);
   status = NaClValidatesOk(vstate) ?
       NaClValidationSucceeded : NaClValidationFailed;
 
   NaClValidatorStateDestroy(vstate);
   return status;
 }
+
+extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCopy, x86, 64)
+(uintptr_t guest_addr,

[Nick Bray, 2012/04/27 22:21:36]

'(' on previous line; indent.

[pasko-google - do not use, 2012/05/12 12:18:40]

Done.

+ uint8_t *data_old,
+ uint8_t *data_new,
+ size_t size,
+ const NaClCPUFeaturesX86 *cpu_features);
+
+static struct NaClValidatorInterface validator = {

[Nick Bray, 2012/04/27 22:21:36]

const?

[pasko-google - do not use, 2012/05/12 12:18:40]

Done.

+  ApplyValidator_x86_64,
+  NACL_SUBARCH_NAME(ApplyValidatorCopy, x86, 64),
+  ApplyValidatorCodeReplacement_x86_64,
+};
+
+void NaClValidatorInit_x86_64(struct NaClValidatorInterface **val) {

[Nick Bray, 2012/04/27 22:21:36]

Maybe this should be a getter (returns the pointer) instead of a setter?

[pasko-google - do not use, 2012/05/12 12:18:40]

yep, cleaner
also has a viral effect on NaClSelectValidator() which now turns into
NaClCreateValidator.

+  *val = &validator;
+}