Modify enuminsts to be able to communicate matched instructions accross

src/trusted/validator/x86/testing/enuminsts/nacl_tester.c

 /*
  * 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.
  */
 
 /*
  * nacl_tester.c
  * Uses the NaCl x86 validator/decoder to implement a NaClEnumeratorDecoder.
  */
@@ skipping 227 matching lines @@
   if (NULL == after_mnemonic) after_mnemonic = disassembly;
   cstrncpy(operands, after_mnemonic, kBufferSize);
   strnzapchar(operands, '%');
   strnzapchar(operands, '\n');
   cstrncpy(nacl_decoder._operands, strip(operands), kBufferSize);
   return nacl_decoder._operands;
 }
 
 /* Prints out the disassembled instruction. */
 static void PrintInst(NaClEnumerator* enumerator) {
-  int i;
-  uint8_t length = NaClInstLength(nacl_decoder._inst);
-  if (enumerator->_print_opcode_bytes_only) {
-    for (i = 0; i < length; ++i) {
-      printf("%02x", enumerator->_itext[i]);
-    }
-    printf("\n");
-  } else {
-    if (enumerator->_print_enumerated_instruction) {
-      for (i = 0; i < length; ++i) {
-        printf("%02x ", enumerator->_itext[i]);
-      }
-      printf("#%s %s\n", GetInstMnemonic(enumerator),
-             GetInstOperandsText(enumerator));
-    } else {
-      printf(" NaCl: %s", Disassemble(enumerator));
-    }
-  }
+  printf(" NaCl: %s", Disassemble(enumerator));
 }
 
 /* Returns the number of bytes in the disassembled instruction. */
 static size_t InstLength(NaClEnumerator* enumerator) {
   return (size_t) NaClInstLength(nacl_decoder._inst);
 }
 
 /* Returns true if the instruction decodes, and static (single instruction)
  * validator tests pass.
  */
@@ skipping 20 matching lines @@
     nacl_decoder._translate_to_xed_nops = *((Bool*) flag_address);
   } else if (0 == strcmp(flag_name, "--xedimplemented")) {
     nacl_decoder._ignore_instructions_not_xed_implemented =
         *((Bool*) flag_address);
   }
 }
 
 /* Generates a decoder for the (sel_ldr) nacl validator. */
 NaClEnumeratorDecoder* RegisterNaClDecoder() {
   nacl_decoder._base._id_name = "nacl";
-  nacl_decoder._base._legal_only = TRUE;
-  nacl_decoder._base._print_only = FALSE;
   nacl_decoder._base._parse_inst_fn = ParseInst;
   nacl_decoder._base._inst_length_fn = InstLength;
   nacl_decoder._base._print_inst_fn = PrintInst;
   nacl_decoder._base._get_inst_mnemonic_fn = GetInstMnemonic;
   nacl_decoder._base._get_inst_num_operands_fn = NULL;
   nacl_decoder._base._get_inst_operands_text_fn = GetInstOperandsText;
   nacl_decoder._base._writes_to_reserved_reg_fn = NULL;
   nacl_decoder._base._is_inst_legal_fn = IsInstLegal;
   nacl_decoder._base._maybe_inst_validates_fn = MaybeInstValidates;
   nacl_decoder._base._segment_validates_fn = SegmentValidates;
   nacl_decoder._base._install_flag_fn = InstallFlag;
   nacl_decoder._base._usage_message =
       "Runs nacl decoder to decode instructions";
   return &nacl_decoder._base;
 }