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/utils | |
| 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/utils')
| -rw-r--r-- | llvm/utils/TableGen/X86DisassemblerShared.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/llvm/utils/TableGen/X86DisassemblerShared.h b/llvm/utils/TableGen/X86DisassemblerShared.h index 036e92430b0..2d3d3fc1bcb 100644 --- a/llvm/utils/TableGen/X86DisassemblerShared.h +++ b/llvm/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 |
