revert r79562 + r79563
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79690 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp
index b96ae54..1522e4c 100644
--- a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp
+++ b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp
@@ -39,7 +39,6 @@
PTLI = static_cast<PIC16TargetLowering*>(TM.getTargetLowering());
PTAI = static_cast<const PIC16TargetAsmInfo*>(T);
PTOF = (PIC16TargetObjectFile*)&PTLI->getObjFileLowering();
- CurrentFnPtr = NULL;
}
bool PIC16AsmPrinter::printMachineInstruction(const MachineInstr *MI) {
@@ -61,11 +60,6 @@
// Get the mangled name.
const Function *F = MF.getFunction();
CurrentFnName = Mang->getMangledName(F);
- CurrentFnPtr = F;
-
- // Current function name was mangled in llvm-ld for both
- // MainLine and InterruptLine and should be demangled here
- PAN::updateCallLineSymbol(CurrentFnName, CurrentFnPtr);
// Emit the function frame (args and temps).
EmitFunctionFrame(MF);
@@ -77,23 +71,18 @@
// Now emit the instructions of function in its code section.
const MCSection *fCodeSection =
- getObjFileLowering().getSectionForFunction(CurrentFnName,
- PAN::isISR(F));
+ getObjFileLowering().getSectionForFunction(CurrentFnName);
// Start the Code Section.
O << "\n";
OutStreamer.SwitchSection(fCodeSection);
-
- // If it is not an interrupt function then emit the data address
- // retrieval code in function code itself.
- if (!(PAN::isISR(F))) {
- // Emit the frame address of the function at the beginning of code.
- O << "\tretlw low(" << PAN::getFrameLabel(CurrentFnName) << ")\n";
- O << "\tretlw high(" << PAN::getFrameLabel(CurrentFnName) << ")\n";
- }
+
+ // Emit the frame address of the function at the beginning of code.
+ O << "\tretlw low(" << PAN::getFrameLabel(CurrentFnName) << ")\n";
+ O << "\tretlw high(" << PAN::getFrameLabel(CurrentFnName) << ")\n";
// Emit function start label.
O << CurrentFnName << ":\n";
-
+
DebugLoc CurDL;
O << "\n";
// Print out code for the function.
@@ -153,9 +142,7 @@
if (PAN::isMemIntrinsic(Sname)) {
LibcallDecls.push_back(createESName(Sname));
}
- // All the call sites were mangled in llvm-ld pass hence the
- // operands for call instructions should be demangled here.
- PAN::updateCallLineSymbol(Sname, CurrentFnPtr);
+
O << Sname;
break;
}
@@ -164,9 +151,7 @@
// If its a libcall name, record it to decls section.
if (PAN::getSymbolTag(Sname) == PAN::LIBCALL) {
- // LibCallDecls for InterruptLine functions should have ".IL" suffix
- const char *NewName= PAN::getUpdatedLibCallDecl(Sname, CurrentFnPtr);
- LibcallDecls.push_back(NewName);
+ LibcallDecls.push_back(Sname);
}
// Record a call to intrinsic to print the extern declaration for it.
@@ -175,13 +160,9 @@
Sym = PAN::addPrefix(Sym);
LibcallDecls.push_back(createESName(Sym));
}
- // Update the library call symbols. Library calls to InterruptLine
- // functions are different. (They have ".IL" in their names)
- // Also other symbols (frame and temp) for the cloned function
- // should be updated here.
- PAN::updateCallLineSymbol(Sym, CurrentFnPtr);
- O << Sym;
- break;
+
+ O << Sym;
+ break;
}
case MachineOperand::MO_MachineBasicBlock:
printBasicBlockLabel(MO.getMBB());
@@ -293,11 +274,7 @@
const char *directive = I->isDeclaration() ? TAI->getExternDirective() :
TAI->getGlobalDirective();
-
- // This is called in initialization. Hence information of the current
- // function line is not available. Hence UnspecifiedLine. UnspecifiedLine
- // will be treated as MainLine.
- PAN::updateCallLineSymbol(Name, PAN::UnspecifiedLine);
+
O << directive << Name << "\n";
O << directive << PAN::getRetvalLabel(Name) << "\n";
O << directive << PAN::getArgsLabel(Name) << "\n";
@@ -446,13 +423,6 @@
// Now print Autos section for this function.
std::string SectionName = PAN::getAutosSectionName(FunctName);
-
- // If this function is a cloned function then the name of auto section
- // will not be present in the list of existing section. Hence this section
- // should be cloned.
- // This function will check and clone
- PTOF->createClonedSectionForAutos(SectionName);
-
const std::vector<PIC16Section*> &AutosSections = PTOF->AutosSections;
for (unsigned i = 0; i < AutosSections.size(); i++) {
O << "\n";
@@ -466,8 +436,6 @@
Constant *C = Items[j]->getInitializer();
const Type *Ty = C->getType();
unsigned Size = TD->getTypeAllocSize(Ty);
- // Auto variables should be cloned for the cloned function
- PAN::updateCallLineAutos(VarName, CurrentFnName);
// Emit memory reserve directive.
O << VarName << " RES " << Size << "\n";
}