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

[Chris Lattner]

Changes in directory llvm/lib/Target/SparcV9:

SparcV9BurgISel.cpp updated: 1.26 -> 1.27
SparcV9TargetMachine.cpp updated: 1.144 -> 1.145
SparcV9TargetMachine.h updated: 1.15 -> 1.16
---
Log message:

Eliminate IntrinsicLowering from TargetMachine.
Make the CBE and V9 backends create their own, since they're the only ones that use it.


---
Diffs of the changes:  (+5 -7)

 SparcV9BurgISel.cpp      |    3 ++-
 SparcV9TargetMachine.cpp |    6 ++----
 SparcV9TargetMachine.h   |    3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)


Index: llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.26 llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.27
--- llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.26	Wed Feb  8 20:19:16 2006
+++ llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp	Wed Mar 22 23:43:15 2006
@@ -4356,6 +4356,7 @@
 //==------------------------------------------------------------------------==//
 
 bool V9ISel::runOnFunction(Function &F) {
+  DefaultIntrinsicLowering IL;
   // First pass - Walk the function, lowering any calls to intrinsic functions
   // which the instruction selector cannot handle.
   for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
@@ -4376,7 +4377,7 @@
           default:
             // All other intrinsic calls we must lower.
             Instruction *Before = CI->getPrev();
-            Target.getIntrinsicLowering().LowerIntrinsicCall(CI);
+            IL.LowerIntrinsicCall(CI);
             if (Before) {        // Move iterator to instruction after call
               I = Before;  ++I;
             } else {


Index: llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.144 llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.145
--- llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.144	Mon Nov  7 20:11:51 2005
+++ llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp	Wed Mar 22 23:43:15 2006
@@ -17,7 +17,6 @@
 #include "llvm/PassManager.h"
 #include "llvm/Assembly/PrintModulePass.h"
 #include "llvm/CodeGen/InstrScheduling.h"
-#include "llvm/CodeGen/IntrinsicLowering.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Target/TargetOptions.h"
@@ -147,10 +146,9 @@
 }
 
 
-SparcV9TargetMachine::SparcV9TargetMachine(const Module &M,
-                                           IntrinsicLowering *il,
+SparcV9TargetMachine::SparcV9TargetMachine(const Module &M, 
                                            const std::string &FS)
-  : TargetMachine("UltraSparcV9-Native", il, false),
+  : TargetMachine("UltraSparcV9-Native", false),
     schedInfo(*this),
     regInfo(*this),
     frameInfo(*this),


Index: llvm/lib/Target/SparcV9/SparcV9TargetMachine.h
diff -u llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.15 llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.16
--- llvm/lib/Target/SparcV9/SparcV9TargetMachine.h:1.15	Mon Nov  7 20:11:51 2005
+++ llvm/lib/Target/SparcV9/SparcV9TargetMachine.h	Wed Mar 22 23:43:16 2006
@@ -32,8 +32,7 @@
   SparcV9FrameInfo frameInfo;
   SparcV9JITInfo   jitInfo;
 public:
-  SparcV9TargetMachine(const Module &M, IntrinsicLowering *IL,
-                       const std::string &FS);
+  SparcV9TargetMachine(const Module &M, const std::string &FS);
 
   virtual const TargetInstrInfo  *getInstrInfo() const { return &instrInfo; }
   virtual const TargetSchedInfo  *getSchedInfo() const { return &schedInfo; }