6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-09 01:38:03 +00:00
Code Issues Projects Releases Wiki Activity

Move [get|set]BasePtrStackAdjustment() from MachineFrameInfo to

Browse Source 
X86MachineFunctionInfo as this is currently only used by X86. If this ever
becomes an issue on another arch (e.g., ARM) then we can hoist it back out.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160009 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier 2012-07-10 18:27:15 +00:00
parent 542e35f62d
commit 2b02688b6e
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/llvm/CodeGen/MachineFrameInfo.h
View File

@ -215,10 +215,6 @@ class MachineFrameInfo {
/// just allocate them normally.
bool UseLocalStackAllocationBlock;
/// After the stack pointer has been restore from the base pointer we
/// use a cached adjusment. Currently only used for x86.
int64_t BPAdj;
public:
explicit MachineFrameInfo(const TargetFrameLowering &tfi) : TFI(tfi) {
StackSize = NumFixedObjects = OffsetAdjustment = MaxAlignment = 0;
@ -234,7 +230,6 @@ public:
LocalFrameSize = 0;
LocalFrameMaxAlign = 0;
UseLocalStackAllocationBlock = false;
BPAdj = 0;
}
/// hasStackObjects - Return true if there are any stack objects in this
@ -543,16 +538,6 @@ public:
void setCalleeSavedInfoValid(bool v) { CSIValid = v; }
/// setBasePtrStackAdjustment - If we're restoring the stack pointer from the
/// base pointer, due to dynamic stack realignment + VLAs, we cache the
/// number of bytes initially allocated for the stack frame. In obscure
/// cases (e.g., tail calls with byval argument and no stack protector), the
/// stack gets adjusted outside of the prolog, but these shouldn't be
/// considered when restoring from the base pointer. Currently, this is only
/// needed for x86.
void setBasePtrStackAdjustment(int64_t adj) { BPAdj = adj; }
int64_t getBasePtrStackAdjustment() const { return BPAdj; }
/// getPristineRegs - Return a set of physical registers that are pristine on
/// entry to the MBB.
///

4
lib/Target/X86/X86FrameLowering.cpp
View File

@ -925,7 +925,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const {
.addReg(StackPtr)
.setMIFlag(MachineInstr::FrameSetup);
MFI->setBasePtrStackAdjustment(NumBytes);
X86FI->setBasePtrStackAdjustment(NumBytes);
}
if (( (!HasFP && NumBytes) || PushedRegs) && needsFrameMoves) {
@ -1051,7 +1051,7 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
StackPtr).addReg(BasePtr);
// When restoring from the BP we must use a cached SP adjustment.
NumBytes = MFI->getBasePtrStackAdjustment();
NumBytes = X86FI->getBasePtrStackAdjustment();
}
// If dynamic alloca is used, then reset esp to point to the last callee-saved

19
lib/Target/X86/X86MachineFunctionInfo.h
View File

@ -69,6 +69,10 @@ class X86MachineFunctionInfo : public MachineFunctionInfo {
/// NumLocalDynamics - Number of local-dynamic TLS accesses.
unsigned NumLocalDynamics;
/// After the stack pointer has been restore from the base pointer we
/// use a cached adjusment.
int64_t BPAdj;
public:
X86MachineFunctionInfo() : ForceFramePointer(false),
CalleeSavedFrameSize(0),
@ -97,8 +101,9 @@ public:
VarArgsGPOffset(0),
VarArgsFPOffset(0),
ArgumentStackSize(0),
NumLocalDynamics(0) {}
NumLocalDynamics(0),
BPAdj(0) {}
bool getForceFramePointer() const { return ForceFramePointer;}
void setForceFramePointer(bool forceFP) { ForceFramePointer = forceFP; }
@ -137,6 +142,16 @@ public:
unsigned getNumLocalDynamicTLSAccesses() const { return NumLocalDynamics; }
void incNumLocalDynamicTLSAccesses() { ++NumLocalDynamics; }
/// setBasePtrStackAdjustment - If we're restoring the stack pointer from the
/// base pointer, due to dynamic stack realignment + VLAs, we cache the
/// number of bytes initially allocated for the stack frame. In obscure
/// cases (e.g., tail calls with byval argument and no stack protector), the
/// stack gets adjusted outside of the prolog, but these shouldn't be
/// considered when restoring from the base pointer. Currently, this is only
/// needed for x86.
void setBasePtrStackAdjustment(int64_t adj) { BPAdj = adj; }
int64_t getBasePtrStackAdjustment() const { return BPAdj; }
};
} // End llvm namespace