[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCTargetMachine.cpp PPCTargetMachine.h

[Jim Laskey]

Changes in directory llvm/lib/Target/PowerPC:

PPCTargetMachine.cpp updated: 1.104 -> 1.105
PPCTargetMachine.h updated: 1.24 -> 1.25
---
Log message:

1. Remove condition on delete.

2. Protect and outline createTargetAsmInfo.

3. Misc. kruft.


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

 PPCTargetMachine.cpp |    5 +++++
 PPCTargetMachine.h   |    9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.104 llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.105
--- llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.104	Wed Sep  6 13:34:40 2006
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.cpp	Thu Sep  7 18:39:26 2006
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "PPC.h"
+#include "PPCTargetAsmInfo.h"
 #include "PPCTargetMachine.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
@@ -26,6 +27,10 @@
   Y("ppc64", "  PowerPC 64");
 }
 
+const TargetAsmInfo *PPCTargetMachine::createTargetAsmInfo() const {
+  return new DarwinTargetAsmInfo(*this);
+}
+
 unsigned PPC32TargetMachine::getJITMatchQuality() {
 #if defined(__POWERPC__) || defined (__ppc__) || defined(_POWER)
   if (sizeof(void*) == 4)


Index: llvm/lib/Target/PowerPC/PPCTargetMachine.h
diff -u llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.24 llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.25
--- llvm/lib/Target/PowerPC/PPCTargetMachine.h:1.24	Thu Sep  7 17:06:40 2006
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.h	Thu Sep  7 18:39:26 2006
@@ -19,7 +19,6 @@
 #include "PPCJITInfo.h"
 #include "PPCInstrInfo.h"
 #include "PPCISelLowering.h"
-#include "PPCTargetAsmInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetData.h"
 
@@ -37,6 +36,10 @@
   PPCJITInfo          JITInfo;
   PPCTargetLowering   TLInfo;
   InstrItineraryData  InstrItins;
+  
+protected:
+  virtual const TargetAsmInfo *createTargetAsmInfo() const;
+  
 public:
   PPCTargetMachine(const Module &M, const std::string &FS, bool is64Bit);
 
@@ -56,10 +59,6 @@
     return InstrItins;
   }
   
-  virtual const TargetAsmInfo *createTargetAsmInfo() const {
-    return static_cast<const TargetAsmInfo *>(new DarwinTargetAsmInfo(*this));
-  }
-  
   // Pass Pipeline Configuration
   virtual bool addInstSelector(FunctionPassManager &PM, bool Fast);
   virtual bool addPreEmitPass(FunctionPassManager &PM, bool Fast);