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

src/trusted/validator/x86/decoder/nc_inst_state_statics.c

 /*
  * 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.
  */
 
 /*
  * This file contains includes, static functions, and constants that are used
  * in nc_inst_state.c, but have been factored out and put into this file, so
  * that we can test them. That is, to allow nc_inst_state.c and
@@ skipping 47 matching lines @@
   state->sib = 0;
   state->num_disp_bytes = 0;
   state->first_disp_byte = 0;
   state->num_imm_bytes = 0;
   state->first_imm_byte = 0;
   state->num_imm2_bytes = 0;
   state->prefix_mask = 0;
   state->inst = NULL;
   state->nodes.is_defined = FALSE;
   state->nodes.number_expr_nodes = 0;
+  state->unchanged = FALSE;
 }
 
 /* Computes the number of bytes defined for operands of the matched
  * instruction of the given state.
  */
 static int NaClExtractOpSize(NaClInstState* state) {
   if (NaClHasBit(state->inst->flags, NACL_IFLAG(OperandSize_b))) {
     return 1;
   }
   if (NACL_TARGET_SUBARCH == 64) {
@@ skipping 845 matching lines @@
     state->inst = matching_inst;
     NCInstBytesReadBytesInline(matching_length, &state->bytes);
     DEBUG(NaClLog(LOG_INFO, "matched inst sequence [%d]!\n", matching_length));
     return TRUE;
   }
 }
 
 EXTERN_C_END
 
 #endif   /* NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_X86_DECODER_NC_INST_STATE_STATICS_C__ */