Refactor the process of choosing validators.

src/tools/validator_tools/ncstubout.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.
  */
 
 /*
  * This tool rewrites ELF files to replace instructions that will be
  * rejected by the validator with safe HLT instructions.  This is
  * useful if you have a large library in which many functions do not
@@ skipping 11 matching lines @@
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/utils/types.h"
 #include "native_client/src/trusted/validator/cpufeatures.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
 
 static Bool FixUpSection(uintptr_t load_address,
                          unsigned char *code,
                          size_t code_size) {
   NaClValidationStatus status;
   NaClCPUFeatures cpu_features;
+  const struct NaClValidatorInterface *validator = NaClCreateValidator();
   /* Pretend that the CPU supports every feature so that we will only stub out
    * instructions that NaCl will never allow under any condition.
    */
   NaClSetAllCPUFeatures(&cpu_features);
 
-  status = NACL_SUBARCH_NAME(ApplyValidator,
-                             NACL_TARGET_ARCH,
-                             NACL_TARGET_SUBARCH)
-      (load_address, code, code_size,
+  status = validator->Validate(load_address, code, code_size,
        /* stubout_mode= */ TRUE, /* readonly_text= */ FALSE,
        &cpu_features, NULL);
   if (status == NaClValidationSucceeded) {
     /* Now run the validator again, so that we report any errors
      * that were not fixed by stubbing out. This is done so that
      * the user knows that stubout doesn't fix all errors.
      */
     status = NACL_SUBARCH_NAME(ApplyValidatorVerbosely,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)
@@ skipping 149 matching lines @@
     fprintf(stderr, "Usage: %s <input-file> -o <output-file>\n\n", argv[0]);
     fprintf(stderr,
             "This tool rewrites ELF objects to replace instructions that are\n"
             "rejected by the NaCl validator with safe HLT instructions.\n");
     GioFileDtor((struct Gio*) &err);
     return 1;
   }
   GioFileDtor((struct Gio*) &err);
   return FixUpELFFile(argv[1], argv[3]) ? 0 : 1;
 }