[llvm-commits] CVS: llvm/lib/Target/ARM/ARMRegisterInfo.cpp

[Lauro Ramos Venancio]

Changes in directory llvm/lib/Target/ARM:

ARMRegisterInfo.cpp updated: 1.86 -> 1.87
---
Log message:

Fix a bug in getFrameRegister.
Reported by Raul Herbster.


---
Diffs of the changes:  (+4 -1)

 ARMRegisterInfo.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/ARM/ARMRegisterInfo.cpp
diff -u llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.86 llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.87
--- llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.86	Mon Apr 16 13:10:22 2007
+++ llvm/lib/Target/ARM/ARMRegisterInfo.cpp	Thu Apr 19 09:09:38 2007
@@ -1474,7 +1474,10 @@
 }
 
 unsigned ARMRegisterInfo::getFrameRegister(MachineFunction &MF) const {
-  return STI.useThumbBacktraces() ? ARM::R7 : ARM::R11;
+  if (STI.isTargetDarwin() || hasFP(MF))
+    return STI.useThumbBacktraces() ? ARM::R7 : ARM::R11;
+  else
+    return ARM::SP;
 }
 
 unsigned ARMRegisterInfo::getEHExceptionRegister() const {