[llvm-commits] [vector_llvm] CVS: llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp SparcV9TargetMachine.h

[Robert Bocchino]

Changes in directory llvm/lib/Target/SparcV9:

SparcV9TargetMachine.cpp updated: 1.142 -> 1.142.2.1
SparcV9TargetMachine.h updated: 1.14 -> 1.14.2.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+9 -8)

 SparcV9TargetMachine.cpp |   15 ++++++++-------
 SparcV9TargetMachine.h   |    2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)


Index: llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.142 llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.142.2.1
--- llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.142	Thu Sep  1 16:38:21 2005
+++ llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp	Wed Nov 16 12:32:42 2005
@@ -162,7 +162,8 @@
 ///
 bool
 SparcV9TargetMachine::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.
@@ -171,12 +172,12 @@
   // Replace malloc and free instructions with library calls.
   PM.add(createLowerAllocationsPass());
 
-  // FIXME: implement the switch instruction in the instruction selector.
-  PM.add(createLowerSwitchPass());
-
   // FIXME: implement the invoke/unwind instructions!
   PM.add(createLowerInvokePass());
 
+  // FIXME: implement the switch instruction in the instruction selector.
+  PM.add(createLowerSwitchPass());
+
   // decompose multi-dimensional array references into single-dim refs
   PM.add(createDecomposeMultiDimRefsPass());
 
@@ -262,12 +263,12 @@
   // Replace malloc and free instructions with library calls.
   PM.add(createLowerAllocationsPass());
 
-  // FIXME: implement the switch instruction in the instruction selector.
-  PM.add(createLowerSwitchPass());
-
   // FIXME: implement the invoke/unwind instructions!
   PM.add(createLowerInvokePass());
 
+  // FIXME: implement the switch instruction in the instruction selector.
+  PM.add(createLowerSwitchPass());
+
   // decompose multi-dimensional array references into single-dim refs
   PM.add(createDecomposeMultiDimRefsPass());
 


Index: llvm/lib/Target/SparcV9/SparcV9TargetMachine.h
diff -u llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.14 llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.14.2.1
--- llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.14	Thu Sep  1 16:38:21 2005
+++ llvm/lib/Target/SparcV9/SparcV9TargetMachine.h	Wed Nov 16 12:32:42 2005
@@ -45,7 +45,7 @@
   }
 
   virtual bool addPassesToEmitFile(PassManager &PM, std::ostream &Out,
-                                   CodeGenFileType FileType);
+                                   CodeGenFileType FileType, bool Fast);
   virtual bool addPassesToEmitMachineCode(FunctionPassManager &PM,
                                           MachineCodeEmitter &MCE);