Changes in directory llvm/lib/Target/CBackend:
AltiVecCTargetMachine.h updated: 1.1.2.1 -> 1.1.2.2 AltiVecWriter.cpp updated: 1.1.2.1 -> 1.1.2.2 CTargetMachine.h updated: 1.8.2.1 -> 1.8.2.2 SSECTargetMachine.h updated: 1.1.2.1 -> 1.1.2.2 SSEWriter.cpp updated: 1.1.2.1 -> 1.1.2.2 Writer.cpp updated: 1.245.2.1 -> 1.245.2.2 --- Log message: Merged mainline into Vector LLVM branch --- Diffs of the changes: (+10 -8) AltiVecCTargetMachine.h | 2 +- AltiVecWriter.cpp | 2 +- CTargetMachine.h | 2 +- SSECTargetMachine.h | 2 +- SSEWriter.cpp | 2 +- Writer.cpp | 8 +++++--- 6 files changed, 10 insertions(+), 8 deletions(-) Index: llvm/lib/Target/CBackend/AltiVecCTargetMachine.h diff -u llvm/lib/Target/CBackend/AltiVecCTargetMachine.h:1.1.2.1 llvm/lib/Target/CBackend/AltiVecCTargetMachine.h:1.1.2.2 --- llvm/lib/Target/CBackend/AltiVecCTargetMachine.h:1.1.2.1 Tue Oct 18 14:36:52 2005 +++ llvm/lib/Target/CBackend/AltiVecCTargetMachine.h Wed Nov 16 12:32:34 2005 @@ -26,7 +26,7 @@ // This is the only thing that actually does anything here. bool addPassesToEmitFile(PassManager &PM, std::ostream &Out, - CodeGenFileType FileType); + CodeGenFileType FileType, bool Fast); }; Index: llvm/lib/Target/CBackend/AltiVecWriter.cpp diff -u llvm/lib/Target/CBackend/AltiVecWriter.cpp:1.1.2.1 llvm/lib/Target/CBackend/AltiVecWriter.cpp:1.1.2.2 --- llvm/lib/Target/CBackend/AltiVecWriter.cpp:1.1.2.1 Tue Oct 18 14:36:52 2005 +++ llvm/lib/Target/CBackend/AltiVecWriter.cpp Wed Nov 16 12:32:34 2005 @@ -193,7 +193,7 @@ //===----------------------------------------------------------------------===// bool AltiVecCTargetMachine::addPassesToEmitFile(PassManager &PM, std::ostream &o, - CodeGenFileType FileType) { + CodeGenFileType FileType, bool Fast) { if (FileType != TargetMachine::AssemblyFile) return true; // Add lowervectors pass here to lower variable-length vectors, which we can't handle PM.add(createLowerGCPass()); Index: llvm/lib/Target/CBackend/CTargetMachine.h diff -u llvm/lib/Target/CBackend/CTargetMachine.h:1.8.2.1 llvm/lib/Target/CBackend/CTargetMachine.h:1.8.2.2 --- llvm/lib/Target/CBackend/CTargetMachine.h:1.8.2.1 Tue Oct 18 14:21:57 2005 +++ llvm/lib/Target/CBackend/CTargetMachine.h Wed Nov 16 12:32:34 2005 @@ -25,7 +25,7 @@ // This is the only thing that actually does anything here. virtual bool addPassesToEmitFile(PassManager &PM, std::ostream &Out, - CodeGenFileType FileType); + CodeGenFileType FileType, bool Fast); // This class always works, but shouldn't be the default in most cases. static unsigned getModuleMatchQuality(const Module &M) { return 1; } Index: llvm/lib/Target/CBackend/SSECTargetMachine.h diff -u llvm/lib/Target/CBackend/SSECTargetMachine.h:1.1.2.1 llvm/lib/Target/CBackend/SSECTargetMachine.h:1.1.2.2 --- llvm/lib/Target/CBackend/SSECTargetMachine.h:1.1.2.1 Tue Oct 18 14:36:52 2005 +++ llvm/lib/Target/CBackend/SSECTargetMachine.h Wed Nov 16 12:32:34 2005 @@ -26,7 +26,7 @@ // This is the only thing that actually does anything here. bool addPassesToEmitFile(PassManager &PM, std::ostream &Out, - CodeGenFileType FileType); + CodeGenFileType FileType, bool Fast); }; Index: llvm/lib/Target/CBackend/SSEWriter.cpp diff -u llvm/lib/Target/CBackend/SSEWriter.cpp:1.1.2.1 llvm/lib/Target/CBackend/SSEWriter.cpp:1.1.2.2 --- llvm/lib/Target/CBackend/SSEWriter.cpp:1.1.2.1 Tue Oct 18 14:36:52 2005 +++ llvm/lib/Target/CBackend/SSEWriter.cpp Wed Nov 16 12:32:34 2005 @@ -117,7 +117,7 @@ //===----------------------------------------------------------------------===// bool SSECTargetMachine::addPassesToEmitFile(PassManager &PM, std::ostream &o, - CodeGenFileType FileType) { + CodeGenFileType FileType, bool Fast) { if (FileType != TargetMachine::AssemblyFile) return true; // Add lowervectors pass here to lower variable-length vectors, which we can't handle PM.add(createLowerGCPass()); Index: llvm/lib/Target/CBackend/Writer.cpp diff -u llvm/lib/Target/CBackend/Writer.cpp:1.245.2.1 llvm/lib/Target/CBackend/Writer.cpp:1.245.2.2 --- llvm/lib/Target/CBackend/Writer.cpp:1.245.2.1 Tue Oct 18 14:21:57 2005 +++ llvm/lib/Target/CBackend/Writer.cpp Wed Nov 16 12:32:34 2005 @@ -662,6 +662,7 @@ // Ensure that all structure types have names... Mang = new Mangler(M); + Mang->markCharUnacceptable('.'); // get declaration for alloca Out << "/* Provide Declarations */\n"; @@ -835,7 +836,7 @@ Out << "/* Structure forward decls */\n"; for (; I != End; ++I) if (const Type *STy = dyn_cast<StructType>(I->second)) { - std::string Name = "struct l_" + Mangler::makeNameProper(I->first); + std::string Name = "struct l_" + Mang->makeNameProper(I->first); Out << Name << ";\n"; TypeNames.insert(std::make_pair(STy, Name)); } @@ -846,7 +847,7 @@ Out << "/* Typedefs */\n"; for (I = ST.type_begin(); I != End; ++I) { const Type *Ty = cast<Type>(I->second); - std::string Name = "l_" + Mangler::makeNameProper(I->first); + std::string Name = "l_" + Mang->makeNameProper(I->first); Out << "typedef "; printType(Out, Ty, Name); Out << ";\n"; @@ -1546,12 +1547,13 @@ //===----------------------------------------------------------------------===// bool CTargetMachine::addPassesToEmitFile(PassManager &PM, std::ostream &o, - CodeGenFileType FileType) { + CodeGenFileType FileType, bool Fast) { if (FileType != TargetMachine::AssemblyFile) return true; PM.add(createLowerGCPass()); PM.add(createLowerAllocationsPass(true)); PM.add(createLowerInvokePass()); + PM.add(createCFGSimplificationPass()); // clean up after lower invoke. PM.add(new CBackendNameAllUsedStructs()); PM.add(new CWriter(o, getIntrinsicLowering())); return false; _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits