[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp PPC32InstrInfo.h PowerPCAsmPrinter.cpp PowerPCBranchSelector.cpp PowerPCInstrFormats.td PowerPCInstrInfo.h

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPC32ISelPattern.cpp updated: 1.183 -> 1.184
PPC32InstrInfo.h updated: 1.3 -> 1.4
PowerPCAsmPrinter.cpp updated: 1.92 -> 1.93
PowerPCBranchSelector.cpp updated: 1.15 -> 1.16
PowerPCInstrFormats.td updated: 1.51 -> 1.52
PowerPCInstrInfo.h (r1.9) removed
---
Log message:

Nuke PowerPCInstrFormats.h, its contents are dead.  Remove the definitions
from the .td file that correspond to it


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

 PPC32ISelPattern.cpp      |    2 +-
 PPC32InstrInfo.h          |    5 +++--
 PowerPCAsmPrinter.cpp     |    7 +++++++
 PowerPCBranchSelector.cpp |    1 -
 PowerPCInstrFormats.td    |   28 ----------------------------
 5 files changed, 11 insertions(+), 32 deletions(-)


Index: llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp
diff -u llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp:1.183 llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp:1.184
--- llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp:1.183	Sun Oct  2 02:07:49 2005
+++ llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp	Fri Oct 14 17:44:13 2005
@@ -15,7 +15,7 @@
 
 #include "PowerPC.h"
 #include "PowerPCInstrBuilder.h"
-#include "PowerPCInstrInfo.h"
+#include "PPC32InstrInfo.h"
 #include "PPC32TargetMachine.h"
 #include "PPC32ISelLowering.h"
 #include "llvm/Constants.h"


Index: llvm/lib/Target/PowerPC/PPC32InstrInfo.h
diff -u llvm/lib/Target/PowerPC/PPC32InstrInfo.h:1.3 llvm/lib/Target/PowerPC/PPC32InstrInfo.h:1.4
--- llvm/lib/Target/PowerPC/PPC32InstrInfo.h:1.3	Fri Sep  9 13:17:41 2005
+++ llvm/lib/Target/PowerPC/PPC32InstrInfo.h	Fri Oct 14 17:44:13 2005
@@ -14,11 +14,12 @@
 #ifndef POWERPC32_INSTRUCTIONINFO_H
 #define POWERPC32_INSTRUCTIONINFO_H
 
-#include "PowerPCInstrInfo.h"
+#include "PowerPC.h"
+#include "llvm/Target/TargetInstrInfo.h"
 #include "PPC32RegisterInfo.h"
 
 namespace llvm {
-
+  
 class PPC32InstrInfo : public TargetInstrInfo {
   const PPC32RegisterInfo RI;
 public:


Index: llvm/lib/Target/PowerPC/PowerPCAsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PowerPCAsmPrinter.cpp:1.92 llvm/lib/Target/PowerPC/PowerPCAsmPrinter.cpp:1.93
--- llvm/lib/Target/PowerPC/PowerPCAsmPrinter.cpp:1.92	Mon Oct  3 02:08:36 2005
+++ llvm/lib/Target/PowerPC/PowerPCAsmPrinter.cpp	Fri Oct 14 17:44:13 2005
@@ -342,6 +342,13 @@
 ///
 void PowerPCAsmPrinter::printMachineInstruction(const MachineInstr *MI) {
   ++EmittedInsts;
+
+/// NOTE: THIS SHOULD NEVER BE CHECKED IN.  STAY LOCAL IN CHRIS'S TREE.
+  if (0 && MI->getOpcode() == PPC::OR)
+    assert((MI->getOperand(0).getReg() != MI->getOperand(1).getReg() ||
+           MI->getOperand(2).getReg() != MI->getOperand(1).getReg()) &&
+  "noop copy emitted!");
+
   // Check for slwi/srwi mnemonics.
   if (MI->getOpcode() == PPC::RLWINM) {
     bool FoundMnemonic = false;


Index: llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp
diff -u llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.15 llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.16
--- llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.15	Fri Sep 30 20:34:18 2005
+++ llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp	Fri Oct 14 17:44:13 2005
@@ -18,7 +18,6 @@
 #define DEBUG_TYPE "bsel"
 #include "PowerPC.h"
 #include "PowerPCInstrBuilder.h"
-#include "PowerPCInstrInfo.h"
 #include "PPC32InstrInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/Support/Debug.h"


Index: llvm/lib/Target/PowerPC/PowerPCInstrFormats.td
diff -u llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.51 llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.52
--- llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.51	Thu Sep 29 18:34:24 2005
+++ llvm/lib/Target/PowerPC/PowerPCInstrFormats.td	Fri Oct 14 17:44:13 2005
@@ -10,34 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-class Format<bits<5> val> {
-  bits<5> Value = val;
-}
-
-def Pseudo: Format<0>;
-def Gpr : Format<1>;
-def Gpr0 : Format<2>;
-def Simm16 : Format<3>;
-def PCRelimm24 : Format<5>;
-def Imm24 : Format<6>;
-def Imm5 : Format<7>;
-def PCRelimm14 : Format<8>;
-def Imm14 : Format<9>;
-def Imm2 : Format<10>;
-def Crf : Format<11>;
-def Imm3 : Format<12>;
-def Imm1 : Format<13>;
-def Fpr : Format<14>;
-def Imm4 : Format<15>;
-def Imm8 : Format<16>;
-def Disimm16 : Format<17>;
-def Disimm14 : Format<18>;
-def Spr : Format<19>;
-def Sgr : Format<20>;
-def Imm15 : Format<21>;
-def Vpr : Format<22>;
-def Imm6 : Format<23>;
-
 //===----------------------------------------------------------------------===//
 //
 // PowerPC instruction formats