Changes in directory llvm/lib/Target/SparcV8:
SparcV8CodeEmitter.cpp updated: 1.4 -> 1.4.4.1 SparcV8ISelPattern.cpp (r1.7) removed SparcV8TargetMachine.cpp updated: 1.29 -> 1.29.2.1 SparcV8TargetMachine.h updated: 1.7 -> 1.7.2.1 --- Log message: Merged mainline into Vector LLVM branch --- Diffs of the changes: (+4 -16) SparcV8CodeEmitter.cpp | 5 +---- SparcV8TargetMachine.cpp | 7 ++----- SparcV8TargetMachine.h | 8 +------- 3 files changed, 4 insertions(+), 16 deletions(-) Index: llvm/lib/Target/SparcV8/SparcV8CodeEmitter.cpp diff -u llvm/lib/Target/SparcV8/SparcV8CodeEmitter.cpp:1.4 llvm/lib/Target/SparcV8/SparcV8CodeEmitter.cpp:1.4.4.1 --- llvm/lib/Target/SparcV8/SparcV8CodeEmitter.cpp:1.4 Thu Apr 21 18:21:30 2005 +++ llvm/lib/Target/SparcV8/SparcV8CodeEmitter.cpp Wed Nov 16 12:32:40 2005 @@ -20,8 +20,7 @@ #include <cstdlib> #include <map> #include <vector> - -namespace llvm { +using namespace llvm; namespace { class SparcV8CodeEmitter : public MachineFunctionPass { @@ -182,5 +181,3 @@ } #include "SparcV8GenCodeEmitter.inc" - -} // end llvm namespace Index: llvm/lib/Target/SparcV8/SparcV8TargetMachine.cpp diff -u llvm/lib/Target/SparcV8/SparcV8TargetMachine.cpp:1.29 llvm/lib/Target/SparcV8/SparcV8TargetMachine.cpp:1.29.2.1 --- llvm/lib/Target/SparcV8/SparcV8TargetMachine.cpp:1.29 Thu Sep 1 16:38:21 2005 +++ llvm/lib/Target/SparcV8/SparcV8TargetMachine.cpp Wed Nov 16 12:32:40 2005 @@ -65,7 +65,8 @@ /// bool SparcV8TargetMachine::addPassesToEmitFile(PassManager &PM, std::ostream &Out, - CodeGenFileType FileType) { + CodeGenFileType FileType, + bool Fast) { if (FileType != TargetMachine::AssemblyFile) return true; // FIXME: Implement efficient support for garbage collection intrinsics. @@ -80,8 +81,6 @@ // FIXME: implement the invoke/unwind instructions! PM.add(createLowerInvokePass()); - PM.add(createLowerConstantExpressionsPass()); - // Make sure that no unreachable blocks are instruction selected. PM.add(createUnreachableBlockEliminationPass()); @@ -137,8 +136,6 @@ // FIXME: implement the invoke/unwind instructions! PM.add(createLowerInvokePass()); - PM.add(createLowerConstantExpressionsPass()); - // Make sure that no unreachable blocks are instruction selected. PM.add(createUnreachableBlockEliminationPass()); Index: llvm/lib/Target/SparcV8/SparcV8TargetMachine.h diff -u llvm/lib/Target/SparcV8/SparcV8TargetMachine.h:1.7 llvm/lib/Target/SparcV8/SparcV8TargetMachine.h:1.7.2.1 --- llvm/lib/Target/SparcV8/SparcV8TargetMachine.h:1.7 Thu Sep 1 16:38:21 2005 +++ llvm/lib/Target/SparcV8/SparcV8TargetMachine.h Wed Nov 16 12:32:40 2005 @@ -45,17 +45,11 @@ static unsigned getModuleMatchQuality(const Module &M); static unsigned getJITMatchQuality(); - /// addPassesToEmitMachineCode - Add passes to the specified pass manager to - /// get machine code emitted. This uses a MachineCodeEmitter object to handle - /// actually outputting the machine code and resolving things like the address - /// of functions. This method should returns true if machine code emission is - /// not supported. - /// virtual bool addPassesToEmitMachineCode(FunctionPassManager &PM, MachineCodeEmitter &MCE); virtual bool addPassesToEmitFile(PassManager &PM, std::ostream &Out, - CodeGenFileType FileType); + CodeGenFileType FileType, bool Fast); }; } // end namespace llvm _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits