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

src/trusted/validator/x86/ncval_seg_sfi/ncdecode.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.
  */
 
 /*
  * ncdecode.h - table driven decoder for Native Client.
  *
  * This header file contains type declarations and constants
@@ skipping 167 matching lines @@
   struct NCDecoderState* dstate;
   /* Corresopnding index of this instruction wrt to inst_buffer in
    * in the corresponding decoder state NCDecoderState.
    */
   size_t inst_index;
   /* The number of instructions parsed so far (including this instrruction).
    * Used to detect when one tries to get a previous instruction that doesn't
    * exist.
    */
   size_t inst_count;
+  /* 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;
 } NCDecoderInst;
 
 /* Given a (decoded) instruction, return the instruction that appeared
  * n elements before it, or NULL if no such instruction exists.
  *
  * Parameters:
  *    dinst - The instruction to look up relative to.
  *    n - number of elements back to look.
  */
 extern NCDecoderInst *PreviousInst(const NCDecoderInst* dinst, int n);
@@ skipping 191 matching lines @@
  * 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_ */