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 /utils/TableGen | |
| 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 'utils/TableGen')
| -rw-r--r-- | utils/TableGen/X86DisassemblerShared.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/utils/TableGen/X86DisassemblerShared.h b/utils/TableGen/X86DisassemblerShared.h index 036e92430b..2d3d3fc1bc 100644 --- a/utils/TableGen/X86DisassemblerShared.h +++ b/utils/TableGen/X86DisassemblerShared.h @@ -13,17 +13,6 @@ #include <string.h> #include <string> -#define INSTRUCTION_SPECIFIER_FIELDS \ - struct OperandSpecifier operands[X86_MAX_OPERANDS]; \ - InstructionContext insnContext; \ - std::string name; \ - \ - InstructionSpecifier() { \ - insnContext = IC; \ - name = ""; \ - memset(operands, 0, sizeof(operands)); \ - } - #define INSTRUCTION_IDS \ InstrUID instructionIDs[256]; @@ -32,4 +21,16 @@ #undef INSTRUCTION_SPECIFIER_FIELDS #undef INSTRUCTION_IDS +struct InstructionSpecifier { + llvm::X86Disassembler::OperandSpecifier operands[X86_MAX_OPERANDS]; + llvm::X86Disassembler::InstructionContext insnContext; + std::string name; + + InstructionSpecifier() { + insnContext = llvm::X86Disassembler::IC; + name = ""; + memset(operands, 0, sizeof(operands)); + } +}; + #endif |