[llvm-commits] CVS: llvm/lib/CodeGen/MachineFunction.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

MachineFunction.cpp updated: 1.70 -> 1.71
---
Log message:

Move this code to lib/Target/SparcV9/MachineFunctionInfo.cpp


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

Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.70 llvm/lib/CodeGen/MachineFunction.cpp:1.71
--- llvm/lib/CodeGen/MachineFunction.cpp:1.70	Mon Aug 16 16:54:59 2004
+++ llvm/lib/CodeGen/MachineFunction.cpp	Mon Aug 16 17:36:34 2004
@@ -23,8 +23,6 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
-#include "llvm/Type.h"
-#include "../Target/SparcV9/MachineFunctionInfo.h"  // FIXME
 #include "Support/LeakDetector.h"
 #include "Support/GraphWriter.h"
 #include <fstream>
@@ -112,7 +110,7 @@
                                  const TargetMachine &TM)
   : Annotation(MF_AID), Fn(F), Target(TM) {
   SSARegMapping = new SSARegMap();
-  MFInfo = new MachineFunctionInfo(*this);
+  MFInfo = 0;
   FrameInfo = new MachineFrameInfo();
   ConstantPool = new MachineConstantPool();
   BasicBlocks.Parent = this;
@@ -307,158 +305,3 @@
 
 void MachineConstantPool::dump() const { print(std::cerr); }
 
-//===----------------------------------------------------------------------===//
-//  MachineFunctionInfo implementation
-//  NOTE: MachineFunctionInfo and its methods are specific to the SparcV9
-//  target - don't use them in other targets.
-//===----------------------------------------------------------------------===//
-
-static unsigned
-ComputeMaxOptionalArgsSize(const TargetMachine& target, const Function *F,
-                           unsigned &maxOptionalNumArgs)
-{
-  unsigned maxSize = 0;
-  
-  for (Function::const_iterator BB = F->begin(), BBE = F->end(); BB !=BBE; ++BB)
-    for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I != E; ++I)
-      if (const CallInst *callInst = dyn_cast<CallInst>(I))
-        {
-          unsigned numOperands = callInst->getNumOperands() - 1;
-          int numExtra = numOperands-6;
-          if (numExtra <= 0)
-            continue;
-          
-          unsigned sizeForThisCall = numExtra * 8;
-          
-          if (maxSize < sizeForThisCall)
-            maxSize = sizeForThisCall;
-          
-          if ((int)maxOptionalNumArgs < numExtra)
-            maxOptionalNumArgs = (unsigned) numExtra;
-        }
-  
-  return maxSize;
-}
-
-// Align data larger than one L1 cache line on L1 cache line boundaries.
-// Align all smaller data on the next higher 2^x boundary (4, 8, ...),
-// but not higher than the alignment of the largest type we support
-// (currently a double word). -- see class TargetData).
-//
-// This function is similar to the corresponding function in EmitAssembly.cpp
-// but they are unrelated.  This one does not align at more than a
-// double-word boundary whereas that one might.
-// 
-inline unsigned
-SizeToAlignment(unsigned size, const TargetMachine& target)
-{
-  const unsigned short cacheLineSize = 16;
-  if (size > (unsigned) cacheLineSize / 2)
-    return cacheLineSize;
-  else
-    for (unsigned sz=1; /*no condition*/; sz *= 2)
-      if (sz >= size || sz >= target.getTargetData().getDoubleAlignment())
-        return sz;
-}
-
-
-void MachineFunctionInfo::CalculateArgSize() {
-  maxOptionalArgsSize = ComputeMaxOptionalArgsSize(MF.getTarget(),
-						   MF.getFunction(),
-                                                   maxOptionalNumArgs);
-  staticStackSize = maxOptionalArgsSize + 176;
-}
-
-int
-MachineFunctionInfo::computeOffsetforLocalVar(const Value* val,
-					      unsigned &getPaddedSize,
-					      unsigned  sizeToUse)
-{
-  if (sizeToUse == 0) {
-    // All integer types smaller than ints promote to 4 byte integers.
-    if (val->getType()->isIntegral() && val->getType()->getPrimitiveSize() < 4)
-      sizeToUse = 4;
-    else
-      sizeToUse = MF.getTarget().getTargetData().getTypeSize(val->getType());
-  }
-  unsigned align = SizeToAlignment(sizeToUse, MF.getTarget());
-
-  bool growUp;
-  int firstOffset = MF.getTarget().getFrameInfo()->getFirstAutomaticVarOffset(MF,
-						 			     growUp);
-  int offset = growUp? firstOffset + getAutomaticVarsSize()
-                     : firstOffset - (getAutomaticVarsSize() + sizeToUse);
-
-  int aligned = MF.getTarget().getFrameInfo()->adjustAlignment(offset, growUp, align);
-  getPaddedSize = sizeToUse + abs(aligned - offset);
-
-  return aligned;
-}
-
-
-int MachineFunctionInfo::allocateLocalVar(const Value* val,
-                                          unsigned sizeToUse) {
-  assert(! automaticVarsAreaFrozen &&
-         "Size of auto vars area has been used to compute an offset so "
-         "no more automatic vars should be allocated!");
-  
-  // Check if we've allocated a stack slot for this value already
-  // 
-  hash_map<const Value*, int>::const_iterator pair = offsets.find(val);
-  if (pair != offsets.end())
-    return pair->second;
-
-  unsigned getPaddedSize;
-  unsigned offset = computeOffsetforLocalVar(val, getPaddedSize, sizeToUse);
-  offsets[val] = offset;
-  incrementAutomaticVarsSize(getPaddedSize);
-  return offset;
-}
-
-int
-MachineFunctionInfo::allocateSpilledValue(const Type* type)
-{
-  assert(! spillsAreaFrozen &&
-         "Size of reg spills area has been used to compute an offset so "
-         "no more register spill slots should be allocated!");
-  
-  unsigned size  = MF.getTarget().getTargetData().getTypeSize(type);
-  unsigned char align = MF.getTarget().getTargetData().getTypeAlignment(type);
-  
-  bool growUp;
-  int firstOffset = MF.getTarget().getFrameInfo()->getRegSpillAreaOffset(MF, growUp);
-  
-  int offset = growUp? firstOffset + getRegSpillsSize()
-                     : firstOffset - (getRegSpillsSize() + size);
-
-  int aligned = MF.getTarget().getFrameInfo()->adjustAlignment(offset, growUp, align);
-  size += abs(aligned - offset); // include alignment padding in size
-  
-  incrementRegSpillsSize(size);  // update size of reg. spills area
-
-  return aligned;
-}
-
-int
-MachineFunctionInfo::pushTempValue(unsigned size)
-{
-  unsigned align = SizeToAlignment(size, MF.getTarget());
-
-  bool growUp;
-  int firstOffset = MF.getTarget().getFrameInfo()->getTmpAreaOffset(MF, growUp);
-
-  int offset = growUp? firstOffset + currentTmpValuesSize
-                     : firstOffset - (currentTmpValuesSize + size);
-
-  int aligned = MF.getTarget().getFrameInfo()->adjustAlignment(offset, growUp,
-							      align);
-  size += abs(aligned - offset); // include alignment padding in size
-
-  incrementTmpAreaSize(size);    // update "current" size of tmp area
-
-  return aligned;
-}
-
-void MachineFunctionInfo::popAllTempValues() {
-  resetTmpAreaSize();            // clear tmp area to reuse
-}