From a5ef4d36198b2b591b592c595978ed7d3ac96a18 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 22 Aug 2009 21:43:10 +0000 Subject: rename TAI -> MAI, being careful not to make MAILJMP instructions :) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79777 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp | 32 ++++++++++++------------- lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h | 2 +- lib/Target/PIC16/MCSectionPIC16.h | 2 +- lib/Target/PIC16/PIC16DebugInfo.cpp | 2 +- lib/Target/PIC16/PIC16DebugInfo.h | 4 ++-- lib/Target/PIC16/PIC16TargetObjectFile.cpp | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'lib/Target/PIC16') diff --git a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp index d6e9556..5c33bed 100644 --- a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp +++ b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp @@ -37,7 +37,7 @@ PIC16AsmPrinter::PIC16AsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V), DbgInfo(O, T) { PTLI = static_cast(TM.getTargetLowering()); - PTAI = static_cast(T); + PMAI = static_cast(T); PTOF = (PIC16TargetObjectFile*)&PTLI->getObjFileLowering(); } @@ -199,18 +199,18 @@ void PIC16AsmPrinter::printLibcallDecls() { // If no libcalls used, return. if (LibcallDecls.empty()) return; - O << TAI->getCommentString() << "External decls for libcalls - BEGIN." <<"\n"; + O << MAI->getCommentString() << "External decls for libcalls - BEGIN." <<"\n"; // Remove duplicate entries. LibcallDecls.sort(is_before); LibcallDecls.unique(is_duplicate); for (std::list::const_iterator I = LibcallDecls.begin(); I != LibcallDecls.end(); I++) { - O << TAI->getExternDirective() << *I << "\n"; - O << TAI->getExternDirective() << PAN::getArgsLabel(*I) << "\n"; - O << TAI->getExternDirective() << PAN::getRetvalLabel(*I) << "\n"; + O << MAI->getExternDirective() << *I << "\n"; + O << MAI->getExternDirective() << PAN::getArgsLabel(*I) << "\n"; + O << MAI->getExternDirective() << PAN::getRetvalLabel(*I) << "\n"; } - O << TAI->getCommentString() << "External decls for libcalls - END." <<"\n"; + O << MAI->getCommentString() << "External decls for libcalls - END." <<"\n"; } /// doInitialization - Perfrom Module level initializations here. @@ -250,7 +250,7 @@ bool PIC16AsmPrinter::doInitialization(Module &M) { /// void PIC16AsmPrinter::EmitFunctionDecls(Module &M) { // Emit declarations for external functions. - O <<"\n"<getCommentString() << "Function Declarations - BEGIN." <<"\n"; + O <<"\n"<getCommentString() << "Function Declarations - BEGIN." <<"\n"; for (Module::iterator I = M.begin(), E = M.end(); I != E; I++) { if (I->isIntrinsic()) continue; @@ -272,15 +272,15 @@ void PIC16AsmPrinter::EmitFunctionDecls(Module &M) { // tracking both kind of references in printInstrunction. if (I->isDeclaration() && PAN::isMemIntrinsic(Name)) continue; - const char *directive = I->isDeclaration() ? TAI->getExternDirective() : - TAI->getGlobalDirective(); + const char *directive = I->isDeclaration() ? MAI->getExternDirective() : + MAI->getGlobalDirective(); O << directive << Name << "\n"; O << directive << PAN::getRetvalLabel(Name) << "\n"; O << directive << PAN::getArgsLabel(Name) << "\n"; } - O << TAI->getCommentString() << "Function Declarations - END." <<"\n"; + O << MAI->getCommentString() << "Function Declarations - END." <<"\n"; } // Emit variables imported from other Modules. @@ -288,11 +288,11 @@ void PIC16AsmPrinter::EmitUndefinedVars(Module &M) { std::vector Items = PTOF->ExternalVarDecls->Items; if (!Items.size()) return; - O << "\n" << TAI->getCommentString() << "Imported Variables - BEGIN" << "\n"; + O << "\n" << MAI->getCommentString() << "Imported Variables - BEGIN" << "\n"; for (unsigned j = 0; j < Items.size(); j++) { - O << TAI->getExternDirective() << Mang->getMangledName(Items[j]) << "\n"; + O << MAI->getExternDirective() << Mang->getMangledName(Items[j]) << "\n"; } - O << TAI->getCommentString() << "Imported Variables - END" << "\n"; + O << MAI->getCommentString() << "Imported Variables - END" << "\n"; } // Emit variables defined in this module and are available to other modules. @@ -300,11 +300,11 @@ void PIC16AsmPrinter::EmitDefinedVars(Module &M) { std::vector Items = PTOF->ExternalVarDefs->Items; if (!Items.size()) return; - O << "\n" << TAI->getCommentString() << "Exported Variables - BEGIN" << "\n"; + O << "\n" << MAI->getCommentString() << "Exported Variables - BEGIN" << "\n"; for (unsigned j = 0; j < Items.size(); j++) { - O << TAI->getGlobalDirective() << Mang->getMangledName(Items[j]) << "\n"; + O << MAI->getGlobalDirective() << Mang->getMangledName(Items[j]) << "\n"; } - O << TAI->getCommentString() << "Exported Variables - END" << "\n"; + O << MAI->getCommentString() << "Exported Variables - END" << "\n"; } // Emit initialized data placed in ROM. diff --git a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h index 35a87e0..8510eaa 100644 --- a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h +++ b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h @@ -70,7 +70,7 @@ namespace llvm { PIC16TargetObjectFile *PTOF; PIC16TargetLowering *PTLI; PIC16DbgInfo DbgInfo; - const PIC16MCAsmInfo *PTAI; + const PIC16MCAsmInfo *PMAI; std::list LibcallDecls; // List of extern decls. }; } // end of namespace diff --git a/lib/Target/PIC16/MCSectionPIC16.h b/lib/Target/PIC16/MCSectionPIC16.h index 048f277..61850fc 100644 --- a/lib/Target/PIC16/MCSectionPIC16.h +++ b/lib/Target/PIC16/MCSectionPIC16.h @@ -32,7 +32,7 @@ namespace llvm { static MCSectionPIC16 *Create(const StringRef &Name, SectionKind K, MCContext &Ctx); - virtual void PrintSwitchToSection(const MCAsmInfo &TAI, + virtual void PrintSwitchToSection(const MCAsmInfo &MAI, raw_ostream &OS) const; }; diff --git a/lib/Target/PIC16/PIC16DebugInfo.cpp b/lib/Target/PIC16/PIC16DebugInfo.cpp index 75c9556..19927cb 100644 --- a/lib/Target/PIC16/PIC16DebugInfo.cpp +++ b/lib/Target/PIC16/PIC16DebugInfo.cpp @@ -450,7 +450,7 @@ void PIC16DbgInfo::EmitVarDebugInfo(Module &M) { bool HasAux = false; int Aux[PIC16Dbg::AuxSize] = { 0 }; std::string TagName = ""; - std::string VarName = TAI->getGlobalPrefix()+DIGV.getGlobal()->getNameStr(); + std::string VarName = MAI->getGlobalPrefix()+DIGV.getGlobal()->getNameStr(); PopulateDebugInfo(Ty, TypeNo, HasAux, Aux, TagName); // Emit debug info only if type information is availaible. if (TypeNo != PIC16Dbg::T_NULL) { diff --git a/lib/Target/PIC16/PIC16DebugInfo.h b/lib/Target/PIC16/PIC16DebugInfo.h index ae677ca..2ccaba3 100644 --- a/lib/Target/PIC16/PIC16DebugInfo.h +++ b/lib/Target/PIC16/PIC16DebugInfo.h @@ -92,7 +92,7 @@ namespace llvm { class PIC16DbgInfo { formatted_raw_ostream &O; - const MCAsmInfo *TAI; + const MCAsmInfo *MAI; std::string CurFile; unsigned CurLine; @@ -102,7 +102,7 @@ namespace llvm { public: PIC16DbgInfo(formatted_raw_ostream &o, const MCAsmInfo *T) - : O(o), TAI(T) { + : O(o), MAI(T) { CurFile = ""; CurLine = 0; EmitDebugDirectives = false; diff --git a/lib/Target/PIC16/PIC16TargetObjectFile.cpp b/lib/Target/PIC16/PIC16TargetObjectFile.cpp index e6dfa67..7e94b25 100644 --- a/lib/Target/PIC16/PIC16TargetObjectFile.cpp +++ b/lib/Target/PIC16/PIC16TargetObjectFile.cpp @@ -25,7 +25,7 @@ MCSectionPIC16 *MCSectionPIC16::Create(const StringRef &Name, } -void MCSectionPIC16::PrintSwitchToSection(const MCAsmInfo &TAI, +void MCSectionPIC16::PrintSwitchToSection(const MCAsmInfo &MAI, raw_ostream &OS) const { OS << getName() << '\n'; } -- cgit v1.1