[llvm-commits] [llvm] r141529 - in /llvm/trunk: lib/Target/ARM/ARMBaseRegisterInfo.cpp test/CodeGen/Thumb/vargs.ll

[Bill Wendling]

Author: void
Date: Mon Oct 10 02:24:23 2011
New Revision: 141529

URL: http://llvm.org/viewvc/llvm-project?rev=141529&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp
    llvm/trunk/test/CodeGen/Thumb/vargs.ll

Modified: llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp?rev=141529&r1=141528&r2=141529&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMBaseRegisterInfo.cpp Mon Oct 10 02:24:23 2011
@@ -1109,11 +1109,20 @@
   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;

Modified: llvm/trunk/test/CodeGen/Thumb/vargs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb/vargs.ll?rev=141529&r1=141528&r2=141529&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb/vargs.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb/vargs.ll Mon Oct 10 02:24:23 2011
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=thumb
-; RUN: llc < %s -mtriple=thumb-linux | grep pop | count 2
+; RUN: llc < %s -mtriple=thumb-linux | grep pop | count 1
 ; 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]