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

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPC32TargetMachine.h updated: 1.8 -> 1.9
PPCAsmPrinter.cpp updated: 1.95 -> 1.96
PPCTargetMachine.cpp updated: 1.69 -> 1.70
PowerPCTargetMachine.h (r1.15) removed
---
Log message:

Nuke the PowerPCTargetMachine.h header.  Note that the PowerPCTargetMachine
still should be merged into the PPC32TargetMachine class


---
Diffs of the changes:  (+24 -3)

 PPC32TargetMachine.h |   24 +++++++++++++++++++++++-
 PPCAsmPrinter.cpp    |    2 +-
 PPCTargetMachine.cpp |    1 -
 3 files changed, 24 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/PowerPC/PPC32TargetMachine.h
diff -u llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.8 llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.9
--- llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.8	Thu Sep  1 16:38:20 2005
+++ llvm/lib/Target/PowerPC/PPC32TargetMachine.h	Fri Oct 14 18:44:05 2005
@@ -14,15 +14,37 @@
 #ifndef POWERPC32_TARGETMACHINE_H
 #define POWERPC32_TARGETMACHINE_H
 
-#include "PowerPCTargetMachine.h"
+#include "PowerPCFrameInfo.h"
+#include "PowerPCSubtarget.h"
 #include "PPC32JITInfo.h"
 #include "PPC32InstrInfo.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/PassManager.h"
 
 namespace llvm {
 
 class IntrinsicLowering;
+class GlobalValue;
+class IntrinsicLowering;
 
+// FIXME: Merge into only subclass.
+class PowerPCTargetMachine : public TargetMachine {
+  PowerPCFrameInfo  FrameInfo;
+  PPCSubtarget      Subtarget;
+protected:
+  PowerPCTargetMachine(const std::string &name, IntrinsicLowering *IL,
+                       const Module &M, const std::string &FS,
+                       const TargetData &TD, 
+                       const PowerPCFrameInfo &TFI);
+public:
+  virtual const TargetFrameInfo  *getFrameInfo() const { return &FrameInfo; }
+  virtual const TargetSubtarget  *getSubtargetImpl() const{ return &Subtarget; }
+  
+  virtual bool addPassesToEmitFile(PassManager &PM, std::ostream &Out,
+                                   CodeGenFileType FileType);
+};
+  
 class PPC32TargetMachine : public PowerPCTargetMachine {
   PPC32InstrInfo InstrInfo;
   PPC32JITInfo JITInfo;


Index: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.95 llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.96
--- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.95	Fri Oct 14 18:37:35 2005
+++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp	Fri Oct 14 18:44:05 2005
@@ -18,7 +18,7 @@
 
 #define DEBUG_TYPE "asmprinter"
 #include "PowerPC.h"
-#include "PowerPCTargetMachine.h"
+#include "PPC32TargetMachine.h"
 #include "PowerPCSubtarget.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"


Index: llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.69 llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.70
--- llvm/lib/Target/PowerPC/PPCTargetMachine.cpp:1.69	Thu Sep 29 12:31:03 2005
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.cpp	Fri Oct 14 18:44:05 2005
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "PowerPC.h"
-#include "PowerPCTargetMachine.h"
 #include "PowerPCFrameInfo.h"
 #include "PPC32TargetMachine.h"
 #include "PPC32JITInfo.h"