diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-10-11 21:40:47 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-10-11 21:40:47 +0000 |
| commit | e575499d830008784b11499dae290ad0480c8f9d (patch) | |
| tree | d8fb1a39b3475ec09b78800df78c89449491b673 | |
| parent | 395d76c5a3614b2d5f180182f4c897d76ece05ec (diff) | |
| download | external_llvm-e575499d830008784b11499dae290ad0480c8f9d.zip external_llvm-e575499d830008784b11499dae290ad0480c8f9d.tar.gz external_llvm-e575499d830008784b11499dae290ad0480c8f9d.tar.bz2 | |
Revert r141529. This is causing failures in the test-suite, like bigstack and ReedSolomon. Boo...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141716 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/ARMBaseRegisterInfo.cpp | 13 | ||||
| -rw-r--r-- | test/CodeGen/Thumb/vargs.ll | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/lib/Target/ARM/ARMBaseRegisterInfo.cpp index 0c8480d..7c42342 100644 --- a/lib/Target/ARM/ARMBaseRegisterInfo.cpp +++ b/lib/Target/ARM/ARMBaseRegisterInfo.cpp @@ -1109,20 +1109,11 @@ bool ARMBaseRegisterInfo::isFrameOffsetLegal(const MachineInstr *MI, case ARMII::AddrMode3: NumBits = 8; break; - 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; + case ARMII::AddrModeT1_s: + NumBits = 5; Scale = 4; isSigned = false; break; - } default: llvm_unreachable("Unsupported addressing mode!"); break; diff --git a/test/CodeGen/Thumb/vargs.ll b/test/CodeGen/Thumb/vargs.ll index 16a9c44..c2ba208 100644 --- a/test/CodeGen/Thumb/vargs.ll +++ b/test/CodeGen/Thumb/vargs.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s -march=thumb -; RUN: llc < %s -mtriple=thumb-linux | grep pop | count 1 +; RUN: llc < %s -mtriple=thumb-linux | grep pop | count 2 ; RUN: llc < %s -mtriple=thumb-darwin | grep pop | count 2 @str = internal constant [4 x i8] c"%d\0A\00" ; <[4 x i8]*> [#uses=1] |