std::unique_ptrify the MCStreamer argument to createAsmPrinter

[oota-llvm.git] / lib / Target / PowerPC / PPCInstrBuilder.h

diff --git a/lib/Target/PowerPC/PPCInstrBuilder.h b/lib/Target/PowerPC/PPCInstrBuilder.h
index 704e17c49b0f6cfe140d8953c704754a902b61ea..cf71b1c5986958b46c5a1bbfa8fcf2a0123aac9f 100644 (file)
--- a/lib/Target/PowerPC/PPCInstrBuilder.h
+++ b/lib/Target/PowerPC/PPCInstrBuilder.h
@@ -1,10 +1,10 @@
-//===-- PowerPCInstrBuilder.h - Functions to aid building PPC insts -*- C++ -*-===//
-// 
+//===-- PPCInstrBuilder.h - Aides for building PPC insts --------*- C++ -*-===//
+//
 //                     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.
-// 
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
 //===----------------------------------------------------------------------===//
 //
 // This file exposes functions that may be used with BuildMI from the
@@ -12,12 +12,13 @@
 // references.
 //
 // For reference, the order of operands for memory references is:
-// (Operand), Dest Reg, Base Reg, and either Reg Index or Immediate Displacement.
+// (Operand), Dest Reg, Base Reg, and either Reg Index or Immediate
+// Displacement.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef PPCINSTRBUILDER_H
-#define PPCINSTRBUILDER_H
+#ifndef LLVM_LIB_TARGET_POWERPC_PPCINSTRBUILDER_H
+#define LLVM_LIB_TARGET_POWERPC_PPCINSTRBUILDER_H
 
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 
@@ -28,24 +29,13 @@ namespace llvm {
 /// reference has base register as the FrameIndex offset until it is resolved.
 /// This allows a constant offset to be specified as well...
 ///
-inline const MachineInstrBuilder &
-addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0, bool mem = true) {
-       if (mem)
-               return MIB.addSImm(Offset).addFrameIndex(FI);
-       else
-               return MIB.addFrameIndex(FI).addSImm(Offset);
-}
-
-/// addConstantPoolReference - This function is used to add a reference to the
-/// base of a constant value spilled to the per-function constant pool.  The
-/// reference has base register ConstantPoolIndex offset which is retained until
-/// either machine code emission or assembly output.  This allows an optional
-/// offset to be added as well.
-///
-inline const MachineInstrBuilder &
-addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI,
-                         int Offset = 0) {
-  return MIB.addSImm(Offset).addConstantPoolIndex(CPI);
+static inline const MachineInstrBuilder&
+addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0,
+                  bool mem = true) {
+  if (mem)
+    return MIB.addImm(Offset).addFrameIndex(FI);
+  else
+    return MIB.addFrameIndex(FI).addImm(Offset);
 }
 
 } // End llvm namespace