[llvm-commits] CVS: llvm/lib/Target/Sparc/SparcJITInfo.h SparcTargetMachine.cpp SparcTargetMachine.h

[Chris Lattner]

Changes in directory llvm/lib/Target/Sparc:

SparcJITInfo.h updated: 1.2 -> 1.3
SparcTargetMachine.cpp updated: 1.96 -> 1.97
SparcTargetMachine.h updated: 1.3 -> 1.4

---
Log message:

Clean up a lot of the code I added yesterday by exposing the IntrinsicLowering
implementation from the TargetMachine directly.



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

Index: llvm/lib/Target/Sparc/SparcJITInfo.h
diff -u llvm/lib/Target/Sparc/SparcJITInfo.h:1.2 llvm/lib/Target/Sparc/SparcJITInfo.h:1.3
--- llvm/lib/Target/Sparc/SparcJITInfo.h:1.2	Sun Dec 28 03:46:33 2003
+++ llvm/lib/Target/Sparc/SparcJITInfo.h	Sun Dec 28 15:23:38 2003
@@ -18,13 +18,11 @@
 
 namespace llvm {
   class TargetMachine;
-  class IntrinsicLowering;
 
   class SparcJITInfo : public TargetJITInfo {
     TargetMachine &TM;
-    IntrinsicLowering &IL;
   public:
-    SparcJITInfo(TargetMachine &tm, IntrinsicLowering &il) : TM(tm), IL(il) {}
+    SparcJITInfo(TargetMachine &tm) : TM(tm) {}
 
     /// addPassesToJITCompile - Add passes to the specified pass manager to
     /// implement a fast dynamic compiler for this target.  Return true if this


Index: llvm/lib/Target/Sparc/SparcTargetMachine.cpp
diff -u llvm/lib/Target/Sparc/SparcTargetMachine.cpp:1.96 llvm/lib/Target/Sparc/SparcTargetMachine.cpp:1.97
--- llvm/lib/Target/Sparc/SparcTargetMachine.cpp:1.96	Sun Dec 28 03:46:33 2003
+++ llvm/lib/Target/Sparc/SparcTargetMachine.cpp	Sun Dec 28 15:23:38 2003
@@ -116,17 +116,12 @@
 
 
 SparcTargetMachine::SparcTargetMachine(IntrinsicLowering *il)
-  : TargetMachine("UltraSparc-Native", false),
-    IL(il ? il : new DefaultIntrinsicLowering()),
+  : TargetMachine("UltraSparc-Native", il, false),
     schedInfo(*this),
     regInfo(*this),
     frameInfo(*this),
     cacheInfo(*this),
-    jitInfo(*this, *IL) {
-}
-
-SparcTargetMachine::~SparcTargetMachine() {
-  delete IL;
+    jitInfo(*this) {
 }
 
 // addPassesToEmitAssembly - This method controls the entire code generation
@@ -171,7 +166,7 @@
     PM.add(new PrintFunctionPass("Input code to instr. selection:\n",
                                  &std::cerr));
 
-  PM.add(createInstructionSelectionPass(*this, *IL));
+  PM.add(createInstructionSelectionPass(*this));
 
   if (!DisableSched)
     PM.add(createInstructionSchedulingWithSSAPass(*this));
@@ -238,7 +233,7 @@
   //PM.add(createLICMPass());
   //PM.add(createGCSEPass());
 
-  PM.add(createInstructionSelectionPass(TM, IL));
+  PM.add(createInstructionSelectionPass(TM));
 
   PM.add(getRegisterAllocator(TM));
   PM.add(createPrologEpilogInsertionPass());


Index: llvm/lib/Target/Sparc/SparcTargetMachine.h
diff -u llvm/lib/Target/Sparc/SparcTargetMachine.h:1.3 llvm/lib/Target/Sparc/SparcTargetMachine.h:1.4
--- llvm/lib/Target/Sparc/SparcTargetMachine.h:1.3	Sun Dec 28 03:46:33 2003
+++ llvm/lib/Target/Sparc/SparcTargetMachine.h	Sun Dec 28 15:23:38 2003
@@ -24,10 +24,8 @@
 
 namespace llvm {
   class PassManager;
-  class IntrinsicLowering;
 
 class SparcTargetMachine : public TargetMachine {
-  IntrinsicLowering *IL;
   SparcInstrInfo instrInfo;
   SparcSchedInfo schedInfo;
   SparcRegInfo   regInfo;
@@ -36,7 +34,6 @@
   SparcJITInfo   jitInfo;
 public:
   SparcTargetMachine(IntrinsicLowering *IL);
-  ~SparcTargetMachine();
   
   virtual const TargetInstrInfo  &getInstrInfo() const { return instrInfo; }
   virtual const TargetSchedInfo  &getSchedInfo() const { return schedInfo; }