maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

X86MCInstLower now depends on AsmPrinter being around. 

llvm-svn: 109154
This commit is contained in:
Chris Lattner 2010-07-22 21:10:04 +00:00
parent 083be4d384
commit b3f608bbba
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
llvm/lib/Target/X86/X86MCInstLower.cpp
View File

@ -29,7 +29,7 @@
using namespace llvm;
X86MCInstLower::X86MCInstLower(Mangler *mang, const MachineFunction &mf,
X86AsmPrinter *asmprinter)
X86AsmPrinter &asmprinter)
: Ctx(mf.getContext()), Mang(mang), MF(mf), TM(mf.getTarget()),
MAI(*TM.getMCAsmInfo()), AsmPrinter(asmprinter) {}
@ -181,7 +181,7 @@ MCOperand X86MCInstLower::LowerSymbolOperand(const MachineOperand &MO,
// local labels. This is only safe when the symbols are in the same
// section so we are restricting it to jumptable references.
MCSymbol *Label = Ctx.CreateTempSymbol();
AsmPrinter->OutStreamer.EmitAssignment(Label, Expr);
AsmPrinter.OutStreamer.EmitAssignment(Label, Expr);
Expr = MCSymbolRefExpr::Create(Label, Ctx);
}
break;
@ -320,38 +320,20 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
MO.getMBB()->getSymbol(), Ctx));
break;
case MachineOperand::MO_GlobalAddress:
// If we don't have an asmprinter, we're converting to MCInst to get
// instruction sizes, which doesn't need precise value information for
// symbols, just lower to a 0 immediate.
if (AsmPrinter != 0)
MCOp = LowerSymbolOperand(MO, GetSymbolFromOperand(MO));
else
MCOp = MCOperand::CreateImm(0);
MCOp = LowerSymbolOperand(MO, GetSymbolFromOperand(MO));
break;
case MachineOperand::MO_ExternalSymbol:
if (AsmPrinter != 0)
MCOp = LowerSymbolOperand(MO, GetSymbolFromOperand(MO));
else
MCOp = MCOperand::CreateImm(0);
MCOp = LowerSymbolOperand(MO, GetSymbolFromOperand(MO));
break;
case MachineOperand::MO_JumpTableIndex:
if (AsmPrinter != 0)
MCOp = LowerSymbolOperand(MO, AsmPrinter->GetJTISymbol(MO.getIndex()));
else
MCOp = MCOperand::CreateImm(0);
MCOp = LowerSymbolOperand(MO, AsmPrinter.GetJTISymbol(MO.getIndex()));
break;
case MachineOperand::MO_ConstantPoolIndex:
if (AsmPrinter != 0)
MCOp = LowerSymbolOperand(MO, AsmPrinter->GetCPISymbol(MO.getIndex()));
else
MCOp = MCOperand::CreateImm(0);
MCOp = LowerSymbolOperand(MO, AsmPrinter.GetCPISymbol(MO.getIndex()));
break;
case MachineOperand::MO_BlockAddress:
if (AsmPrinter != 0)
MCOp = LowerSymbolOperand(MO,
AsmPrinter->GetBlockAddressSymbol(MO.getBlockAddress()));
else
MCOp = MCOperand::CreateImm(0);
MCOp = LowerSymbolOperand(MO,
AsmPrinter.GetBlockAddressSymbol(MO.getBlockAddress()));
break;
}
@ -522,7 +504,7 @@ void X86MCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
void X86AsmPrinter::EmitInstruction(const MachineInstr *MI) {
X86MCInstLower MCInstLowering(Mang, *MF, this);
X86MCInstLower MCInstLowering(Mang, *MF, *this);
switch (MI->getOpcode()) {
case TargetOpcode::DBG_VALUE:
if (isVerbose() && OutStreamer.hasRawTextSupport()) {

7
llvm/lib/Target/X86/X86MCInstLower.h
View File

@ -33,13 +33,10 @@ class LLVM_LIBRARY_VISIBILITY X86MCInstLower {
const MachineFunction &MF;
const TargetMachine &TM;
const MCAsmInfo &MAI;
/// AsmPrinter - This is the asmprinter when emission is actually happening,
/// or null if an instruction is being lowered for some other reason.
X86AsmPrinter *AsmPrinter;
X86AsmPrinter &AsmPrinter;
public:
X86MCInstLower(Mangler *mang, const MachineFunction &MF,
X86AsmPrinter *asmprinter);
X86AsmPrinter &asmprinter);
void Lower(const MachineInstr *MI, MCInst &OutMI) const;