RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-25 04:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the names used for internal labels to use the current

Browse Source 
function symbol name instead of a codegen-assigned function
number.

Thanks Evan! :-)


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42908 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2007-10-12 14:53:36 +00:00
parent a9b511187b
commit 8ddde0a151
13 changed files with 78 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/llvm/CodeGen/AsmPrinter.h
View File

@ -36,13 +36,6 @@ namespace llvm {
class AsmPrinter : public MachineFunctionPass { class AsmPrinter : public MachineFunctionPass {
static char ID; static char ID;
/// FunctionNumber - This provides a unique ID for each function emitted in
/// this translation unit. It is autoincremented by SetupMachineFunction,
/// and can be accessed with getFunctionNumber() and
/// IncrementFunctionNumber().
///
unsigned FunctionNumber;
protected: protected:
// Necessary for external weak linkage support // Necessary for external weak linkage support
std::set<const GlobalValue*> ExtWeakSymbols; std::set<const GlobalValue*> ExtWeakSymbols;
@ -160,15 +153,6 @@ namespace llvm {
/// is being processed from runOnMachineFunction. /// is being processed from runOnMachineFunction.
void SetupMachineFunction(MachineFunction &MF); void SetupMachineFunction(MachineFunction &MF);
/// getFunctionNumber - Return a unique ID for the current function.
///
unsigned getFunctionNumber() const { return FunctionNumber; }
/// IncrementFunctionNumber - Increase Function Number. AsmPrinters should
/// not normally call this, as the counter is automatically bumped by
/// SetupMachineFunction.
void IncrementFunctionNumber() { FunctionNumber++; }
/// EmitConstantPool - Print to the current output stream assembly /// EmitConstantPool - Print to the current output stream assembly
/// representations of the constants in the constant pool MCP. This is /// representations of the constants in the constant pool MCP. This is
/// used to print out constants which have been "spilled to memory" by /// used to print out constants which have been "spilled to memory" by

38
lib/CodeGen/AsmPrinter.cpp
View File

@ -35,7 +35,7 @@ AsmVerbose("asm-verbose", cl::Hidden, cl::desc("Add comments to directives."));
char AsmPrinter::ID = 0; char AsmPrinter::ID = 0;
AsmPrinter::AsmPrinter(std::ostream &o, TargetMachine &tm, AsmPrinter::AsmPrinter(std::ostream &o, TargetMachine &tm,
const TargetAsmInfo *T) const TargetAsmInfo *T)
: MachineFunctionPass((intptr_t)&ID), FunctionNumber(0), O(o), TM(tm), TAI(T) : MachineFunctionPass((intptr_t)&ID), O(o), TM(tm), TAI(T)
{} {}
std::string AsmPrinter::getSectionForFunction(const Function &F) const { std::string AsmPrinter::getSectionForFunction(const Function &F) const {
@ -169,7 +169,6 @@ std::string AsmPrinter::getCurrentFunctionEHName(const MachineFunction *MF) {
void AsmPrinter::SetupMachineFunction(MachineFunction &MF) { void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
// What's my mangled name? // What's my mangled name?
CurrentFnName = Mang->getValueName(MF.getFunction()); CurrentFnName = Mang->getValueName(MF.getFunction());
IncrementFunctionNumber();
} }
/// EmitConstantPool - Print to the current output stream assembly /// EmitConstantPool - Print to the current output stream assembly
@ -219,8 +218,9 @@ void AsmPrinter::EmitConstantPool(unsigned Alignment, const char *Section,
SwitchToDataSection(Section); SwitchToDataSection(Section);
EmitAlignment(Alignment); EmitAlignment(Alignment);
for (unsigned i = 0, e = CP.size(); i != e; ++i) { for (unsigned i = 0, e = CP.size(); i != e; ++i) {
O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << '_' O << TAI->getPrivateGlobalPrefix() << "CPI" << CP[i].second
<< CP[i].second << ":\t\t\t\t\t" << TAI->getCommentString() << " "; << '_' << CurrentFnName
<< ":\t\t\t\t\t" << TAI->getCommentString() << ' ';
WriteTypeSymbolic(O, CP[i].first.getType(), 0) << '\n'; WriteTypeSymbolic(O, CP[i].first.getType(), 0) << '\n';
if (CP[i].first.isMachineConstantPoolEntry()) if (CP[i].first.isMachineConstantPoolEntry())
EmitMachineConstantPoolValue(CP[i].first.Val.MachineCPVal); EmitMachineConstantPoolValue(CP[i].first.Val.MachineCPVal);
@ -293,10 +293,10 @@ void AsmPrinter::EmitJumpTableInfo(MachineJumpTableInfo *MJTI,
// the assembler and linker the extents of the jump table object. The // the assembler and linker the extents of the jump table object. The
// second label is actually referenced by the code. // second label is actually referenced by the code.
if (const char *JTLabelPrefix = TAI->getJumpTableSpecialLabelPrefix()) if (const char *JTLabelPrefix = TAI->getJumpTableSpecialLabelPrefix())
O << JTLabelPrefix << "JTI" << getFunctionNumber() << '_' << i << ":\n"; O << JTLabelPrefix << "JTI" << i << '_' << CurrentFnName << ":\n";
O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "JTI" << i
<< '_' << i << ":\n"; << '_' << CurrentFnName << ":\n";
for (unsigned ii = 0, ee = JTBBs.size(); ii != ee; ++ii) { for (unsigned ii = 0, ee = JTBBs.size(); ii != ee; ++ii) {
O << JTEntryDirective << ' '; O << JTEntryDirective << ' ';
@ -306,15 +306,15 @@ void AsmPrinter::EmitJumpTableInfo(MachineJumpTableInfo *MJTI,
// If we're emitting non-PIC code, then emit the entries as direct // If we're emitting non-PIC code, then emit the entries as direct
// references to the target basic blocks. // references to the target basic blocks.
if (!EmittedSets.empty()) { if (!EmittedSets.empty()) {
O << TAI->getPrivateGlobalPrefix() << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << i
<< '_' << i << "_set_" << JTBBs[ii]->getNumber(); << '_' << "_set_" << JTBBs[ii]->getNumber() << '_' << CurrentFnName;
} else if (IsPic) { } else if (IsPic) {
printBasicBlockLabel(JTBBs[ii], false, false); printBasicBlockLabel(JTBBs[ii], false, false);
// If the arch uses custom Jump Table directives, don't calc relative to // If the arch uses custom Jump Table directives, don't calc relative to
// JT // JT
if (!HadJTEntryDirective) if (!HadJTEntryDirective)
O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" O << '-' << TAI->getPrivateGlobalPrefix() << "JTI"
<< getFunctionNumber() << '_' << i; << i << '_' << CurrentFnName;
} else { } else {
printBasicBlockLabel(JTBBs[ii], false, false); printBasicBlockLabel(JTBBs[ii], false, false);
} }
@ -1242,8 +1242,8 @@ bool AsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
void AsmPrinter::printBasicBlockLabel(const MachineBasicBlock *MBB, void AsmPrinter::printBasicBlockLabel(const MachineBasicBlock *MBB,
bool printColon, bool printColon,
bool printComment) const { bool printComment) const {
O << TAI->getPrivateGlobalPrefix() << "BB" << getFunctionNumber() << "_" O << TAI->getPrivateGlobalPrefix() << "BB" << MBB->getNumber() << '_'
<< MBB->getNumber(); << CurrentFnName;
if (printColon) if (printColon)
O << ':'; O << ':';
if (printComment && MBB->getBasicBlock()) if (printComment && MBB->getBasicBlock())
@ -1259,10 +1259,10 @@ void AsmPrinter::printSetLabel(unsigned uid,
return; return;
O << TAI->getSetDirective() << ' ' << TAI->getPrivateGlobalPrefix() O << TAI->getSetDirective() << ' ' << TAI->getPrivateGlobalPrefix()
<< getFunctionNumber() << '_' << uid << "_set_" << MBB->getNumber() << ','; << uid << "_set_" << MBB->getNumber() << '_' << CurrentFnName << ',';
printBasicBlockLabel(MBB, false, false); printBasicBlockLabel(MBB, false, false);
O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" << uid
<< '_' << uid << '\n'; << '_' << CurrentFnName << '\n';
} }
void AsmPrinter::printSetLabel(unsigned uid, unsigned uid2, void AsmPrinter::printSetLabel(unsigned uid, unsigned uid2,
@ -1271,11 +1271,11 @@ void AsmPrinter::printSetLabel(unsigned uid, unsigned uid2,
return; return;
O << TAI->getSetDirective() << ' ' << TAI->getPrivateGlobalPrefix() O << TAI->getSetDirective() << ' ' << TAI->getPrivateGlobalPrefix()
<< getFunctionNumber() << '_' << uid << '_' << uid2 << uid << '_' << uid2
<< "_set_" << MBB->getNumber() << ','; << "_set_" << MBB->getNumber() << '_' << CurrentFnName << ',';
printBasicBlockLabel(MBB, false, false); printBasicBlockLabel(MBB, false, false);
O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" << uid
<< '_' << uid << '_' << uid2 << '\n'; << '_' << uid2 << '_' << CurrentFnName << '\n';
} }
/// printDataDirective - This method prints the asm directive for the /// printDataDirective - This method prints the asm directive for the

25
lib/Target/ARM/ARMAsmPrinter.cpp
View File

@ -319,12 +319,12 @@ void ARMAsmPrinter::printOperand(const MachineInstr *MI, int opNum,
break; break;
} }
case MachineOperand::MO_ConstantPoolIndex: case MachineOperand::MO_ConstantPoolIndex:
O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "CPI" << MO.getConstantPoolIndex()
<< '_' << MO.getConstantPoolIndex(); << '_' << CurrentFnName;
break; break;
case MachineOperand::MO_JumpTableIndex: case MachineOperand::MO_JumpTableIndex:
O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "JTI" << MO.getJumpTableIndex()
<< '_' << MO.getJumpTableIndex(); << '_' << CurrentFnName;
break; break;
default: default:
O << "<unknown operand type>"; abort (); break; O << "<unknown operand type>"; abort (); break;
@ -652,8 +652,8 @@ void ARMAsmPrinter::printCPInstOperand(const MachineInstr *MI, int OpNo,
// data itself. // data itself.
if (!strcmp(Modifier, "label")) { if (!strcmp(Modifier, "label")) {
unsigned ID = MI->getOperand(OpNo).getImm(); unsigned ID = MI->getOperand(OpNo).getImm();
O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "CPI" << ID
<< '_' << ID << ":\n"; << '_' << CurrentFnName << ":\n";
} else { } else {
assert(!strcmp(Modifier, "cpentry") && "Unknown modifier for CPE"); assert(!strcmp(Modifier, "cpentry") && "Unknown modifier for CPE");
unsigned CPI = MI->getOperand(OpNo).getConstantPoolIndex(); unsigned CPI = MI->getOperand(OpNo).getConstantPoolIndex();
@ -677,8 +677,8 @@ void ARMAsmPrinter::printJTBlockOperand(const MachineInstr *MI, int OpNo) {
const MachineOperand &MO1 = MI->getOperand(OpNo); const MachineOperand &MO1 = MI->getOperand(OpNo);
const MachineOperand &MO2 = MI->getOperand(OpNo+1); // Unique Id const MachineOperand &MO2 = MI->getOperand(OpNo+1); // Unique Id
unsigned JTI = MO1.getJumpTableIndex(); unsigned JTI = MO1.getJumpTableIndex();
O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "JTI" << JTI
<< '_' << JTI << '_' << MO2.getImmedValue() << ":\n"; << '_' << MO2.getImmedValue() << '_' << CurrentFnName << ":\n";
const char *JTEntryDirective = TAI->getJumpTableDirective(); const char *JTEntryDirective = TAI->getJumpTableDirective();
if (!JTEntryDirective) if (!JTEntryDirective)
@ -697,15 +697,16 @@ void ARMAsmPrinter::printJTBlockOperand(const MachineInstr *MI, int OpNo) {
O << JTEntryDirective << ' '; O << JTEntryDirective << ' ';
if (UseSet) if (UseSet)
O << TAI->getPrivateGlobalPrefix() << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << JTI
<< '_' << JTI << '_' << MO2.getImmedValue() << '_' << MO2.getImmedValue()
<< "_set_" << MBB->getNumber(); << "_set_" << MBB->getNumber()
<< CurrentFnName;
else if (TM.getRelocationModel() == Reloc::PIC_) { else if (TM.getRelocationModel() == Reloc::PIC_) {
printBasicBlockLabel(MBB, false, false); printBasicBlockLabel(MBB, false, false);
// If the arch uses custom Jump Table directives, don't calc relative to JT // If the arch uses custom Jump Table directives, don't calc relative to JT
if (!TAI->getJumpTableDirective()) if (!TAI->getJumpTableDirective())
O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" O << '-' << TAI->getPrivateGlobalPrefix() << "JTI"
<< getFunctionNumber() << '_' << JTI << '_' << MO2.getImmedValue(); << JTI << '_' << MO2.getImmedValue() << '_' << CurrentFnName;
} else } else
printBasicBlockLabel(MBB, false, false); printBasicBlockLabel(MBB, false, false);
if (i != e-1) if (i != e-1)

8
lib/Target/Alpha/AlphaAsmPrinter.cpp
View File

@ -104,8 +104,8 @@ void AlphaAsmPrinter::printOp(const MachineOperand &MO, bool IsCallOp) {
return; return;
case MachineOperand::MO_ConstantPoolIndex: case MachineOperand::MO_ConstantPoolIndex:
O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << "_" O << TAI->getPrivateGlobalPrefix() << "CPI" << MO.getConstantPoolIndex()
<< MO.getConstantPoolIndex(); << '_' << CurrentFnName;
return; return;
case MachineOperand::MO_ExternalSymbol: case MachineOperand::MO_ExternalSymbol:
@ -121,8 +121,8 @@ void AlphaAsmPrinter::printOp(const MachineOperand &MO, bool IsCallOp) {
} }
case MachineOperand::MO_JumpTableIndex: case MachineOperand::MO_JumpTableIndex:
O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "JTI" << MO.getJumpTableIndex()
<< '_' << MO.getJumpTableIndex(); << '_' << CurrentFnName;
return; return;
default: default:

4
lib/Target/IA64/IA64AsmPrinter.cpp
View File

@ -179,8 +179,8 @@ void IA64AsmPrinter::printOp(const MachineOperand &MO,
return; return;
case MachineOperand::MO_ConstantPoolIndex: { case MachineOperand::MO_ConstantPoolIndex: {
O << "@gprel(" << TAI->getPrivateGlobalPrefix() O << "@gprel(" << TAI->getPrivateGlobalPrefix()
<< "CPI" << getFunctionNumber() << "_" << "CPI" << MO.getConstantPoolIndex() << '_'
<< MO.getConstantPoolIndex() << ")"; << CurrentFnName << ")";
return; return;
} }

2
lib/Target/Mips/MipsAsmPrinter.cpp
View File

@ -363,7 +363,7 @@ printOperand(const MachineInstr *MI, int opNum)
case MachineOperand::MO_ConstantPoolIndex: case MachineOperand::MO_ConstantPoolIndex:
O << TAI->getPrivateGlobalPrefix() << "CPI" O << TAI->getPrivateGlobalPrefix() << "CPI"
<< getFunctionNumber() << "_" << MO.getConstantPoolIndex(); << MO.getConstantPoolIndex() << '_' << CurrentFnName;
break; break;
default: default:

18
lib/Target/PowerPC/PPCAsmPrinter.cpp
View File

@ -164,7 +164,7 @@ namespace {
O << "lo16("; O << "lo16(";
printOp(MI->getOperand(OpNo)); printOp(MI->getOperand(OpNo));
if (TM.getRelocationModel() == Reloc::PIC_) if (TM.getRelocationModel() == Reloc::PIC_)
O << "-\"L" << getFunctionNumber() << "$pb\")"; O << "-\"L" "pb$" << CurrentFnName << "\")";
else else
O << ')'; O << ')';
} }
@ -208,8 +208,8 @@ namespace {
O << (int)MI->getOperand(OpNo).getImmedValue()*4; O << (int)MI->getOperand(OpNo).getImmedValue()*4;
} }
void printPICLabel(const MachineInstr *MI, unsigned OpNo) { void printPICLabel(const MachineInstr *MI, unsigned OpNo) {
O << "\"L" << getFunctionNumber() << "$pb\"\n"; O << "\"L" "pb$" << CurrentFnName << "\"\n";
O << "\"L" << getFunctionNumber() << "$pb\":"; O << "\"L" "pb$" << CurrentFnName << "\":";
} }
void printSymbolHi(const MachineInstr *MI, unsigned OpNo) { void printSymbolHi(const MachineInstr *MI, unsigned OpNo) {
if (MI->getOperand(OpNo).isImmediate()) { if (MI->getOperand(OpNo).isImmediate()) {
@ -218,7 +218,7 @@ namespace {
if (Subtarget.isDarwin()) O << "ha16("; if (Subtarget.isDarwin()) O << "ha16(";
printOp(MI->getOperand(OpNo)); printOp(MI->getOperand(OpNo));
if (TM.getRelocationModel() == Reloc::PIC_) if (TM.getRelocationModel() == Reloc::PIC_)
O << "-\"L" << getFunctionNumber() << "$pb\""; O << "-\"L" "pb$" << CurrentFnName << "\"";
if (Subtarget.isDarwin()) if (Subtarget.isDarwin())
O << ')'; O << ')';
else else
@ -232,7 +232,7 @@ namespace {
if (Subtarget.isDarwin()) O << "lo16("; if (Subtarget.isDarwin()) O << "lo16(";
printOp(MI->getOperand(OpNo)); printOp(MI->getOperand(OpNo));
if (TM.getRelocationModel() == Reloc::PIC_) if (TM.getRelocationModel() == Reloc::PIC_)
O << "-\"L" << getFunctionNumber() << "$pb\""; O << "-\"L" "pb$" << CurrentFnName << "\"";
if (Subtarget.isDarwin()) if (Subtarget.isDarwin())
O << ')'; O << ')';
else else
@ -362,13 +362,13 @@ void PPCAsmPrinter::printOp(const MachineOperand &MO) {
printBasicBlockLabel(MO.getMachineBasicBlock()); printBasicBlockLabel(MO.getMachineBasicBlock());
return; return;
case MachineOperand::MO_JumpTableIndex: case MachineOperand::MO_JumpTableIndex:
O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "JTI" << MO.getJumpTableIndex()
<< '_' << MO.getJumpTableIndex(); << '_' << CurrentFnName;
// FIXME: PIC relocation model // FIXME: PIC relocation model
return; return;
case MachineOperand::MO_ConstantPoolIndex: case MachineOperand::MO_ConstantPoolIndex:
O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "CPI" << MO.getConstantPoolIndex()
<< '_' << MO.getConstantPoolIndex(); << '_' << CurrentFnName;
return; return;
case MachineOperand::MO_ExternalSymbol: case MachineOperand::MO_ExternalSymbol:
// Computing the address of an external symbol, not calling it. // Computing the address of an external symbol, not calling it.

4
lib/Target/Sparc/SparcAsmPrinter.cpp
View File

@ -164,8 +164,8 @@ void SparcAsmPrinter::printOperand(const MachineInstr *MI, int opNum) {
O << MO.getSymbolName(); O << MO.getSymbolName();
break; break;
case MachineOperand::MO_ConstantPoolIndex: case MachineOperand::MO_ConstantPoolIndex:
O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << "_" O << TAI->getPrivateGlobalPrefix() << "CPI" << MO.getConstantPoolIndex()
<< MO.getConstantPoolIndex(); << '_' << CurrentFnName;
break; break;
default: default:
O << "<unknown operand type>"; abort (); break; O << "<unknown operand type>"; abort (); break;

30
lib/Target/X86/X86ATTAsmPrinter.cpp
View File

@ -31,14 +31,14 @@ using namespace llvm;
STATISTIC(EmittedInsts, "Number of machine instrs printed"); STATISTIC(EmittedInsts, "Number of machine instrs printed");
static std::string computePICLabel(unsigned FnNum, static std::string computePICLabel(const std::string &FnName,
const TargetAsmInfo *TAI, const TargetAsmInfo *TAI,
const X86Subtarget* Subtarget) { const X86Subtarget* Subtarget) {
std::string label; std::string label;
if (Subtarget->isTargetDarwin()) if (Subtarget->isTargetDarwin())
label = "\"L" + utostr_32(FnNum) + "$pb\""; label = "\"L" "pb$" + FnName + "\"";
else if (Subtarget->isTargetELF()) else if (Subtarget->isTargetELF())
label = ".Lllvm$" + utostr_32(FnNum) + "$piclabel"; label = ".Lllvm$piclabel$" + FnName;
else else
assert(0 && "Don't know how to print PIC label!\n"); assert(0 && "Don't know how to print PIC label!\n");
@ -236,13 +236,13 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
case MachineOperand::MO_JumpTableIndex: { case MachineOperand::MO_JumpTableIndex: {
bool isMemOp = Modifier && !strcmp(Modifier, "mem"); bool isMemOp = Modifier && !strcmp(Modifier, "mem");
if (!isMemOp) O << '$'; if (!isMemOp) O << '$';
O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() << "_" O << TAI->getPrivateGlobalPrefix() << "JTI" << MO.getJumpTableIndex()
<< MO.getJumpTableIndex(); << '_' << CurrentFnName;
if (TM.getRelocationModel() == Reloc::PIC_) { if (TM.getRelocationModel() == Reloc::PIC_) {
if (Subtarget->isPICStyleStub()) if (Subtarget->isPICStyleStub())
O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber() O << "-\"" << TAI->getPrivateGlobalPrefix() << "pb$" << CurrentFnName
<< "$pb\""; << "\"";
else if (Subtarget->isPICStyleGOT()) else if (Subtarget->isPICStyleGOT())
O << "@GOTOFF"; O << "@GOTOFF";
} }
@ -254,13 +254,13 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
case MachineOperand::MO_ConstantPoolIndex: { case MachineOperand::MO_ConstantPoolIndex: {
bool isMemOp = Modifier && !strcmp(Modifier, "mem"); bool isMemOp = Modifier && !strcmp(Modifier, "mem");
if (!isMemOp) O << '$'; if (!isMemOp) O << '$';
O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << "_" O << TAI->getPrivateGlobalPrefix() << "CPI" << MO.getConstantPoolIndex()
<< MO.getConstantPoolIndex(); << '_' << CurrentFnName;
if (TM.getRelocationModel() == Reloc::PIC_) { if (TM.getRelocationModel() == Reloc::PIC_) {
if (Subtarget->isPICStyleStub()) if (Subtarget->isPICStyleStub())
O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber() O << "-\"" << TAI->getPrivateGlobalPrefix() << "pb$" << CurrentFnName
<< "$pb\""; << "\"";
else if (Subtarget->isPICStyleGOT()) else if (Subtarget->isPICStyleGOT())
O << "@GOTOFF"; O << "@GOTOFF";
} }
@ -317,8 +317,8 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
} }
if (!isCallOp && TM.getRelocationModel() == Reloc::PIC_) if (!isCallOp && TM.getRelocationModel() == Reloc::PIC_)
O << "-\"" << TAI->getPrivateGlobalPrefix() << getFunctionNumber() O << "-\"" << TAI->getPrivateGlobalPrefix() << "pb$" << CurrentFnName
<< "$pb\""; << "\"";
} else { } else {
if (GV->hasDLLImportLinkage()) { if (GV->hasDLLImportLinkage()) {
O << "__imp_"; O << "__imp_";
@ -418,7 +418,7 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
// popl %some_register // popl %some_register
// addl $_GLOBAL_ADDRESS_TABLE_ + [.-piclabel], %some_register // addl $_GLOBAL_ADDRESS_TABLE_ + [.-piclabel], %some_register
O << " + [.-" O << " + [.-"
<< computePICLabel(getFunctionNumber(), TAI, Subtarget) << "]"; << computePICLabel(CurrentFnName, TAI, Subtarget) << "]";
if (isCallOp) if (isCallOp)
O << "@PLT"; O << "@PLT";
@ -498,7 +498,7 @@ void X86ATTAsmPrinter::printMemReference(const MachineInstr *MI, unsigned Op,
} }
void X86ATTAsmPrinter::printPICLabel(const MachineInstr *MI, unsigned Op) { void X86ATTAsmPrinter::printPICLabel(const MachineInstr *MI, unsigned Op) {
std::string label = computePICLabel(getFunctionNumber(), TAI, Subtarget); std::string label = computePICLabel(CurrentFnName, TAI, Subtarget);
O << label << "\n" << label << ":"; O << label << "\n" << label << ":";
} }

10
lib/Target/X86/X86IntelAsmPrinter.cpp
View File

@ -140,15 +140,15 @@ void X86IntelAsmPrinter::printOp(const MachineOperand &MO,
case MachineOperand::MO_JumpTableIndex: { case MachineOperand::MO_JumpTableIndex: {
bool isMemOp = Modifier && !strcmp(Modifier, "mem"); bool isMemOp = Modifier && !strcmp(Modifier, "mem");
if (!isMemOp) O << "OFFSET "; if (!isMemOp) O << "OFFSET ";
O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << "JTI" << MO.getJumpTableIndex()
<< "_" << MO.getJumpTableIndex(); << '_' << CurrentFnName;
return; return;
} }
case MachineOperand::MO_ConstantPoolIndex: { case MachineOperand::MO_ConstantPoolIndex: {
bool isMemOp = Modifier && !strcmp(Modifier, "mem"); bool isMemOp = Modifier && !strcmp(Modifier, "mem");
if (!isMemOp) O << "OFFSET "; if (!isMemOp) O << "OFFSET ";
O << "[" << TAI->getPrivateGlobalPrefix() << "CPI" O << "[" << TAI->getPrivateGlobalPrefix() << "CPI"
<< getFunctionNumber() << "_" << MO.getConstantPoolIndex(); << MO.getConstantPoolIndex() << '_' << CurrentFnName;
int Offset = MO.getOffset(); int Offset = MO.getOffset();
if (Offset > 0) if (Offset > 0)
O << " + " << Offset; O << " + " << Offset;
@ -236,8 +236,8 @@ void X86IntelAsmPrinter::printMemReference(const MachineInstr *MI, unsigned Op,
} }
void X86IntelAsmPrinter::printPICLabel(const MachineInstr *MI, unsigned Op) { void X86IntelAsmPrinter::printPICLabel(const MachineInstr *MI, unsigned Op) {
O << "\"L" << getFunctionNumber() << "$pb\"\n"; O << "\"L" "pb$" << CurrentFnName << "\"\n";
O << "\"L" << getFunctionNumber() << "$pb\":"; O << "\"L" "pb$" << CurrentFnName << "\":";
} }
bool X86IntelAsmPrinter::printAsmMRegister(const MachineOperand &MO, bool X86IntelAsmPrinter::printAsmMRegister(const MachineOperand &MO,

2
test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll
View File

@ -1,5 +1,5 @@
; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | %prcontext je 1 | \ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | %prcontext je 1 | \
; RUN: grep BB1_1: ; RUN: grep BB1_main:
%str = internal constant [14 x sbyte] c"Hello world!\0A\00" ; <[14 x sbyte]*> [#uses=1] %str = internal constant [14 x sbyte] c"Hello world!\0A\00" ; <[14 x sbyte]*> [#uses=1]
%str = internal constant [13 x sbyte] c"Blah world!\0A\00" ; <[13 x sbyte]*> [#uses=1] %str = internal constant [13 x sbyte] c"Blah world!\0A\00" ; <[13 x sbyte]*> [#uses=1]

2
test/CodeGen/X86/2007-01-08-InstrSched.ll
View File

@ -1,6 +1,6 @@
; PR1075 ; PR1075
; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | \ ; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | \
; RUN: %prcontext {mulss LCPI1_3} 1 | grep mulss | count 1 ; RUN: %prcontext {mulss LCPI3__foo} 1 | grep mulss | count 1
define float @foo(float %x) { define float @foo(float %x) {
%tmp1 = mul float %x, 3.000000e+00 %tmp1 = mul float %x, 3.000000e+00

12
test/CodeGen/X86/fp_constant_op.llx
View File

@ -3,32 +3,32 @@
; Test that the load of the constant is folded into the operation. ; Test that the load of the constant is folded into the operation.
double %test_add(double %P) { double %foo_add(double %P) {
%tmp.1 = add double %P, 0x405EC00000000000 %tmp.1 = add double %P, 0x405EC00000000000
ret double %tmp.1 ret double %tmp.1
} }
double %test_mul(double %P) { double %foo_mul(double %P) {
%tmp.1 = mul double %P, 0x405EC00000000000 %tmp.1 = mul double %P, 0x405EC00000000000
ret double %tmp.1 ret double %tmp.1
} }
double %test_sub(double %P) { double %foo_sub(double %P) {
%tmp.1 = sub double %P, 0x405EC00000000000 %tmp.1 = sub double %P, 0x405EC00000000000
ret double %tmp.1 ret double %tmp.1
} }
double %test_subr(double %P) { double %foo_subr(double %P) {
%tmp.1 = sub double 0x405EC00000000000, %P %tmp.1 = sub double 0x405EC00000000000, %P
ret double %tmp.1 ret double %tmp.1
} }
double %test_div(double %P) { double %foo_div(double %P) {
%tmp.1 = div double %P, 0x405EC00000000000 %tmp.1 = div double %P, 0x405EC00000000000
ret double %tmp.1 ret double %tmp.1
} }
double %test_divr(double %P) { double %foo_divr(double %P) {
%tmp.1 = div double 0x405EC00000000000, %P %tmp.1 = div double 0x405EC00000000000, %P
ret double %tmp.1 ret double %tmp.1
} }