Merge 7712 - Ensure super instructions are marked during dynamic code modification.

src/trusted/validator/x86/decoder/nc_inst_state_internal.h

 /*
  * Copyright (c) 2011 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.
  */
 
 /*
  * Internal implementation of the state associated with matching instructions.
  */
 
@@ skipping 84 matching lines @@
    * Note: One can assume that two instructions use the same modeled
    * NaClInst iff the pointers are equals.
    */
   const NaClInst* inst;
   /* The corresponding expression tree denoted by the matched instruction. */
   NaClExpVector nodes;
   /* Transient pointer, which is defined each time an instruction is decoded.
    * It defines the decoder tables to use to decode the instruction.
    */
   struct NaClDecodeTables* decoder_tables;
+  /* True if the instruction is unchanged while dynamically replacing code.
+   * False if the instruction has changed or if code replacement is not being
+   * performed (i.e. normal validation.)
+   */
+  Bool unchanged;
 };
 
 /* Model of an instruction iterator. */
 struct NaClInstIter {
   /* Defines the decoder table to use to decode the instruction. */
   struct NaClDecodeTables* decoder_tables;
   /* Defines the segment to process */
   struct NaClSegment* segment;
   /* Defines the remaining memory to iterate over. */
   NCRemainingMemory memory;
@@ skipping 41 matching lines @@
 
 /* Returns the (undecoded) instruction state of the iterator. Should only
  * be used for testing.
  */
 
 struct NaClInstState* NaClInstIterGetUndecodedState(struct NaClInstIter* iter);
 
 EXTERN_C_END
 
 #endif  /* NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_DECODER_NC_INST_STATE_INTERNAL_H_ */