diff options
Diffstat (limited to 'lib/CodeGen/MachineFunction.cpp')
| -rw-r--r-- | lib/CodeGen/MachineFunction.cpp | 57 | 
1 files changed, 40 insertions, 17 deletions
diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp index 04321f329282..0703df09a60e 100644 --- a/lib/CodeGen/MachineFunction.cpp +++ b/lib/CodeGen/MachineFunction.cpp @@ -17,6 +17,7 @@  #include "llvm/ADT/STLExtras.h"  #include "llvm/ADT/SmallString.h"  #include "llvm/Analysis/ConstantFolding.h" +#include "llvm/Assembly/Writer.h"  #include "llvm/CodeGen/MachineConstantPool.h"  #include "llvm/CodeGen/MachineFrameInfo.h"  #include "llvm/CodeGen/MachineFunctionPass.h" @@ -54,23 +55,28 @@ MachineFunction::MachineFunction(const Function *F, const TargetMachine &TM,                                   GCModuleInfo* gmi)    : Fn(F), Target(TM), Ctx(mmi.getContext()), MMI(mmi), GMI(gmi) {    if (TM.getRegisterInfo()) -    RegInfo = new (Allocator) MachineRegisterInfo(*TM.getRegisterInfo()); +    RegInfo = new (Allocator) MachineRegisterInfo(TM);    else      RegInfo = 0; +    MFInfo = 0; -  FrameInfo = new (Allocator) MachineFrameInfo(*TM.getFrameLowering(), -                                               TM.Options.RealignStack); +  FrameInfo = +    new (Allocator) MachineFrameInfo(TM,!F->hasFnAttribute("no-realign-stack")); +    if (Fn->getAttributes().hasAttribute(AttributeSet::FunctionIndex,                                         Attribute::StackAlignment))      FrameInfo->ensureMaxAlignment(Fn->getAttributes().                                  getStackAlignment(AttributeSet::FunctionIndex)); -  ConstantPool = new (Allocator) MachineConstantPool(TM.getDataLayout()); + +  ConstantPool = new (Allocator) MachineConstantPool(TM);    Alignment = TM.getTargetLowering()->getMinFunctionAlignment(); +    // FIXME: Shouldn't use pref alignment if explicit alignment is set on Fn.    if (!Fn->getAttributes().hasAttribute(AttributeSet::FunctionIndex,                                          Attribute::OptimizeForSize))      Alignment = std::max(Alignment,                           TM.getTargetLowering()->getPrefFunctionAlignment()); +    FunctionNumber = FunctionNum;    JumpTableInfo = 0;  } @@ -456,11 +462,15 @@ MCSymbol *MachineFunction::getPICBaseSymbol() const {  //  MachineFrameInfo implementation  //===----------------------------------------------------------------------===// +const TargetFrameLowering *MachineFrameInfo::getFrameLowering() const { +  return TM.getFrameLowering(); +} +  /// ensureMaxAlignment - Make sure the function is at least Align bytes  /// aligned.  void MachineFrameInfo::ensureMaxAlignment(unsigned Align) { -  if (!TFI.isStackRealignable() || !RealignOption) -    assert(Align <= TFI.getStackAlignment() && +  if (!getFrameLowering()->isStackRealignable() || !RealignOption) +    assert(Align <= getFrameLowering()->getStackAlignment() &&             "For targets without stack realignment, Align is out of limit!");    if (MaxAlignment < Align) MaxAlignment = Align;  } @@ -482,8 +492,10 @@ static inline unsigned clampStackAlignment(bool ShouldClamp, unsigned Align,  int MachineFrameInfo::CreateStackObject(uint64_t Size, unsigned Alignment,                        bool isSS, bool MayNeedSP, const AllocaInst *Alloca) {    assert(Size != 0 && "Cannot allocate zero size stack objects!"); -  Alignment = clampStackAlignment(!TFI.isStackRealignable() || !RealignOption, -                                  Alignment, TFI.getStackAlignment()); +  Alignment = +    clampStackAlignment(!getFrameLowering()->isStackRealignable() || +                          !RealignOption, +                        Alignment, getFrameLowering()->getStackAlignment());    Objects.push_back(StackObject(Size, Alignment, 0, false, isSS, MayNeedSP,                                  Alloca));    int Index = (int)Objects.size() - NumFixedObjects - 1; @@ -498,8 +510,10 @@ int MachineFrameInfo::CreateStackObject(uint64_t Size, unsigned Alignment,  ///  int MachineFrameInfo::CreateSpillStackObject(uint64_t Size,                                               unsigned Alignment) { -  Alignment = clampStackAlignment(!TFI.isStackRealignable() || !RealignOption, -                                  Alignment, TFI.getStackAlignment());  +  Alignment = +    clampStackAlignment(!getFrameLowering()->isStackRealignable() || +                          !RealignOption, +                        Alignment, getFrameLowering()->getStackAlignment());     CreateStackObject(Size, Alignment, true, false);    int Index = (int)Objects.size() - NumFixedObjects - 1;    ensureMaxAlignment(Alignment); @@ -513,8 +527,10 @@ int MachineFrameInfo::CreateSpillStackObject(uint64_t Size,  ///  int MachineFrameInfo::CreateVariableSizedObject(unsigned Alignment) {    HasVarSizedObjects = true; -  Alignment = clampStackAlignment(!TFI.isStackRealignable() || !RealignOption, -                                  Alignment, TFI.getStackAlignment());  +  Alignment = +    clampStackAlignment(!getFrameLowering()->isStackRealignable() || +                          !RealignOption, +                        Alignment, getFrameLowering()->getStackAlignment());     Objects.push_back(StackObject(0, Alignment, 0, false, false, true, 0));    ensureMaxAlignment(Alignment);    return (int)Objects.size()-NumFixedObjects-1; @@ -532,10 +548,12 @@ int MachineFrameInfo::CreateFixedObject(uint64_t Size, int64_t SPOffset,    // the incoming frame position.  If the frame object is at offset 32 and    // the stack is guaranteed to be 16-byte aligned, then we know that the    // object is 16-byte aligned. -  unsigned StackAlign = TFI.getStackAlignment(); +  unsigned StackAlign = getFrameLowering()->getStackAlignment();    unsigned Align = MinAlign(SPOffset, StackAlign); -  Align = clampStackAlignment(!TFI.isStackRealignable() || !RealignOption, -                              Align, TFI.getStackAlignment());  +  Align = +    clampStackAlignment(!getFrameLowering()->isStackRealignable() || +                          !RealignOption, +                        Align, getFrameLowering()->getStackAlignment());     Objects.insert(Objects.begin(), StackObject(Size, Align, SPOffset, Immutable,                                                /*isSS*/   false,                                                /*NeedSP*/ false, @@ -769,6 +787,10 @@ void MachineJumpTableInfo::dump() const { print(dbgs()); }  void MachineConstantPoolValue::anchor() { } +const DataLayout *MachineConstantPool::getDataLayout() const { +  return TM.getDataLayout(); +} +  Type *MachineConstantPoolEntry::getType() const {    if (isMachineConstantPoolEntry())      return Val.MachineCPVal->getType(); @@ -850,7 +872,8 @@ unsigned MachineConstantPool::getConstantPoolIndex(const Constant *C,    // FIXME, this could be made much more efficient for large constant pools.    for (unsigned i = 0, e = Constants.size(); i != e; ++i)      if (!Constants[i].isMachineConstantPoolEntry() && -        CanShareConstantPoolEntry(Constants[i].Val.ConstVal, C, TD)) { +        CanShareConstantPoolEntry(Constants[i].Val.ConstVal, C, +                                  getDataLayout())) {        if ((unsigned)Constants[i].getAlignment() < Alignment)          Constants[i].Alignment = Alignment;        return i; @@ -887,7 +910,7 @@ void MachineConstantPool::print(raw_ostream &OS) const {      if (Constants[i].isMachineConstantPoolEntry())        Constants[i].Val.MachineCPVal->print(OS);      else -      OS << *(const Value*)Constants[i].Val.ConstVal; +      WriteAsOperand(OS, Constants[i].Val.ConstVal, /*PrintType=*/false);      OS << ", align=" << Constants[i].getAlignment();      OS << "\n";    }  | 
