mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-17 21:29:20 +00:00
Include temp. values when computing max. size of stack frame!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2070 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
1792779edf
commit
fa79e6e869
@ -29,6 +29,7 @@ class MachineCodeForMethod : private Annotation {
|
|||||||
unsigned currentOptionalArgsSize;
|
unsigned currentOptionalArgsSize;
|
||||||
unsigned maxOptionalArgsSize;
|
unsigned maxOptionalArgsSize;
|
||||||
unsigned currentTmpValuesSize;
|
unsigned currentTmpValuesSize;
|
||||||
|
unsigned maxTmpValuesSize;
|
||||||
std::hash_set<const Constant*> constantsForConstPool;
|
std::hash_set<const Constant*> constantsForConstPool;
|
||||||
std::hash_map<const Value*, int> offsets;
|
std::hash_map<const Value*, int> offsets;
|
||||||
|
|
||||||
@ -108,6 +109,17 @@ private:
|
|||||||
regSpillsSize+= incr;
|
regSpillsSize+= incr;
|
||||||
staticStackSize += incr;
|
staticStackSize += incr;
|
||||||
}
|
}
|
||||||
|
inline void incrementTmpAreaSize(int incr) {
|
||||||
|
currentTmpValuesSize += incr;
|
||||||
|
if (maxTmpValuesSize < currentTmpValuesSize)
|
||||||
|
{
|
||||||
|
staticStackSize += currentTmpValuesSize - maxTmpValuesSize;
|
||||||
|
maxTmpValuesSize = currentTmpValuesSize;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
inline void resetTmpAreaSize() {
|
||||||
|
currentTmpValuesSize = 0;
|
||||||
|
}
|
||||||
inline void incrementCurrentOptionalArgsSize(int incr) {
|
inline void incrementCurrentOptionalArgsSize(int incr) {
|
||||||
currentOptionalArgsSize+= incr; // stack size already includes this!
|
currentOptionalArgsSize+= incr; // stack size already includes this!
|
||||||
}
|
}
|
||||||
|
@ -29,6 +29,7 @@ class MachineCodeForMethod : private Annotation {
|
|||||||
unsigned currentOptionalArgsSize;
|
unsigned currentOptionalArgsSize;
|
||||||
unsigned maxOptionalArgsSize;
|
unsigned maxOptionalArgsSize;
|
||||||
unsigned currentTmpValuesSize;
|
unsigned currentTmpValuesSize;
|
||||||
|
unsigned maxTmpValuesSize;
|
||||||
std::hash_set<const Constant*> constantsForConstPool;
|
std::hash_set<const Constant*> constantsForConstPool;
|
||||||
std::hash_map<const Value*, int> offsets;
|
std::hash_map<const Value*, int> offsets;
|
||||||
|
|
||||||
@ -108,6 +109,17 @@ private:
|
|||||||
regSpillsSize+= incr;
|
regSpillsSize+= incr;
|
||||||
staticStackSize += incr;
|
staticStackSize += incr;
|
||||||
}
|
}
|
||||||
|
inline void incrementTmpAreaSize(int incr) {
|
||||||
|
currentTmpValuesSize += incr;
|
||||||
|
if (maxTmpValuesSize < currentTmpValuesSize)
|
||||||
|
{
|
||||||
|
staticStackSize += currentTmpValuesSize - maxTmpValuesSize;
|
||||||
|
maxTmpValuesSize = currentTmpValuesSize;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
inline void resetTmpAreaSize() {
|
||||||
|
currentTmpValuesSize = 0;
|
||||||
|
}
|
||||||
inline void incrementCurrentOptionalArgsSize(int incr) {
|
inline void incrementCurrentOptionalArgsSize(int incr) {
|
||||||
currentOptionalArgsSize+= incr; // stack size already includes this!
|
currentOptionalArgsSize+= incr; // stack size already includes this!
|
||||||
}
|
}
|
||||||
|
@ -124,7 +124,7 @@ MachineCodeForMethod::MachineCodeForMethod(const Method* _M,
|
|||||||
method(_M), compiledAsLeaf(false), staticStackSize(0),
|
method(_M), compiledAsLeaf(false), staticStackSize(0),
|
||||||
automaticVarsSize(0), regSpillsSize(0),
|
automaticVarsSize(0), regSpillsSize(0),
|
||||||
currentOptionalArgsSize(0), maxOptionalArgsSize(0),
|
currentOptionalArgsSize(0), maxOptionalArgsSize(0),
|
||||||
currentTmpValuesSize(0)
|
currentTmpValuesSize(0), maxTmpValuesSize(0)
|
||||||
{
|
{
|
||||||
maxOptionalArgsSize = ComputeMaxOptionalArgsSize(target, method);
|
maxOptionalArgsSize = ComputeMaxOptionalArgsSize(target, method);
|
||||||
staticStackSize = maxOptionalArgsSize
|
staticStackSize = maxOptionalArgsSize
|
||||||
@ -284,14 +284,14 @@ MachineCodeForMethod::pushTempValue(const TargetMachine& target,
|
|||||||
|
|
||||||
offset = growUp ? firstTmpOffset + offset : firstTmpOffset - offset;
|
offset = growUp ? firstTmpOffset + offset : firstTmpOffset - offset;
|
||||||
|
|
||||||
currentTmpValuesSize += size;
|
incrementTmpAreaSize(size);
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
MachineCodeForMethod::popAllTempValues(const TargetMachine& target)
|
MachineCodeForMethod::popAllTempValues(const TargetMachine& target)
|
||||||
{
|
{
|
||||||
currentTmpValuesSize = 0;
|
resetTmpAreaSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
Loading…
Reference in New Issue
Block a user