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 | 5aacafc256d19a105f51f0b003117a2087f26557 (patch) | |
| tree | c728dcc2fcb8cde73316652462f267da145bff95 /lib | |
| parent | 4b355984960ab364afb1789ddf902bf9a257e4b5 (diff) | |
| download | llvm-5aacafc256d19a105f51f0b003117a2087f26557.tar.gz llvm-5aacafc256d19a105f51f0b003117a2087f26557.tar.bz2 llvm-5aacafc256d19a105f51f0b003117a2087f26557.tar.xz | |
Don't define llvm::X86Disassembler::InstructionSpecifier in different ways in
different source files.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206719 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/X86/Disassembler/X86DisassemblerDecoder.h | 11 | ||||
| -rw-r--r-- | lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h | 9 |
2 files changed, 8 insertions, 12 deletions
diff --git a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h index 19455e33ed..67f52e55fa 100644 --- 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; @@ -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 { diff --git a/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h b/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h index b8130a0f9c..d323fa2cc7 100644 --- a/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h +++ b/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h @@ -539,15 +539,6 @@ enum ModifierType { #define X86_MAX_OPERANDS 5 /* - * The specification for how to extract and interpret a full instruction and - * its operands. - */ -struct InstructionSpecifier { - /* The macro below must be defined wherever this file is included. */ - INSTRUCTION_SPECIFIER_FIELDS -}; - -/* * Decoding mode for the Intel disassembler. 16-bit, 32-bit, and 64-bit mode * are supported, and represent real mode, IA-32e, and IA-32e in 64-bit mode, * respectively. |