diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2007-10-14 05:57:21 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2007-10-14 05:57:21 +0000 |
| commit | 347d39f1fd8ad825a7ec5b8a3dce816723a56d42 (patch) | |
| tree | b53cc576e0aba064bc5630eb5a5eddb28ee58fd1 /lib/Target/ARM/ARMAsmPrinter.cpp | |
| parent | 296c1761416df3eb706dbcf5319f1f2267e1b4f7 (diff) | |
Revert 42908 for now.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42960 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMAsmPrinter.cpp')
| -rw-r--r-- | lib/Target/ARM/ARMAsmPrinter.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index b10399aebe..9435cc1174 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -319,12 +319,12 @@ void ARMAsmPrinter::printOperand(const MachineInstr *MI, int opNum, break; } case MachineOperand::MO_ConstantPoolIndex: - O << TAI->getPrivateGlobalPrefix() << "CPI" << MO.getConstantPoolIndex() - << '_' << CurrentFnName; + O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() + << '_' << MO.getConstantPoolIndex(); break; case MachineOperand::MO_JumpTableIndex: - O << TAI->getPrivateGlobalPrefix() << "JTI" << MO.getJumpTableIndex() - << '_' << CurrentFnName; + O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() + << '_' << MO.getJumpTableIndex(); break; default: O << "<unknown operand type>"; abort (); break; @@ -652,8 +652,8 @@ void ARMAsmPrinter::printCPInstOperand(const MachineInstr *MI, int OpNo, // data itself. if (!strcmp(Modifier, "label")) { unsigned ID = MI->getOperand(OpNo).getImm(); - O << TAI->getPrivateGlobalPrefix() << "CPI" << ID - << '_' << CurrentFnName << ":\n"; + O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() + << '_' << ID << ":\n"; } else { assert(!strcmp(Modifier, "cpentry") && "Unknown modifier for CPE"); 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 &MO2 = MI->getOperand(OpNo+1); // Unique Id unsigned JTI = MO1.getJumpTableIndex(); - O << TAI->getPrivateGlobalPrefix() << "JTI" << JTI - << '_' << MO2.getImmedValue() << '_' << CurrentFnName << ":\n"; + O << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() + << '_' << JTI << '_' << MO2.getImmedValue() << ":\n"; const char *JTEntryDirective = TAI->getJumpTableDirective(); if (!JTEntryDirective) @@ -697,16 +697,15 @@ void ARMAsmPrinter::printJTBlockOperand(const MachineInstr *MI, int OpNo) { O << JTEntryDirective << ' '; if (UseSet) - O << TAI->getPrivateGlobalPrefix() << JTI - << '_' << MO2.getImmedValue() - << "_set_" << MBB->getNumber() - << CurrentFnName; + O << TAI->getPrivateGlobalPrefix() << getFunctionNumber() + << '_' << JTI << '_' << MO2.getImmedValue() + << "_set_" << MBB->getNumber(); else if (TM.getRelocationModel() == Reloc::PIC_) { printBasicBlockLabel(MBB, false, false); // If the arch uses custom Jump Table directives, don't calc relative to JT if (!TAI->getJumpTableDirective()) O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" - << JTI << '_' << MO2.getImmedValue() << '_' << CurrentFnName; + << getFunctionNumber() << '_' << JTI << '_' << MO2.getImmedValue(); } else printBasicBlockLabel(MBB, false, false); if (i != e-1) |