diff options
| author | Jim Grosbach <grosbach@apple.com> | 2010-09-30 23:40:25 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2010-09-30 23:40:25 +0000 |
| commit | ddcf859851a5407575cc4c75fd70fc52c0e36d54 (patch) | |
| tree | cf1db051fbfeba7c2a75a6b7fdf33f9114dcddff | |
| parent | 086378597df590e6401abf90d0b5edb09bbaa297 (diff) | |
| download | llvm-ddcf859851a5407575cc4c75fd70fc52c0e36d54.tar.gz llvm-ddcf859851a5407575cc4c75fd70fc52c0e36d54.tar.bz2 llvm-ddcf859851a5407575cc4c75fd70fc52c0e36d54.tar.xz | |
Clean up asm writer usage for x86 and msp430 to flag that the writer should
use MC instructions in the printInstruction() method via the tablegen flag
for it rather than a #define prior to including the autogenerated bits.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115238 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/MSP430/MSP430.td | 1 | ||||
| -rw-r--r-- | lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86.td | 2 |
5 files changed, 3 insertions, 6 deletions
diff --git a/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp b/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp index c15d4085bc..304e677d6f 100644 --- a/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp +++ b/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp @@ -24,9 +24,7 @@ using namespace llvm; // Include the auto-generated portion of the assembly writer. -#define MachineInstr MCInst #include "MSP430GenAsmWriter.inc" -#undef MachineInstr void MSP430InstPrinter::printInst(const MCInst *MI, raw_ostream &O) { printInstruction(MI, O); diff --git a/lib/Target/MSP430/MSP430.td b/lib/Target/MSP430/MSP430.td index 0f08e3d8ca..5cc5e6e3d7 100644 --- a/lib/Target/MSP430/MSP430.td +++ b/lib/Target/MSP430/MSP430.td @@ -52,6 +52,7 @@ def MSP430InstrInfo : InstrInfo; def MSP430InstPrinter : AsmWriter { string AsmWriterClassName = "InstPrinter"; + bit isMCAsmWriter = 1; } //===----------------------------------------------------------------------===// diff --git a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp index 554b96c96e..d6950f49f8 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp @@ -25,10 +25,8 @@ using namespace llvm; // Include the auto-generated portion of the assembly writer. -#define MachineInstr MCInst #define GET_INSTRUCTION_NAME #include "X86GenAsmWriter.inc" -#undef MachineInstr void X86ATTInstPrinter::printInst(const MCInst *MI, raw_ostream &OS) { printInstruction(MI, OS); diff --git a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp index 5625b0ea61..a553a7c19a 100644 --- a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp @@ -24,10 +24,8 @@ using namespace llvm; // Include the auto-generated portion of the assembly writer. -#define MachineInstr MCInst #define GET_INSTRUCTION_NAME #include "X86GenAsmWriter1.inc" -#undef MachineInstr void X86IntelInstPrinter::printInst(const MCInst *MI, raw_ostream &OS) { printInstruction(MI, OS); diff --git a/lib/Target/X86/X86.td b/lib/Target/X86/X86.td index a19f1acffa..b78c7d6a7d 100644 --- a/lib/Target/X86/X86.td +++ b/lib/Target/X86/X86.td @@ -196,10 +196,12 @@ def ATTAsmParser : AsmParser { def ATTAsmWriter : AsmWriter { string AsmWriterClassName = "ATTInstPrinter"; int Variant = 0; + bit isMCAsmWriter = 1; } def IntelAsmWriter : AsmWriter { string AsmWriterClassName = "IntelInstPrinter"; int Variant = 1; + bit isMCAsmWriter = 1; } def X86 : Target { |