Revert 89562. We're being sneakier than I was giving us credit for, and this

isn't necessary.

llvm-svn: 89568
This commit is contained in:
Jim Grosbach 2009-11-21 23:34:09 +00:00
parent 99a88f415b
commit 99c5b49c61
6 changed files with 3 additions and 10 deletions

View File

@ -222,7 +222,6 @@ BitVector ARMBaseRegisterInfo::getReservedRegs(const MachineFunction &MF) const
BitVector Reserved(getNumRegs());
Reserved.set(ARM::SP);
Reserved.set(ARM::PC);
// FP is reserved on Darwin even if we're not using it in this function.
if (STI.isTargetDarwin() || hasFP(MF))
Reserved.set(FramePtr);
// Some targets reserve R9.
@ -240,7 +239,6 @@ bool ARMBaseRegisterInfo::isReservedReg(const MachineFunction &MF,
return true;
case ARM::R7:
case ARM::R11:
// FP is reserved on Darwin even if we're not using it in this function.
if (FramePtr == Reg && (STI.isTargetDarwin() || hasFP(MF)))
return true;
break;
@ -494,8 +492,7 @@ static unsigned calculateMaxStackAlignment(const MachineFrameInfo *FFI) {
///
bool ARMBaseRegisterInfo::hasFP(const MachineFunction &MF) const {
const MachineFrameInfo *MFI = MF.getFrameInfo();
return ((STI.isTargetDarwin() && MFI->hasCalls()) ||
NoFramePointerElim ||
return (NoFramePointerElim ||
needsStackRealignment(MF) ||
MFI->hasVarSizedObjects() ||
MFI->isFrameAddressTaken());

View File

@ -2,7 +2,7 @@
; RUN: llc < %s -mtriple=arm-linux-gnueabi | grep mov | count 1
; RUN: llc < %s -mtriple=arm-linux-gnu --disable-fp-elim | \
; RUN: grep mov | count 3
; RUN: llc < %s -mtriple=arm-apple-darwin | grep mov | count 3
; RUN: llc < %s -mtriple=arm-apple-darwin | grep mov | count 2
@str = internal constant [12 x i8] c"Hello World\00"

View File

@ -1,7 +1,5 @@
; RUN: llc < %s -mtriple=armv7-apple-darwin | FileCheck %s
; XFAIL: *
@x = external global i32* ; <i32**> [#uses=1]
define void @foo(i32 %a) {

View File

@ -1,6 +1,6 @@
; RUN: llc < %s -march=arm -mattr=+v6
; RUN: llc < %s -mtriple=arm-apple-darwin -mattr=+v6 |\
; RUN: grep mov | count 4
; RUN: grep mov | count 3
define i32 @test(i32 %x) {
%tmp = trunc i32 %x to i16 ; <i16> [#uses=1]

View File

@ -1,5 +1,4 @@
; RUN: llc < %s -mtriple=thumbv7-apple-darwin | FileCheck %s
; XFAIL: *
define i32 @t1(i32 %a, i32 %b, i32 %c, i32 %d) {
; CHECK: t1:

View File

@ -1,5 +1,4 @@
; RUN: llc < %s -mtriple=thumbv7-apple-darwin | FileCheck %s
; XFAIL: *
define void @foo(i32 %X, i32 %Y) {
entry: