diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-03-12 18:28:53 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-03-12 18:28:53 +0000 |
| commit | 6489bbbe9915d526aba2b749d601f8176b6ffff1 (patch) | |
| tree | b3ff1d71f8481e5e9be4bb872ab4df053d7ea83d | |
| parent | 3317849de1728ea522a06982d08099a86c24c006 (diff) | |
| download | external_llvm-6489bbbe9915d526aba2b749d601f8176b6ffff1.zip external_llvm-6489bbbe9915d526aba2b749d601f8176b6ffff1.tar.gz external_llvm-6489bbbe9915d526aba2b749d601f8176b6ffff1.tar.bz2 | |
remove MAI argument from createAsmStreamer since it
can get it from the context now.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98361 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/MC/MCStreamer.h | 3 | ||||
| -rw-r--r-- | lib/CodeGen/LLVMTargetMachine.cpp | 2 | ||||
| -rw-r--r-- | lib/MC/MCAsmStreamer.cpp | 9 | ||||
| -rw-r--r-- | tools/llvm-mc/llvm-mc.cpp | 3 |
4 files changed, 7 insertions, 10 deletions
diff --git a/include/llvm/MC/MCStreamer.h b/include/llvm/MC/MCStreamer.h index 2f5f828..47befca 100644 --- a/include/llvm/MC/MCStreamer.h +++ b/include/llvm/MC/MCStreamer.h @@ -299,8 +299,7 @@ class TargetAsmBackend; /// \param ShowInst - Whether to show the MCInst representation inline with /// the assembly. MCStreamer *createAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, - const MCAsmInfo &MAI, bool isLittleEndian, - bool isVerboseAsm, + bool isLittleEndian, bool isVerboseAsm, MCInstPrinter *InstPrint = 0, MCCodeEmitter *CE = 0, bool ShowInst = false); diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp index 0174d55..38d0017 100644 --- a/lib/CodeGen/LLVMTargetMachine.cpp +++ b/lib/CodeGen/LLVMTargetMachine.cpp @@ -131,7 +131,7 @@ bool LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM, case CGFT_AssemblyFile: { MCInstPrinter *InstPrinter = getTarget().createMCInstPrinter(MAI.getAssemblerDialect(), MAI, Out); - AsmStreamer.reset(createAsmStreamer(*Context, Out, MAI, + AsmStreamer.reset(createAsmStreamer(*Context, Out, getTargetData()->isLittleEndian(), getVerboseAsm(), InstPrinter, /*codeemitter*/0)); diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp index 66a0a24..7f39471 100644 --- a/lib/MC/MCAsmStreamer.cpp +++ b/lib/MC/MCAsmStreamer.cpp @@ -41,11 +41,10 @@ class MCAsmStreamer : public MCStreamer { public: MCAsmStreamer(MCContext &Context, formatted_raw_ostream &os, - const MCAsmInfo &mai, bool isLittleEndian, bool isVerboseAsm, MCInstPrinter *printer, MCCodeEmitter *emitter, bool showInst) - : MCStreamer(Context), OS(os), MAI(mai), InstPrinter(printer), - Emitter(emitter), CommentStream(CommentToEmit), + : MCStreamer(Context), OS(os), MAI(Context.getAsmInfo()), + InstPrinter(printer), Emitter(emitter), CommentStream(CommentToEmit), IsLittleEndian(isLittleEndian), IsVerboseAsm(isVerboseAsm), ShowInst(showInst) { if (InstPrinter && IsVerboseAsm) @@ -654,9 +653,9 @@ void MCAsmStreamer::Finish() { MCStreamer *llvm::createAsmStreamer(MCContext &Context, formatted_raw_ostream &OS, - const MCAsmInfo &MAI, bool isLittleEndian, + bool isLittleEndian, bool isVerboseAsm, MCInstPrinter *IP, MCCodeEmitter *CE, bool ShowInst) { - return new MCAsmStreamer(Context, OS, MAI, isLittleEndian, isVerboseAsm, + return new MCAsmStreamer(Context, OS, isLittleEndian, isVerboseAsm, IP, CE, ShowInst); } diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index b3c442e..03953c7 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/tools/llvm-mc/llvm-mc.cpp @@ -270,8 +270,7 @@ static int AssembleInput(const char *ProgName) { IP.reset(TheTarget->createMCInstPrinter(OutputAsmVariant, *MAI, *Out)); if (ShowEncoding) CE.reset(TheTarget->createCodeEmitter(*TM, Ctx)); - Str.reset(createAsmStreamer(Ctx, *Out, *MAI, - TM->getTargetData()->isLittleEndian(), + Str.reset(createAsmStreamer(Ctx, *Out,TM->getTargetData()->isLittleEndian(), /*asmverbose*/true, IP.get(), CE.get(), ShowInst)); } else { |