[llvm-commits] CVS: llvm/lib/Target/PowerPC/Makefile PowerPCTargetMachine.cpp PPC64CodeEmitter.cpp PPC64ISelPattern.cpp PPC64InstrInfo.cpp PPC64InstrInfo.h PPC64JITInfo.h PPC64RegisterInfo.cpp PPC64RegisterInfo.h PPC64TargetMachine.h

[Nate Begeman]

Changes in directory llvm/lib/Target/PowerPC:

Makefile updated: 1.17 -> 1.18
PowerPCTargetMachine.cpp updated: 1.61 -> 1.62
PPC64CodeEmitter.cpp (r1.4) removed
PPC64ISelPattern.cpp (r1.28) removed
PPC64InstrInfo.cpp (r1.2) removed
PPC64InstrInfo.h (r1.2) removed
PPC64JITInfo.h (r1.4) removed
PPC64RegisterInfo.cpp (r1.10) removed
PPC64RegisterInfo.h (r1.2) removed
PPC64TargetMachine.h (r1.4) removed
---
Log message:

Remove support for 64b PPC, it's been broken for a long time.  It'll be
back once a DAG->DAG ISel exists.


---
Diffs of the changes:  (+4 -39)

 Makefile                 |    5 ++---
 PowerPCTargetMachine.cpp |   38 ++------------------------------------
 2 files changed, 4 insertions(+), 39 deletions(-)


Index: llvm/lib/Target/PowerPC/Makefile
diff -u llvm/lib/Target/PowerPC/Makefile:1.17 llvm/lib/Target/PowerPC/Makefile:1.18
--- llvm/lib/Target/PowerPC/Makefile:1.17	Thu Dec 16 11:26:44 2004
+++ llvm/lib/Target/PowerPC/Makefile	Sat Aug 13 00:59:16 2005
@@ -8,12 +8,11 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 LIBRARYNAME = LLVMPowerPC
-TARGET = PowerPC PPC32 PPC64
+TARGET = PowerPC PPC32
 
 # Make sure that tblgen is run, first thing.
 BUILT_SOURCES = PowerPCGenInstrNames.inc PowerPCGenRegisterNames.inc \
                 PowerPCGenAsmWriter.inc  PPC32GenCodeEmitter.inc \
- PPC32GenRegisterInfo.h.inc PPC32GenRegisterInfo.inc PPC32GenInstrInfo.inc \
- PPC64GenRegisterInfo.h.inc PPC64GenRegisterInfo.inc PPC64GenInstrInfo.inc
+ PPC32GenRegisterInfo.h.inc PPC32GenRegisterInfo.inc PPC32GenInstrInfo.inc
 
 include $(LEVEL)/Makefile.common


Index: llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.61 llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.62
--- llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.61	Fri Aug  5 17:05:03 2005
+++ llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp	Sat Aug 13 00:59:16 2005
@@ -14,9 +14,7 @@
 #include "PowerPCTargetMachine.h"
 #include "PowerPCFrameInfo.h"
 #include "PPC32TargetMachine.h"
-#include "PPC64TargetMachine.h"
 #include "PPC32JITInfo.h"
-#include "PPC64JITInfo.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Analysis/Verifier.h"
@@ -35,16 +33,10 @@
 
 namespace {
   const std::string PPC32ID = "PowerPC/32bit";
-  const std::string PPC64ID = "PowerPC/64bit";
 
   // Register the targets
   RegisterTarget<PPC32TargetMachine>
   X("ppc32", "  PowerPC 32-bit");
-
-#if 0
-  RegisterTarget<PPC64TargetMachine>
-  Y("ppc64", "  PowerPC 64-bit (unimplemented)");
-#endif
 }
 
 PowerPCTargetMachine::PowerPCTargetMachine(const std::string &name,
@@ -75,8 +67,6 @@
                                                 CodeGenFileType FileType) {
   if (FileType != TargetMachine::AssemblyFile) return true;
 
-  bool LP64 = (0 != dynamic_cast<PPC64TargetMachine *>(this));
-
   if (EnablePPCLSR) {
     PM.add(createLoopStrengthReducePass());
     PM.add(createVerifierPass());
@@ -98,9 +88,7 @@
   PM.add(createUnreachableBlockEliminationPass());
 
   // Default to pattern ISel
-  if (LP64)
-    PM.add(createPPC64ISelPattern(*this));
-  else if (PatternISelTriState == 0)
+  if (PatternISelTriState == 0)
     PM.add(createPPC32ISelSimple(*this));
   else
     PM.add(createPPC32ISelPattern(*this));
@@ -138,8 +126,6 @@
   // The JIT does not support or need PIC.
   PICEnabled = false;
 
-  bool LP64 = (0 != dynamic_cast<PPC64TargetMachine *>(&TM));
-
   if (EnablePPCLSR) {
     PM.add(createLoopStrengthReducePass());
     PM.add(createCFGSimplificationPass());
@@ -160,9 +146,7 @@
   PM.add(createUnreachableBlockEliminationPass());
 
   // Default to pattern ISel
-  if (LP64)
-    PM.add(createPPC64ISelPattern(TM));
-  else if (PatternISelTriState == 0)
+  if (PatternISelTriState == 0)
     PM.add(createPPC32ISelSimple(TM));
   else
     PM.add(createPPC32ISelPattern(TM));
@@ -184,13 +168,6 @@
                          TargetData(PPC32ID,false,4,4,4,4,4,4,2,1,1),
                          PowerPCFrameInfo(*this, false)), JITInfo(*this) {}
 
-/// PPC64TargetMachine ctor - Create a LP64 architecture model
-///
-PPC64TargetMachine::PPC64TargetMachine(const Module &M, IntrinsicLowering *IL)
-  : PowerPCTargetMachine(PPC64ID, IL, M,
-                         TargetData(PPC64ID,false,8,4,4,4,4,4,2,1,1),
-                         PowerPCFrameInfo(*this, true)) {}
-
 unsigned PPC32TargetMachine::getModuleMatchQuality(const Module &M) {
   // We strongly match "powerpc-*".
   std::string TT = M.getTargetTriple();
@@ -206,14 +183,3 @@
 
   return getJITMatchQuality()/2;
 }
-
-unsigned PPC64TargetMachine::getModuleMatchQuality(const Module &M) {
-  if (M.getEndianness()  == Module::BigEndian &&
-      M.getPointerSize() == Module::Pointer64)
-    return 10;                                   // Direct match
-  else if (M.getEndianness() != Module::AnyEndianness ||
-           M.getPointerSize() != Module::AnyPointerSize)
-    return 0;                                    // Match for some other target
-
-  return getJITMatchQuality()/2;
-}