diff options
author | Bill Wendling <isanbard@gmail.com> | 2011-10-10 07:24:23 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2011-10-10 07:24:23 +0000 |
commit | ea662bb32fe5895ad6fe8a90e324edb194d707cd (patch) | |
tree | 3c1081ac59e64fe1505adb93ab4b7747ca5fe71e /llvm/lib | |
parent | d6da876bacd513b2d14441c48955323fdb63c8a5 (diff) | |
download | bcm5719-llvm-ea662bb32fe5895ad6fe8a90e324edb194d707cd.tar.gz bcm5719-llvm-ea662bb32fe5895ad6fe8a90e324edb194d707cd.zip |
When getting the number of bits necessary for addressing mode
ARMII::AddrModeT1_s, we need to take into account that if the frame register is
ARM::SP, then the number of bits is 8. If it's not ARM::SP, then the number of
bits is 5.
llvm-svn: 141529
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp index 7c42342229a..0c8480d9ef2 100644 --- a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp +++ b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp @@ -1109,11 +1109,20 @@ bool ARMBaseRegisterInfo::isFrameOffsetLegal(const MachineInstr *MI, case ARMII::AddrMode3: NumBits = 8; break; - case ARMII::AddrModeT1_s: - NumBits = 5; + case ARMII::AddrModeT1_s: { + const MachineBasicBlock &MBB = *MI->getParent(); + const MachineFunction &MF = *MBB.getParent(); + unsigned FrameReg = ARM::SP; + if (MF.getFrameInfo()->hasVarSizedObjects()) + // There are alloca()'s in this function, must reference off the frame + // pointer or base pointer instead. + FrameReg = (!hasBasePointer(MF) ?BasePtr : getFrameRegister(MF)); + + NumBits = (FrameReg == ARM::SP) ? 8 : 5; Scale = 4; isSigned = false; break; + } default: llvm_unreachable("Unsupported addressing mode!"); break; |