STATISTIC(EmittedInsts, "Number of machine instrs printed");
-static std::string computePICLabel(unsigned fnNumber,
- const X86Subtarget* Subtarget)
-{
+static std::string computePICLabel(unsigned FnNum,
+ const TargetAsmInfo *TAI,
+ const X86Subtarget* Subtarget) {
std::string label;
-
- if (Subtarget->isTargetDarwin()) {
- label = "\"L" + utostr_32(fnNumber) + "$pb\"";
- } else if (Subtarget->isTargetELF()) {
- label = ".Lllvm$" + utostr_32(fnNumber) + "$piclabel";
- } else
+ if (Subtarget->isTargetDarwin())
+ label = "\"L" + utostr_32(FnNum) + "$pb\"";
+ else if (Subtarget->isTargetELF())
+ label = ".Lllvm$" + utostr_32(FnNum) + "$piclabel";
+ else
assert(0 && "Don't know how to print PIC label!\n");
return label;
Subtarget->isTargetELF() ||
Subtarget->isTargetCygMing()) {
// Let PassManager know we need debug information and relay
- // the MachineDebugInfo address on to DwarfWriter.
- DW.SetDebugInfo(&getAnalysis<MachineDebugInfo>());
+ // the MachineModuleInfo address on to DwarfWriter.
+ DW.SetModuleInfo(&getAnalysis<MachineModuleInfo>());
}
SetupMachineFunction(MF);
O << "\t.weak_definition\t" << CurrentFnName << "\n";
} else if (Subtarget->isTargetCygMing()) {
EmitAlignment(4, F); // FIXME: This should be parameterized somewhere.
- O << "\t.linkonce discard\n";
O << "\t.globl " << CurrentFnName << "\n";
+ O << "\t.linkonce discard\n";
} else {
EmitAlignment(4, F); // FIXME: This should be parameterized somewhere.
O << "\t.weak " << CurrentFnName << "\n";
return false;
}
+static inline bool printGOT(TargetMachine &TM, const X86Subtarget* ST) {
+ return ST->isPICStyleGOT() && TM.getRelocationModel() == Reloc::PIC_;
+}
+
+static inline bool printStub(TargetMachine &TM, const X86Subtarget* ST) {
+ return ST->isPICStyleStub() && TM.getRelocationModel() != Reloc::Static;
+}
+
void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
const char *Modifier, bool NotRIPRel) {
const MachineOperand &MO = MI->getOperand(OpNo);
}
case MachineOperand::MO_Immediate:
- if (!Modifier || strcmp(Modifier, "debug") != 0)
+ if (!Modifier ||
+ (strcmp(Modifier, "debug") && strcmp(Modifier, "mem")))
O << '$';
O << MO.getImmedValue();
return;
if (TM.getRelocationModel() == Reloc::PIC_) {
if (Subtarget->isPICStyleStub())
- O << "-\"L" << getFunctionNumber() << "$pb\"";
+ O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber()
+ << "$pb\"";
else if (Subtarget->isPICStyleGOT())
O << "@GOTOFF";
}
- if (isMemOp && Subtarget->is64Bit() && !NotRIPRel)
+ if (isMemOp && Subtarget->isPICStyleRIPRel() && !NotRIPRel)
O << "(%rip)";
return;
}
if (TM.getRelocationModel() == Reloc::PIC_) {
if (Subtarget->isPICStyleStub())
- O << "-\"L" << getFunctionNumber() << "$pb\"";
- if (Subtarget->isPICStyleGOT())
+ O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber()
+ << "$pb\"";
+ else if (Subtarget->isPICStyleGOT())
O << "@GOTOFF";
}
else if (Offset < 0)
O << Offset;
- if (isMemOp && Subtarget->is64Bit() && !NotRIPRel)
+ if (isMemOp && Subtarget->isPICStyleRIPRel() && !NotRIPRel)
O << "(%rip)";
return;
}
GlobalValue *GV = MO.getGlobal();
std::string Name = Mang->getValueName(GV);
-
- bool isExt = (GV->isExternal() || GV->hasWeakLinkage() ||
- GV->hasLinkOnceLinkage());
- bool isHidden = GV->hasHiddenVisibility();
-
X86SharedAsmPrinter::decorateName(Name, GV);
- if (Subtarget->isPICStyleStub()) {
+ if (printStub(TM, Subtarget)) {
// Link-once, External, or Weakly-linked global variables need
// non-lazily-resolved stubs
- if (isExt) {
+ if (GV->isDeclaration() ||
+ GV->hasWeakLinkage() ||
+ GV->hasLinkOnceLinkage()) {
// Dynamically-resolved functions need a stub for the function.
if (isCallOp && isa<Function>(GV)) {
FnStubs.insert(Name);
- O << "L" << Name << "$stub";
+ O << TAI->getPrivateGlobalPrefix() << Name << "$stub";
} else {
GVStubs.insert(Name);
- O << "L" << Name << "$non_lazy_ptr";
+ O << TAI->getPrivateGlobalPrefix() << Name << "$non_lazy_ptr";
}
} else {
- if (GV->hasDLLImportLinkage()) {
+ if (GV->hasDLLImportLinkage())
O << "__imp_";
- }
O << Name;
}
if (!isCallOp && TM.getRelocationModel() == Reloc::PIC_)
- O << "-\"L" << getFunctionNumber() << "$pb\"";
+ O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber()
+ << "$pb\"";
} else {
if (GV->hasDLLImportLinkage()) {
O << "__imp_";
O << Name;
if (isCallOp && isa<Function>(GV)) {
- if (Subtarget->isPICStyleGOT()) {
+ if (printGOT(TM, Subtarget)) {
// Assemble call via PLT for non-local symbols
- if (!isHidden || GV->isExternal())
+ if (!GV->hasHiddenVisibility() || GV->isDeclaration())
O << "@PLT";
}
- if (Subtarget->isTargetCygMing() && GV->isExternal()) {
+ if (Subtarget->isTargetCygMing() && GV->isDeclaration())
// Save function name for later type emission
FnStubs.insert(Name);
- }
}
}
O << Offset;
if (isMemOp) {
- if (isExt) {
- if (Subtarget->isPICStyleGOT()) {
+ if (printGOT(TM, Subtarget)) {
+ if (Subtarget->GVRequiresExtraLoad(GV, TM, false))
O << "@GOT";
- } else if (Subtarget->isPICStyleRIPRel()) {
- O << "@GOTPCREL(%rip)";
- } else if (Subtarget->is64Bit() && !NotRIPRel)
- // Use rip when possible to reduce code size, except when
- // index or base register are also part of the address. e.g.
- // foo(%rip)(%rcx,%rax,4) is not legal
- O << "(%rip)";
- } else {
- if (Subtarget->is64Bit() && !NotRIPRel)
- O << "(%rip)";
- else if (Subtarget->isPICStyleGOT())
+ else
O << "@GOTOFF";
+ } else if (Subtarget->isPICStyleRIPRel() && !NotRIPRel) {
+ if ((GV->hasExternalLinkage() ||
+ GV->hasWeakLinkage() ||
+ GV->hasLinkOnceLinkage()) &&
+ TM.getRelocationModel() != Reloc::Static)
+ O << "@GOTPCREL";
+ // Use rip when possible to reduce code size, except when
+ // index or base register are also part of the address. e.g.
+ // foo(%rip)(%rcx,%rax,4) is not legal
+ O << "(%rip)";
}
}
bool isCallOp = Modifier && !strcmp(Modifier, "call");
std::string Name(TAI->getGlobalPrefix());
Name += MO.getSymbolName();
- if (isCallOp && Subtarget->isPICStyleStub()) {
+ if (isCallOp && printStub(TM, Subtarget)) {
FnStubs.insert(Name);
- O << "L" << Name << "$stub";
+ O << TAI->getPrivateGlobalPrefix() << Name << "$stub";
return;
}
if (!isCallOp) O << '$';
O << Name;
- if (Subtarget->isPICStyleGOT()) {
+ if (printGOT(TM, Subtarget)) {
std::string GOTName(TAI->getGlobalPrefix());
GOTName+="_GLOBAL_OFFSET_TABLE_";
if (Name == GOTName)
- // Really hack! Emit extra offset to PC during printing GOT offset to
- // compensate size of popl instruction. The resulting code should look
- // like:
+ // HACK! Emit extra offset to PC during printing GOT offset to
+ // compensate for the size of popl instruction. The resulting code
+ // should look like:
// call .piclabel
// piclabel:
// popl %some_register
// addl $_GLOBAL_ADDRESS_TABLE_ + [.-piclabel], %some_register
- O << " + [.-" << computePICLabel(getFunctionNumber(), Subtarget) << "]";
- }
+ O << " + [.-"
+ << computePICLabel(getFunctionNumber(), TAI, Subtarget) << "]";
- if (isCallOp && Subtarget->isPICStyleGOT())
- O << "@PLT";
+ if (isCallOp)
+ O << "@PLT";
+ }
- if (!isCallOp && Subtarget->is64Bit())
+ if (!isCallOp && Subtarget->isPICStyleRIPRel())
O << "(%rip)";
return;
}
void X86ATTAsmPrinter::printPICLabel(const MachineInstr *MI, unsigned Op) {
- std::string label = computePICLabel(getFunctionNumber(), Subtarget);
+ std::string label = computePICLabel(getFunctionNumber(), TAI, Subtarget);
O << label << "\n" << label << ":";
}
switch (ExtraCode[0]) {
default: return true; // Unknown modifier.
- case 'c': // Don't print "$" before a global var name.
+ case 'c': // Don't print "$" before a global var name or constant.
printOperand(MI, OpNo, "mem");
return false;
case 'b': // Print QImode register
case 'h': // Print QImode high register
case 'w': // Print HImode register
case 'k': // Print SImode register
- return printAsmMRegister(MI->getOperand(OpNo), ExtraCode[0]);
+ if (MI->getOperand(OpNo).isReg())
+ return printAsmMRegister(MI->getOperand(OpNo), ExtraCode[0]);
+ printOperand(MI, OpNo);
+ return false;
+
+ case 'P': // Don't print @PLT, but do print as memory.
+ printOperand(MI, OpNo, "mem");
+ return false;
}
}