diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-04-20 21:35:26 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-04-20 21:35:26 +0000 |
commit | 82b47d5660c45981101e95f136366940afe7200f (patch) | |
tree | 808c6b66370dc44fd98b617437d67edd0a6d57f7 /llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h | |
parent | 555134215b671f4114e2e03e8727e1b2f3687f77 (diff) | |
download | bcm5719-llvm-82b47d5660c45981101e95f136366940afe7200f.tar.gz bcm5719-llvm-82b47d5660c45981101e95f136366940afe7200f.zip |
Don't define llvm::X86Disassembler::InstructionSpecifier in different ways in
different source files.
llvm-svn: 206719
Diffstat (limited to 'llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h')
-rw-r--r-- | llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h b/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h index 19455e33ed9..67f52e55fac 100644 --- a/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h +++ b/llvm/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; @@ -532,6 +529,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. */ struct InternalInstruction { |