[llvm-commits] CVS: llvm/lib/Target/ARM/ARMTargetMachine.cpp ARMTargetMachine.h

[Jim Laskey]

Changes in directory llvm/lib/Target/ARM:

ARMTargetMachine.cpp updated: 1.8 -> 1.9
ARMTargetMachine.h updated: 1.4 -> 1.5
---
Log message:

1. Remove condition on delete.

2. Protect and outline createTargetAsmInfo.

3. Misc. kruft.


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

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


Index: llvm/lib/Target/ARM/ARMTargetMachine.cpp
diff -u llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.8 llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.9
--- llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.8	Sun Sep  3 23:14:57 2006
+++ llvm/lib/Target/ARM/ARMTargetMachine.cpp	Thu Sep  7 18:39:26 2006
@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "ARMTargetAsmInfo.h"
 #include "ARMTargetMachine.h"
 #include "ARMFrameInfo.h"
 #include "ARM.h"
@@ -24,6 +25,12 @@
   RegisterTarget<ARMTargetMachine> X("arm", "  ARM");
 }
 
+
+const TargetAsmInfo *ARMTargetMachine::createTargetAsmInfo() const {
+  return new ARMTargetAsmInfo(*this);
+}
+
+
 /// TargetMachine ctor - Create an ILP32 architecture model
 ///
 ARMTargetMachine::ARMTargetMachine(const Module &M, const std::string &FS)


Index: llvm/lib/Target/ARM/ARMTargetMachine.h
diff -u llvm/lib/Target/ARM/ARMTargetMachine.h:1.4 llvm/lib/Target/ARM/ARMTargetMachine.h:1.5
--- llvm/lib/Target/ARM/ARMTargetMachine.h:1.4	Thu Sep  7 17:06:40 2006
+++ llvm/lib/Target/ARM/ARMTargetMachine.h	Thu Sep  7 18:39:26 2006
@@ -20,7 +20,6 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "ARMInstrInfo.h"
 #include "ARMFrameInfo.h"
-#include "ARMTargetAsmInfo.h"
 
 namespace llvm {
 
@@ -30,6 +29,10 @@
   const TargetData DataLayout;       // Calculates type size & alignment
   ARMInstrInfo InstrInfo;
   ARMFrameInfo FrameInfo;
+  
+protected:
+  virtual const TargetAsmInfo *createTargetAsmInfo() const;
+
 public:
   ARMTargetMachine(const Module &M, const std::string &FS);
 
@@ -41,10 +44,6 @@
   virtual const TargetData       *getTargetData() const { return &DataLayout; }
   static unsigned getModuleMatchQuality(const Module &M);
 
-  virtual const TargetAsmInfo *createTargetAsmInfo() const {
-    return static_cast<const TargetAsmInfo *>(new ARMTargetAsmInfo(*this));
-  }
-
   // Pass Pipeline Configuration
   virtual bool addInstSelector(FunctionPassManager &PM, bool Fast);
   virtual bool addAssemblyEmitter(FunctionPassManager &PM, bool Fast,