Refactor the process of choosing validators.

src/trusted/validator_x86/nccopycode.h

Index: src/trusted/validator_x86/nccopycode.h
diff --git a/src/trusted/validator_x86/nccopycode.h b/src/trusted/validator_x86/nccopycode.h
index f3a86ddc4768ba8921ff87004f70216e1055b7d3..207fee3614f2474029e7516a01b74d6e4937cd49 100644
--- a/src/trusted/validator_x86/nccopycode.h
+++ b/src/trusted/validator_x86/nccopycode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 The Native Client Authors. All rights reserved.
+ * 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.
  */
@@ -7,25 +7,9 @@
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCCOPYCODE_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_NCCOPYCODE_H_
 
-#include "native_client/src/trusted/validator/x86/types_memory_model.h"
-
-#if NACL_TARGET_SUBARCH == 32
-/* Copies code from src to dest in a thread safe way, returns 1 on success,
- * returns 0 on error. This will likely assert on error to avoid partially
- * copied code or undefined state.
- */
-int NCCopyCode(uint8_t *dst, uint8_t *src, NaClPcAddress vbase,
-                size_t sz, int bundle_size);
-
-#elif NACL_TARGET_SUBARCH == 64
-/* Copies code from src to dest in a thread safe way, returns 1 on success,
- * returns 0 on error. This will likely assert on error to avoid partially
- * copied code or undefined state.
+/* Copies a single instruction, avoiding the possibility of other threads
+ * executing a partially changed instruction.
  */
-int NaClCopyCodeIter(uint8_t *dst, uint8_t *src,
-                     NaClPcAddress vbase, size_t size);
-#else
-#error "Unknown Platform"
-#endif
+int NaClCopyInstruction_x86(uint8_t *dst, uint8_t *src, uint8_t sz);
 
 #endif  /* NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_COPYCODE_H_ */