Modify enuminsts to be able to communicate matched instructions accross

src/trusted/validator/x86/testing/enuminsts/xed_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.
  */
 
 /*
  * xed_tester.c
  * Implements a xed decoder that can be used as a NaClEnumeratorDecoder.
  */
@@ skipping 133 matching lines @@
 
 static const char* GetInstOperandsText(NaClEnumerator* enumerator) {
   /* Force caching of operands and return. */
   if (xed_decoder._xed_operands[0] == 0) GetInstMnemonic(enumerator);
   return xed_decoder._xed_operands;
 }
 
 /* Prints out the disassembled instruction. */
 static void PrintInst(NaClEnumerator* enumerator) {
   int i;
-  if (enumerator->_print_opcode_bytes_only) {
-    for (i = 0; i < xed_decoder._xedd._decoded_length; ++i) {
-      printf("%02x", enumerator->_itext[i]);
-    }
-    printf("\n");
-  } else {
-    size_t opcode_size;
-    if (!enumerator->_print_enumerated_instruction) {
-      NaClPcAddress pc_address = (NaClPcAddress) xed_decoder._pc_address;
-      printf("  XED: %"NACL_PRIxNaClPcAddressAll": ", pc_address);
-    }
-    /* Since xed doesn't print out opcode sequence, and it is
-     * useful to know, add it to the print out. Note: Use same
-     * spacing scheme as nacl decoder, so things line up.
-     */
-    size_t num_bytes = MAX_INST_LENGTH;
-    if (enumerator->_num_bytes > num_bytes)
-      num_bytes = enumerator->_num_bytes;
-    for (i = 0; i < num_bytes; ++i) {
-      if (i < xed_decoder._xedd._decoded_length) {
-        printf("%02x ", enumerator->_itext[i]);
-      } else if (!enumerator->_print_enumerated_instruction) {
-        printf("   ");
-      }
-    }
-    if (enumerator->_print_enumerated_instruction) {
-      printf("#%s %s\n", GetInstMnemonic(enumerator),
-             GetInstOperandsText(enumerator));
+  size_t opcode_size;
+  NaClPcAddress pc_address = (NaClPcAddress) xed_decoder._pc_address;
+  printf("  XED: %"NACL_PRIxNaClPcAddressAll": ", pc_address);
+
+  /* Since xed doesn't print out opcode sequence, and it is
+   * useful to know, add it to the print out. Note: Use same
+   * spacing scheme as nacl decoder, so things line up.
+   */
+  size_t num_bytes = MAX_INST_LENGTH;
+  if (enumerator->_num_bytes > num_bytes)
+    num_bytes = enumerator->_num_bytes;
+  for (i = 0; i < num_bytes; ++i) {
+    if (i < xed_decoder._xedd._decoded_length) {
+      printf("%02x ", enumerator->_itext[i]);
     } else {
-      printf("%s\n", Disassemble(enumerator));
+      printf("   ");
     }
   }
+  printf("%s\n", Disassemble(enumerator));
 }
 
 static size_t InstLength(NaClEnumerator* enumerator) {
   return (size_t) xed_decoder._xedd._decoded_length;
 }
 
 static inline xed_inst_t const* GetXedInst() {
   if (xed_decoder._xed_inst == NULL) {
     xed_decoder._xed_inst = xed_decoded_inst_inst(&xed_decoder._xedd);
   }
@@ skipping 39 matching lines @@
 }
 #elif NACL_TARGET_SUBARCH == 32
 static Bool WritesToReservedReg(NaClEnumerator* enumerator,
                                 size_t n) {
   return FALSE;
 }
 #else
 #error("Bad NACL_TARGET_SUBARCH")
 #endif
 
-static const char* Usage() {
-  return "Runs xed to decode instructions.";
-}
-
 static void InstallFlag(NaClEnumerator* enumerator,
                         const char* flag_name,
                         void* flag_address) {
 }
 
 /* Defines the registry function that creates a xed decoder, and returns
  * the decoder to be registered.
  */
 NaClEnumeratorDecoder* RegisterXedDecoder() {
   XedSetup();
   xed_decoder._base._id_name = "xed";
-  xed_decoder._base._legal_only = TRUE;
-  xed_decoder._base._print_only = FALSE;
   xed_decoder._base._parse_inst_fn = ParseInst;
   xed_decoder._base._inst_length_fn = InstLength;
   xed_decoder._base._print_inst_fn = PrintInst;
   xed_decoder._base._get_inst_mnemonic_fn = GetInstMnemonic;
   xed_decoder._base._get_inst_num_operands_fn = GetNumOperands;
   xed_decoder._base._get_inst_operands_text_fn = GetInstOperandsText;
   xed_decoder._base._writes_to_reserved_reg_fn = WritesToReservedReg;
   xed_decoder._base._is_inst_legal_fn = IsInstLegal;
   xed_decoder._base._maybe_inst_validates_fn = NULL;
   xed_decoder._base._segment_validates_fn = NULL;
   xed_decoder._base._install_flag_fn = InstallFlag;
   xed_decoder._base._usage_message = "Runs xed to decode instructions.";
   return &xed_decoder._base;
 }