Convert feature of the simple isel over for the pattern isel to use.

[oota-llvm.git] / lib / Target / Sparc / DelaySlotFiller.cpp

diff --git a/lib/Target/Sparc/DelaySlotFiller.cpp b/lib/Target/Sparc/DelaySlotFiller.cpp
index af9b25c6d09189d2c43c2314f21c10b8901905da..71dc022b9fd71e4971ecbe9c5427ca373f4c77d8 100644 (file)
--- a/lib/Target/Sparc/DelaySlotFiller.cpp
+++ b/lib/Target/Sparc/DelaySlotFiller.cpp
@@ -1,20 +1,22 @@
 //===-- DelaySlotFiller.cpp - SparcV8 delay slot filler -------------------===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
 // This file was developed by the LLVM research group and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
 //
-// Simple local delay slot filler for SparcV8 machine code
+// This is a simple local pass that fills delay slots with NOPs.
 //
 //===----------------------------------------------------------------------===//
 
 #include "SparcV8.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "Support/Statistic.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetInstrInfo.h"
+#include "llvm/ADT/Statistic.h"
 
 using namespace llvm;
 
@@ -26,8 +28,9 @@ namespace {
     /// layout, etc.
     ///
     TargetMachine &TM;
+    const TargetInstrInfo *TII;
 
-    Filler (TargetMachine &tm) : TM (tm) { }
+    Filler (TargetMachine &tm) : TM (tm), TII (tm.getInstrInfo ()) { }
 
     virtual const char *getPassName () const {
       return "SparcV8 Delay Slot Filler";
@@ -52,27 +55,6 @@ FunctionPass *llvm::createSparcV8DelaySlotFillerPass (TargetMachine &tm) {
   return new Filler (tm);
 }
 
-static bool hasDelaySlot (unsigned Opcode) {
-  switch (Opcode) {
-    case V8::BA:
-    case V8::BCC:
-    case V8::BCS:
-    case V8::BE:
-    case V8::BG:
-    case V8::BGE:
-    case V8::BGU:
-    case V8::BL:
-    case V8::BLE:
-    case V8::BLEU:
-    case V8::BNE:
-    case V8::CALL:
-    case V8::RETL:
-      return true;
-    default:
-      return false;
-  }
-}
-
 /// runOnMachineBasicBlock - Fill in delay slots for the given basic block.
 /// Currently, we fill delay slots with NOPs. We assume there is only one
 /// delay slot per delayed instruction.
@@ -80,7 +62,7 @@ static bool hasDelaySlot (unsigned Opcode) {
 bool Filler::runOnMachineBasicBlock (MachineBasicBlock &MBB) {
   bool Changed = false;
   for (MachineBasicBlock::iterator I = MBB.begin (); I != MBB.end (); ++I)
-    if (hasDelaySlot (I->getOpcode ())) {
+    if (TII->hasDelaySlot (I->getOpcode ())) {
       MachineBasicBlock::iterator J = I;
       ++J;
       BuildMI (MBB, J, V8::NOP, 0);