diff options
author | Evan Cheng <evan.cheng@apple.com> | 2011-07-09 05:47:46 +0000 |
---|---|---|
committer | Evan Cheng <evan.cheng@apple.com> | 2011-07-09 05:47:46 +0000 |
commit | ffc0e73046f737d75e0a62b3a83ef19bcef111e3 (patch) | |
tree | 1f82f6a0b1c1a743dd4c10377858004988a47262 /lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp | |
parent | 4f4a6fcd165293c347a42b543e5e55aa42a09bb2 (diff) | |
download | external_llvm-ffc0e73046f737d75e0a62b3a83ef19bcef111e3.zip external_llvm-ffc0e73046f737d75e0a62b3a83ef19bcef111e3.tar.gz external_llvm-ffc0e73046f737d75e0a62b3a83ef19bcef111e3.tar.bz2 |
Change createAsmParser to take a MCSubtargetInfo instead of triple,
CPU, and feature string. Parsing some asm directives can change
subtarget state (e.g. .code 16) and it must be reflected in other
modules (e.g. MCCodeEmitter). That is, the MCSubtargetInfo instance
must be shared.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134795 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp')
-rw-r--r-- | lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp b/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp index dc84385..5ac455e 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp @@ -21,6 +21,7 @@ #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCStreamer.h" +#include "llvm/MC/MCSubtargetInfo.h" #include "llvm/MC/MCSymbol.h" #include "llvm/Target/TargetAsmParser.h" #include "llvm/Target/TargetMachine.h" @@ -112,11 +113,15 @@ void AsmPrinter::EmitInlineAsm(StringRef Str, const MDNode *LocMDNode) const { OutContext, OutStreamer, *MAI)); - OwningPtr<TargetAsmParser> - TAP(TM.getTarget().createAsmParser(TM.getTargetTriple(), - TM.getTargetCPU(), - TM.getTargetFeatureString(), - *Parser)); + // FIXME: It would be nice if we can avoid createing a new instance of + // MCSubtargetInfo here given TargetSubtargetInfo is available. However, + // we have to watch out for asm directives which can change subtarget + // state. e.g. .code 16, .code 32. + OwningPtr<MCSubtargetInfo> + STI(TM.getTarget().createMCSubtargetInfo(TM.getTargetTriple(), + TM.getTargetCPU(), + TM.getTargetFeatureString())); + OwningPtr<TargetAsmParser> TAP(TM.getTarget().createAsmParser(*STI, *Parser)); if (!TAP) report_fatal_error("Inline asm not supported by this streamer because" " we don't have an asm parser for this target\n"); |