6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-06 06:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Revert r140924 "Attempt to fix dynamic stack realignment for thumb1 functions."

Browse Source 
to appease nightly testers.  Not quite there yet.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140953 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier 2011-10-01 19:30:36 +00:00
parent cbf26e3b57
commit 2bfaf521ae
3 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Target/ARM/ARMBaseRegisterInfo.cpp
View File

@ -626,10 +626,13 @@ bool ARMBaseRegisterInfo::hasBasePointer(const MachineFunction &MF) const {
bool ARMBaseRegisterInfo::canRealignStack(const MachineFunction &MF) const { bool ARMBaseRegisterInfo::canRealignStack(const MachineFunction &MF) const {
const MachineFrameInfo *MFI = MF.getFrameInfo(); const MachineFrameInfo *MFI = MF.getFrameInfo();
const ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();
// We can't realign the stack if: // We can't realign the stack if:
// 1. Dynamic stack realignment is explicitly disabled, // 1. Dynamic stack realignment is explicitly disabled,
// 2. There are VLAs in the function and the base pointer is disabled. // 2. This is a Thumb1 function (it's not useful, so we don't bother), or
return (RealignStack && (!MFI->hasVarSizedObjects() || EnableBasePointer)); // 3. There are VLAs in the function and the base pointer is disabled.
return (RealignStack && !AFI->isThumb1OnlyFunction() &&
(!MFI->hasVarSizedObjects() || EnableBasePointer));
} }
bool ARMBaseRegisterInfo:: bool ARMBaseRegisterInfo::

6
lib/Target/ARM/ARMFrameLowering.cpp
View File

@ -881,12 +881,10 @@ ARMFrameLowering::processFunctionBeforeCalleeSavedScan(MachineFunction &MF,
// for sure what the stack size will be, but for this, an estimate is good // for sure what the stack size will be, but for this, an estimate is good
// enough. If there anything changes it, it'll be a spill, which implies // enough. If there anything changes it, it'll be a spill, which implies
// we've used all the registers and so R4 is already used, so not marking // we've used all the registers and so R4 is already used, so not marking
// it here will be OK. Also spill R4 if Thumb1 function requires stack // it here will be OK.
// realignment.
// FIXME: It will be better just to find spare register here. // FIXME: It will be better just to find spare register here.
unsigned StackSize = estimateStackSize(MF); unsigned StackSize = estimateStackSize(MF);
if (MFI->hasVarSizedObjects() || RegInfo->needsStackRealignment(MF) || if (MFI->hasVarSizedObjects() || StackSize > 508)
StackSize > 508)
MF.getRegInfo().setPhysRegUsed(ARM::R4); MF.getRegInfo().setPhysRegUsed(ARM::R4);
} }

21
lib/Target/ARM/Thumb1FrameLowering.cpp
View File

@ -155,27 +155,6 @@ void Thumb1FrameLowering::emitPrologue(MachineFunction &MF) const {
AFI->setGPRCalleeSavedArea2Size(GPRCS2Size); AFI->setGPRCalleeSavedArea2Size(GPRCS2Size);
AFI->setDPRCalleeSavedAreaSize(DPRCSSize); AFI->setDPRCalleeSavedAreaSize(DPRCSSize);
if (RegInfo->needsStackRealignment(MF)) {
// We cannot use sp as source/dest register here, thus we're emitting the
// following sequence:
// mov r4, sp
// lsrs r4, r4, Log2MaxAlign
// lsls r4, r4, Log2MaxAlign
// mov sp, r4
unsigned MaxAlign = MFI->getMaxAlignment();
unsigned Log2MaxAlign = Log2_32(MaxAlign);
AddDefaultPred(BuildMI(MBB, MBBI, dl, TII.get(ARM::tMOVr), ARM::R4)
.addReg(ARM::SP, RegState::Kill));
AddDefaultPred(AddDefaultT1CC(BuildMI(MBB, MBBI, dl, TII.get(ARM::tLSRri), ARM::R4))
.addReg(ARM::R4, RegState::Kill)
.addImm(Log2MaxAlign));
AddDefaultPred(AddDefaultT1CC(BuildMI(MBB, MBBI, dl, TII.get(ARM::tLSLri), ARM::R4))
.addReg(ARM::R4, RegState::Kill)
.addImm(Log2MaxAlign));
AddDefaultPred(BuildMI(MBB, MBBI, dl, TII.get(ARM::tMOVr), ARM::SP)
.addReg(ARM::R4, RegState::Kill));
}
// If we need a base pointer, set it up here. It's whatever the value // If we need a base pointer, set it up here. It's whatever the value
// of the stack pointer is at this point. Any variable size objects // of the stack pointer is at this point. Any variable size objects
// will be allocated after this, so we can still use the base pointer // will be allocated after this, so we can still use the base pointer