6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-25 10:27:04 +00:00
Code Issues Projects Releases Wiki Activity

remove MAI argument from createAsmStreamer since it

Browse Source 
can get it from the context now.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98361 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2010-03-12 18:28:53 +00:00
parent 20e3280f3f
commit fdab14b105
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/MC/MCStreamer.h
View File

@@ -299,8 +299,7 @@ class TargetAsmBackend;
/// \param ShowInst - Whether to show the MCInst representation inline with /// \param ShowInst - Whether to show the MCInst representation inline with
/// the assembly. /// the assembly.
MCStreamer *createAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, MCStreamer *createAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
const MCAsmInfo &MAI, bool isLittleEndian, bool isLittleEndian, bool isVerboseAsm,
bool isVerboseAsm,
MCInstPrinter *InstPrint = 0, MCInstPrinter *InstPrint = 0,
MCCodeEmitter *CE = 0, MCCodeEmitter *CE = 0,
bool ShowInst = false); bool ShowInst = false);

2
lib/CodeGen/LLVMTargetMachine.cpp
View File

@@ -131,7 +131,7 @@ bool LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM,
case CGFT_AssemblyFile: { case CGFT_AssemblyFile: {
MCInstPrinter *InstPrinter = MCInstPrinter *InstPrinter =
getTarget().createMCInstPrinter(MAI.getAssemblerDialect(), MAI, Out); getTarget().createMCInstPrinter(MAI.getAssemblerDialect(), MAI, Out);
AsmStreamer.reset(createAsmStreamer(*Context, Out, MAI, AsmStreamer.reset(createAsmStreamer(*Context, Out,
getTargetData()->isLittleEndian(), getTargetData()->isLittleEndian(),
getVerboseAsm(), InstPrinter, getVerboseAsm(), InstPrinter,
/*codeemitter*/0)); /*codeemitter*/0));

9
lib/MC/MCAsmStreamer.cpp
View File

@@ -41,11 +41,10 @@ class MCAsmStreamer : public MCStreamer {
public: public:
MCAsmStreamer(MCContext &Context, formatted_raw_ostream &os, MCAsmStreamer(MCContext &Context, formatted_raw_ostream &os,
const MCAsmInfo &mai,
bool isLittleEndian, bool isVerboseAsm, MCInstPrinter *printer, bool isLittleEndian, bool isVerboseAsm, MCInstPrinter *printer,
MCCodeEmitter *emitter, bool showInst) MCCodeEmitter *emitter, bool showInst)
: MCStreamer(Context), OS(os), MAI(mai), InstPrinter(printer), : MCStreamer(Context), OS(os), MAI(Context.getAsmInfo()),
Emitter(emitter), CommentStream(CommentToEmit), InstPrinter(printer), Emitter(emitter), CommentStream(CommentToEmit),
IsLittleEndian(isLittleEndian), IsVerboseAsm(isVerboseAsm), IsLittleEndian(isLittleEndian), IsVerboseAsm(isVerboseAsm),
ShowInst(showInst) { ShowInst(showInst) {
if (InstPrinter && IsVerboseAsm) if (InstPrinter && IsVerboseAsm)
@@ -654,9 +653,9 @@ void MCAsmStreamer::Finish() {
MCStreamer *llvm::createAsmStreamer(MCContext &Context, MCStreamer *llvm::createAsmStreamer(MCContext &Context,
formatted_raw_ostream &OS, formatted_raw_ostream &OS,
const MCAsmInfo &MAI, bool isLittleEndian, bool isLittleEndian,
bool isVerboseAsm, MCInstPrinter *IP, bool isVerboseAsm, MCInstPrinter *IP,
MCCodeEmitter *CE, bool ShowInst) { MCCodeEmitter *CE, bool ShowInst) {
return new MCAsmStreamer(Context, OS, MAI, isLittleEndian, isVerboseAsm, return new MCAsmStreamer(Context, OS, isLittleEndian, isVerboseAsm,
IP, CE, ShowInst); IP, CE, ShowInst);
} }

3
tools/llvm-mc/llvm-mc.cpp
View File

@@ -270,8 +270,7 @@ static int AssembleInput(const char *ProgName) {
IP.reset(TheTarget->createMCInstPrinter(OutputAsmVariant, *MAI, *Out)); IP.reset(TheTarget->createMCInstPrinter(OutputAsmVariant, *MAI, *Out));
if (ShowEncoding) if (ShowEncoding)
CE.reset(TheTarget->createCodeEmitter(*TM, Ctx)); CE.reset(TheTarget->createCodeEmitter(*TM, Ctx));
Str.reset(createAsmStreamer(Ctx, *Out, *MAI, Str.reset(createAsmStreamer(Ctx, *Out,TM->getTargetData()->isLittleEndian(),
TM->getTargetData()->isLittleEndian(),
/*asmverbose*/true, IP.get(), CE.get(), /*asmverbose*/true, IP.get(), CE.get(),
ShowInst)); ShowInst));
} else { } else {