Index: src/trusted/validator/x86/testing/enuminsts/nacl_tester.c |
=================================================================== |
--- src/trusted/validator/x86/testing/enuminsts/nacl_tester.c (revision 8119) |
+++ src/trusted/validator/x86/testing/enuminsts/nacl_tester.c (working copy) |
@@ -245,24 +245,7 @@ |
/* 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. */ |
@@ -303,8 +286,6 @@ |
/* 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; |