Initial support for carrying MachineInstrs in SUnits.

[oota-llvm.git] / include / llvm / CodeGen / MachineInstrBuilder.h

diff --git a/include/llvm/CodeGen/MachineInstrBuilder.h b/include/llvm/CodeGen/MachineInstrBuilder.h
index 346c66bd048d254851fc24c66fc64e1543968432..f57168b27669d56ff5eb0c161ac51fa30168152b 100644 (file)
--- a/include/llvm/CodeGen/MachineInstrBuilder.h
+++ b/include/llvm/CodeGen/MachineInstrBuilder.h
@@ -22,7 +22,7 @@
 
 namespace llvm {
 
-class TargetInstrDescriptor;
+class TargetInstrDesc;
 
 class MachineInstrBuilder {
   MachineInstr *MI;
@@ -40,46 +40,53 @@ public:
   MachineInstrBuilder &addReg(unsigned RegNo, bool isDef = false, 
                               bool isImp = false, bool isKill = false, 
                               bool isDead = false, unsigned SubReg = 0) const {
-    MI->addRegOperand(RegNo, isDef, isImp, isKill, isDead, SubReg);
+    MI->addOperand(MachineOperand::CreateReg(RegNo, isDef, isImp, isKill,
+                                             isDead, SubReg));
     return *this;
   }
 
   /// addImm - Add a new immediate operand.
   ///
   const MachineInstrBuilder &addImm(int64_t Val) const {
-    MI->addImmOperand(Val);
+    MI->addOperand(MachineOperand::CreateImm(Val));
+    return *this;
+  }
+
+  const MachineInstrBuilder &addFPImm(const ConstantFP *Val) const {
+    MI->addOperand(MachineOperand::CreateFPImm(Val));
     return *this;
   }
 
   const MachineInstrBuilder &addMBB(MachineBasicBlock *MBB) const {
-    MI->addMachineBasicBlockOperand(MBB);
+    MI->addOperand(MachineOperand::CreateMBB(MBB));
     return *this;
   }
 
   const MachineInstrBuilder &addFrameIndex(unsigned Idx) const {
-    MI->addFrameIndexOperand(Idx);
+    MI->addOperand(MachineOperand::CreateFI(Idx));
     return *this;
   }
 
   const MachineInstrBuilder &addConstantPoolIndex(unsigned Idx,
                                                   int Offset = 0) const {
-    MI->addConstantPoolIndexOperand(Idx, Offset);
+    MI->addOperand(MachineOperand::CreateCPI(Idx, Offset));
     return *this;
   }
 
   const MachineInstrBuilder &addJumpTableIndex(unsigned Idx) const {
-    MI->addJumpTableIndexOperand(Idx);
+    MI->addOperand(MachineOperand::CreateJTI(Idx));
     return *this;
   }
 
   const MachineInstrBuilder &addGlobalAddress(GlobalValue *GV,
-                                              int Offset = 0) const {
-    MI->addGlobalAddressOperand(GV, Offset);
+                                              int64_t Offset = 0) const {
+    MI->addOperand(MachineOperand::CreateGA(GV, Offset));
     return *this;
   }
 
-  const MachineInstrBuilder &addExternalSymbol(const char *FnName) const{
-    MI->addExternalSymbolOperand(FnName);
+  const MachineInstrBuilder &addExternalSymbol(const char *FnName,
+                                               int64_t Offset = 0) const {
+    MI->addOperand(MachineOperand::CreateES(FnName, Offset));
     return *this;
   }
 };
@@ -87,16 +94,18 @@ public:
 /// BuildMI - Builder interface.  Specify how to create the initial instruction
 /// itself.
 ///
-inline MachineInstrBuilder BuildMI(const TargetInstrDescriptor &TID) {
-  return MachineInstrBuilder(new MachineInstr(TID));
+inline MachineInstrBuilder BuildMI(MachineFunction &MF,
+                                   const TargetInstrDesc &TID) {
+  return MachineInstrBuilder(MF.CreateMachineInstr(TID));
 }
 
 /// BuildMI - This version of the builder sets up the first operand as a
 /// destination virtual register.
 ///
-inline MachineInstrBuilder  BuildMI(const TargetInstrDescriptor &TID,
+inline MachineInstrBuilder  BuildMI(MachineFunction &MF,
+                                    const TargetInstrDesc &TID,
                                     unsigned DestReg) {
-  return MachineInstrBuilder(new MachineInstr(TID)).addReg(DestReg, true);
+  return MachineInstrBuilder(MF.CreateMachineInstr(TID)).addReg(DestReg, true);
 }
 
 /// BuildMI - This version of the builder inserts the newly-built
@@ -105,9 +114,9 @@ inline MachineInstrBuilder  BuildMI(const TargetInstrDescriptor &TID,
 ///
 inline MachineInstrBuilder BuildMI(MachineBasicBlock &BB,
                                    MachineBasicBlock::iterator I,
-                                   const TargetInstrDescriptor &TID,
+                                   const TargetInstrDesc &TID,
                                    unsigned DestReg) {
-  MachineInstr *MI = new MachineInstr(TID);
+  MachineInstr *MI = BB.getParent()->CreateMachineInstr(TID);
   BB.insert(I, MI);
   return MachineInstrBuilder(MI).addReg(DestReg, true);
 }
@@ -118,8 +127,8 @@ inline MachineInstrBuilder BuildMI(MachineBasicBlock &BB,
 ///
 inline MachineInstrBuilder BuildMI(MachineBasicBlock &BB,
                                    MachineBasicBlock::iterator I,
-                                   const TargetInstrDescriptor &TID) {
-  MachineInstr *MI = new MachineInstr(TID);
+                                   const TargetInstrDesc &TID) {
+  MachineInstr *MI = BB.getParent()->CreateMachineInstr(TID);
   BB.insert(I, MI);
   return MachineInstrBuilder(MI);
 }
@@ -129,7 +138,7 @@ inline MachineInstrBuilder BuildMI(MachineBasicBlock &BB,
 /// destination register.
 ///
 inline MachineInstrBuilder BuildMI(MachineBasicBlock *BB,
-                                   const TargetInstrDescriptor &TID) {
+                                   const TargetInstrDesc &TID) {
   return BuildMI(*BB, BB->end(), TID);
 }
 
@@ -138,7 +147,7 @@ inline MachineInstrBuilder BuildMI(MachineBasicBlock *BB,
 /// operand as a destination virtual register. 
 ///
 inline MachineInstrBuilder BuildMI(MachineBasicBlock *BB,
-                                   const TargetInstrDescriptor &TID,
+                                   const TargetInstrDesc &TID,
                                    unsigned DestReg) {
   return BuildMI(*BB, BB->end(), TID, DestReg);
 }