diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-25 02:35:56 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-25 02:35:56 +0000 |
commit | f961273b79fdd8e231d3b4e532f7fa051dcbe14f (patch) | |
tree | ba242f5b52327a9d734f107898ffbe2b4ed6fcd3 /lib/Target | |
parent | 8fe060da520584b5d03e76ddc3346117a69aff88 (diff) | |
download | llvm-f961273b79fdd8e231d3b4e532f7fa051dcbe14f.tar.gz llvm-f961273b79fdd8e231d3b4e532f7fa051dcbe14f.tar.bz2 llvm-f961273b79fdd8e231d3b4e532f7fa051dcbe14f.tar.xz |
Remove an easy use of EmitRawText from PPC.
This makes lib/Target/PowerPC EmitRawText free.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200065 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target')
-rw-r--r-- | lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp | 5 | ||||
-rw-r--r-- | lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp | 7 | ||||
-rw-r--r-- | lib/Target/PowerPC/PPCAsmPrinter.cpp | 13 | ||||
-rw-r--r-- | lib/Target/PowerPC/PPCTargetStreamer.h | 1 |
4 files changed, 19 insertions, 7 deletions
diff --git a/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp b/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp index 0455686599..1d8c10cd7b 100644 --- a/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp +++ b/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp @@ -9,6 +9,7 @@ #include "MCTargetDesc/PPCMCTargetDesc.h" #include "MCTargetDesc/PPCMCExpr.h" +#include "PPCTargetStreamer.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" @@ -1436,6 +1437,10 @@ bool PPCAsmParser::ParseDirectiveMachine(SMLoc L) { Error(L, "unexpected token in directive"); return false; } + PPCTargetStreamer &TStreamer = + *static_cast<PPCTargetStreamer *>( + getParser().getStreamer().getTargetStreamer()); + TStreamer.emitMachine(CPU); return false; } diff --git a/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp index 6a50518401..5dea2bf3e0 100644 --- a/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp +++ b/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp @@ -120,6 +120,9 @@ public: OS << S.getName(); OS << '\n'; } + virtual void emitMachine(StringRef CPU) { + OS << "\t.machine " << CPU << '\n'; + } }; class PPCTargetELFStreamer : public PPCTargetStreamer { @@ -127,6 +130,10 @@ class PPCTargetELFStreamer : public PPCTargetStreamer { // Creates a R_PPC64_TOC relocation Streamer->EmitSymbolValue(&S, 8); } + virtual void emitMachine(StringRef CPU) { + // FIXME: Is there anything to do in here or does this directive only + // limit the parser? + } }; } diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp index 15480d5219..786c4f9a33 100644 --- a/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -850,13 +850,12 @@ void PPCDarwinAsmPrinter::EmitStartOfAsmFile(Module &M) { if (Subtarget.isPPC64() && Directive < PPC::DIR_64) Directive = PPC::DIR_64; assert(Directive <= PPC::DIR_64 && "Directive out of range."); - - // FIXME: This is a total hack, finish mc'izing the PPC backend. - if (OutStreamer.hasRawTextSupport()) { - assert(Directive < array_lengthof(CPUDirectives) && - "CPUDirectives[] might not be up-to-date!"); - OutStreamer.EmitRawText("\t.machine " + Twine(CPUDirectives[Directive])); - } + + assert(Directive < array_lengthof(CPUDirectives) && + "CPUDirectives[] might not be up-to-date!"); + PPCTargetStreamer &TStreamer = + *static_cast<PPCTargetStreamer *>(OutStreamer.getTargetStreamer()); + TStreamer.emitMachine(CPUDirectives[Directive]); // Prime text sections so they are adjacent. This reduces the likelihood a // large data or debug section causes a branch to exceed 16M limit. diff --git a/lib/Target/PowerPC/PPCTargetStreamer.h b/lib/Target/PowerPC/PPCTargetStreamer.h index e876be16a9..6f0125f2a8 100644 --- a/lib/Target/PowerPC/PPCTargetStreamer.h +++ b/lib/Target/PowerPC/PPCTargetStreamer.h @@ -17,6 +17,7 @@ class PPCTargetStreamer : public MCTargetStreamer { public: virtual ~PPCTargetStreamer(); virtual void emitTCEntry(const MCSymbol &S) = 0; + virtual void emitMachine(StringRef CPU) = 0; }; } |