Refactor the process of choosing validators.

src/trusted/validator/x86/ncval_seg_sfi/ncdecode.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.
  */
 
 /*
  * ncdecode.h - table driven decoder for Native Client.
  *
  * This header file contains type declarations and constants
  * used by the decoder input table
  */
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCVAL_SEG_SFI_NCDECODE_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCVAL_SEG_SFI_NCDECODE_H_
 
 #include "native_client/src/shared/utils/types.h"
+#include "native_client/src/trusted/validator/ncvalidate.h"
 #include "native_client/src/trusted/validator/x86/error_reporter.h"
 #include "native_client/src/trusted/validator/x86/ncinstbuffer.h"
 #include "native_client/src/trusted/validator/x86/x86_insts.h"
 
 EXTERN_C_BEGIN
 
 struct NCDecoderInst;
 struct NCDecoderState;
 
 /* Function type for a decoder action. Returns TRUE if action
@@ skipping 351 matching lines @@
   /* PROTECTED: */
 
   /* The old decoder state. */
   NCDecoderState* old_dstate;
 
   /* The new decoder state. */
   NCDecoderState* new_dstate;
 
   /* The (virtual method) action to apply to each instruction. */
   NCDecoderStatePairAction action_fn;
+
+  /* Utility function that copies a single instruction in memory, can be used in
+   * actions.
+   */
+  NaClCopyInstructionFunc copy_func;
 } NCDecoderStatePair;
 
 /*
  * Construct a decoder state pair.
  *
  * Parameters are:
  *    tthis - The decoder state pair to construct.
  *    old_dstate - A constructed old decoder state to use.
  *    new_dstate - A constructed new decoder state to use.
  *
  * Note: Constructors of subclasses of NCDecoderStatePair should
  * call this constructor first, to initialize the decoder pair fields.
  */
-extern void NCDecoderStatePairConstruct(NCDecoderStatePair* tthis,
-                                        NCDecoderState* old_dstate,
-                                        NCDecoderState* new_dstate);
+extern void NCDecoderStatePairConstruct(
+    NCDecoderStatePair* tthis,
+    NCDecoderState* old_dstate,
+    NCDecoderState* new_dstate,
+    NaClCopyInstructionFunc copy_func);
 
 /*
  * Decode the memory segments in each instruction state, applying
  * the appropriate action on each instruction till either:
  * (1) The instruction lengths differ.
  * (2) The action returns false.
  * Returns true if no instruction lengths differ, and the action
  * returns true for all found instructions.
  */
 extern Bool NCDecoderStatePairDecode(NCDecoderStatePair* tthis);
 
 /*
  * Destruct a decoder state pair.
  *
  * Note: Destructors of subclasses of NCDecoderStatePair should
  * call this distructor last, after the subinstance has been destructed.
  */
 extern void NCDecoderStatePairDestruct(NCDecoderStatePair* tthis);
 
 EXTERN_C_END
 
 #endif  /* NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCVAL_SEG_SFI_NCDECODE_H_ */