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

Decouple MCInstBuilder from the streamer per Eli's request.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168597 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer
2012-11-26 18:05:52 +00:00
parent 70af909f67
commit ed9e442cf0
4 changed files with 113 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Target/X86/X86MCInstLower.cpp
View File

@@ -555,7 +555,7 @@ ReSimplify:
OutMI.addOperand(MCOperand::CreateReg(X86::R10));
OutMI.addOperand(MCOperand::CreateReg(X86::RAX));
MCInstBuilder(X86::RET).emit(AsmPrinter.OutStreamer);
AsmPrinter.OutStreamer.EmitInstruction(MCInstBuilder(X86::RET));
break;
}
}
@@ -572,7 +572,7 @@ static void LowerTlsAddr(MCStreamer &OutStreamer,
MCContext &context = OutStreamer.getContext();
if (needsPadding)
MCInstBuilder(X86::DATA16_PREFIX).emit(OutStreamer);
OutStreamer.EmitInstruction(MCInstBuilder(X86::DATA16_PREFIX));
MCSymbolRefExpr::VariantKind SRVK;
switch (MI.getOpcode()) {
@@ -622,9 +622,9 @@ static void LowerTlsAddr(MCStreamer &OutStreamer,
OutStreamer.EmitInstruction(LEA);
if (needsPadding) {
MCInstBuilder(X86::DATA16_PREFIX).emit(OutStreamer);
MCInstBuilder(X86::DATA16_PREFIX).emit(OutStreamer);
MCInstBuilder(X86::REX64_PREFIX).emit(OutStreamer);
OutStreamer.EmitInstruction(MCInstBuilder(X86::DATA16_PREFIX));
OutStreamer.EmitInstruction(MCInstBuilder(X86::DATA16_PREFIX));
OutStreamer.EmitInstruction(MCInstBuilder(X86::REX64_PREFIX));
}
StringRef name = is64Bits ? "__tls_get_addr" : "___tls_get_addr";
@@ -634,9 +634,9 @@ static void LowerTlsAddr(MCStreamer &OutStreamer,
MCSymbolRefExpr::VK_PLT,
context);
MCInstBuilder(is64Bits ? X86::CALL64pcrel32 : X86::CALLpcrel32)
.addExpr(tlsRef)
.emit(OutStreamer);
OutStreamer.EmitInstruction(MCInstBuilder(is64Bits ? X86::CALL64pcrel32
: X86::CALLpcrel32)
.addExpr(tlsRef));
}
void X86AsmPrinter::EmitInstruction(const MachineInstr *MI) {
@@ -690,17 +690,15 @@ void X86AsmPrinter::EmitInstruction(const MachineInstr *MI) {
MCSymbol *PICBase = MF->getPICBaseSymbol();
// FIXME: We would like an efficient form for this, so we don't have to do a
// lot of extra uniquing.
MCInstBuilder(X86::CALLpcrel32)
.addExpr(MCSymbolRefExpr::Create(PICBase, OutContext))
.emit(OutStreamer);
OutStreamer.EmitInstruction(MCInstBuilder(X86::CALLpcrel32)
.addExpr(MCSymbolRefExpr::Create(PICBase, OutContext)));
// Emit the label.
OutStreamer.EmitLabel(PICBase);
// popl $reg
MCInstBuilder(X86::POP32r)
.addReg(MI->getOperand(0).getReg())
.emit(OutStreamer);
OutStreamer.EmitInstruction(MCInstBuilder(X86::POP32r)
.addReg(MI->getOperand(0).getReg()));
return;
}
@@ -730,11 +728,10 @@ void X86AsmPrinter::EmitInstruction(const MachineInstr *MI) {
DotExpr = MCBinaryExpr::CreateAdd(MCSymbolRefExpr::Create(OpSym,OutContext),
DotExpr, OutContext);
MCInstBuilder(X86::ADD32ri)
OutStreamer.EmitInstruction(MCInstBuilder(X86::ADD32ri)
.addReg(MI->getOperand(0).getReg())
.addReg(MI->getOperand(1).getReg())
.addExpr(DotExpr)
.emit(OutStreamer);
.addExpr(DotExpr));
return;
}
}