Refactor the process of choosing validators.

src/trusted/validator/ncvalidate.h

 /*
  * 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.
  */
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCVALIDATE_H__
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCVALIDATE_H__
 
 /* Defines the API to the native client validation code.
@@ skipping 13 matching lines @@
  * would generate the function name NaCL_ApplyValidator_x86_64.
  */
 /* TODO(bradchen): Cleanup the interface to the validator. There
  * are too many combinations of different calls and input parameters,
  * making this interface hard to understand and hard to modify.
  */
 
 #include "native_client/src/include/nacl_base.h"
 #include "native_client/src/shared/utils/types.h"
 #include "native_client/src/trusted/validator/cpufeatures.h"
+#include "native_client/src/trusted/validator/validation_status.h"
 
 EXTERN_C_BEGIN
 
 struct NaClValidationCache;
 
-/* Defines possible validation status values. */

[Nick Bray, 2012/04/25 20:57:42]

See previous comments, it may make sense to keep the enum here.

[pasko-google - do not use, 2012/04/26 15:17:01]

Done.

-typedef enum NaClValidationStatus {
-  /* The call to the validator succeeded. */
-  NaClValidationSucceeded,
-  /* The call to the validator failed (Reason unspecified) */
-  NaClValidationFailed,
-  /* The call to the validator failed, due to not enough memory. */
-  NaClValidationFailedOutOfMemory,
-  /* The call to the validator failed, due to it not being implemented yet. */
-  NaClValidationFailedNotImplemented,
-  /* The call to the validator failed, because the CPU is not supported. */
-  NaClValidationFailedCpuNotSupported,
-  /* The call to the validator failed, due to segment alignment issues. */
-  NaClValidationFailedSegmentationIssue
-} NaClValidationStatus;
-
 /* Applies the validator, as defined by sel_ldr. That is, run the
  * validator where performance is critical.
  * Parameters are:
- *    local_cpu: True if local cpu rules should be applied.
- *           Otherwise, assume no cpu specific rules.
  *    guest_addr - The virtual pc to assume with the beginning address of the
  *           code segment. Typically, this is the corresponding addresss that
  *           will be used by objdump.
  *    data - The contents of the code segment to be validated.
  *    size - The size of the code segment to be validated.
  *    stubout_mode - Whether the validator should stub out disallowed
  *           instructions. This applies the validator silently, stubbing out
  *           instructions that may not validate with a suitable halt
  *           instruction. Note: The return status of NaClValidationSucceeded in
  *           this case does not necessarily imply that all illegal instructions
@@ skipping 29 matching lines @@
     size_t                  size,
     int                     stubout_mode,
     int                     readonly_text,
     const NaClCPUFeatures   *cpu_features,
     struct NaClValidationCache *cache);
 
 /* Applies the validator, as used in a command-line tool to report issues.
  * Note: This is intentionally separated from ApplyValidator, since it need
  * not be performance critical.
  * Parameters are:
- *    local_cpu: True if local cpu rules should be applied.
- *           Otherwise, assume no cpu specific rules.
  *    guest_addr - The virtual pc to assume with the beginning address of the
  *           code segment. Typically, this is the corresponding addresss that
  *           will be used by objdump.
  *    data - The contents of the code segment to be validated.
  *    size - The size of the code segment to be validated.
  *    cpu_features - The CPU features to support while validating.
  */
 extern NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorVerbosely,
                                               NACL_TARGET_ARCH,
                                               NACL_TARGET_SUBARCH)(
@@ skipping 45 matching lines @@
                                               NACL_TARGET_SUBARCH)(
     uintptr_t             guest_addr,
     uint8_t               *data_old,
     uint8_t               *data_new,
     size_t                size,
     const NaClCPUFeatures *cpu_features);
 
 EXTERN_C_END
 
 #endif  /*  NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCVALIDATE_H__ */