Don't define llvm::X86Disassembler::InstructionSpecifier in different ways in

[oota-llvm.git] / lib / Target / X86 / Disassembler / X86DisassemblerDecoder.h

diff --git a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h
index 19455e33ed9ef9b49927084483b3b4a09d9b64a2..67f52e55fac4960310a3b32c685615264bfaf379 100644 (file)
--- a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h
+++ b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h
@@ -16,9 +16,6 @@
 #ifndef X86DISASSEMBLERDECODER_H
 #define X86DISASSEMBLERDECODER_H
 
-#define INSTRUCTION_SPECIFIER_FIELDS \
-  uint16_t operands;
-
 #define INSTRUCTION_IDS     \
   uint16_t instructionIDs;
 
@@ -531,6 +528,14 @@ typedef int (*byteReader_t)(const void* arg, uint8_t* byte, uint64_t address);
  */
 typedef void (*dlog_t)(void* arg, const char *log);
 
+/*
+ * The specification for how to extract and interpret a full instruction and
+ * its operands.
+ */
+struct InstructionSpecifier {
+  uint16_t operands;
+};
+
 /*
  * The x86 internal instruction, which is produced by the decoder.
  */