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

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

MachineFunction.cpp updated: 1.34 -> 1.35
PrologEpilogInserter.cpp updated: 1.2 -> 1.3
RegAllocLocal.cpp updated: 1.9 -> 1.10
RegAllocSimple.cpp updated: 1.35 -> 1.36

---
Log message:

 Rename FunctionFrameInfo to MachineFrameInfo


---
Diffs of the changes:

Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.34 llvm/lib/CodeGen/MachineFunction.cpp:1.35
--- llvm/lib/CodeGen/MachineFunction.cpp:1.34	Sat Dec 28 15:00:17 2002
+++ llvm/lib/CodeGen/MachineFunction.cpp	Sat Dec 28 15:08:26 2002
@@ -11,7 +11,7 @@
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/SSARegMap.h"
 #include "llvm/CodeGen/MachineFunctionInfo.h"
-#include "llvm/CodeGen/FunctionFrameInfo.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/MachineCacheInfo.h"
@@ -101,7 +101,7 @@
   : Annotation(MF_AID), Fn(F), Target(TM) {
   SSARegMapping = new SSARegMap();
   MFInfo = new MachineFunctionInfo(*this);
-  FrameInfo = new FunctionFrameInfo();
+  FrameInfo = new MachineFrameInfo();
 }
 
 MachineFunction::~MachineFunction() { 
@@ -168,10 +168,10 @@
 }
 
 //===----------------------------------------------------------------------===//
-//  FunctionFrameInfo implementation
+//  MachineFrameInfo implementation
 //===----------------------------------------------------------------------===//
 
-void FunctionFrameInfo::print(std::ostream &OS) const {
+void MachineFrameInfo::print(std::ostream &OS) const {
   for (unsigned i = 0, e = Objects.size(); i != e; ++i) {
     const StackObject &SO = Objects[i];
     OS << "  <fi# " << (int)(i-NumFixedObjects) << "> is ";
@@ -197,7 +197,7 @@
     OS << "  Stack frame contains variable sized objects\n";
 }
 
-void FunctionFrameInfo::dump() const { print(std::cerr); }
+void MachineFrameInfo::dump() const { print(std::cerr); }
 
 
 //===----------------------------------------------------------------------===//


Index: llvm/lib/CodeGen/PrologEpilogInserter.cpp
diff -u llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.2 llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.3
--- llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.2	Sat Dec 28 15:00:17 2002
+++ llvm/lib/CodeGen/PrologEpilogInserter.cpp	Sat Dec 28 15:08:26 2002
@@ -12,7 +12,7 @@
 #include "llvm/Pass.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/CodeGen/FunctionFrameInfo.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetFrameInfo.h"
@@ -114,7 +114,7 @@
 	++I;
       }
 
-  FunctionFrameInfo *FFI = Fn.getFrameInfo();
+  MachineFrameInfo *FFI = Fn.getFrameInfo();
   FFI->setHasCalls(HasCalls);
   FFI->setMaxCallFrameSize(MaxCallFrameSize);
 
@@ -185,7 +185,7 @@
   assert(StackGrowsDown && "Only tested on stack down growing targets!");
  
   // Loop over all of the stack objects, assigning sequential addresses...
-  FunctionFrameInfo *FFI = Fn.getFrameInfo();
+  MachineFrameInfo *FFI = Fn.getFrameInfo();
 
   // Start at the beginning of the local area...
   int Offset = -TFI.getOffsetOfLocalArea();


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.9 llvm/lib/CodeGen/RegAllocLocal.cpp:1.10
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.9	Sat Dec 28 14:40:43 2002
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Sat Dec 28 15:08:26 2002
@@ -8,7 +8,7 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/SSARegMap.h"
-#include "llvm/CodeGen/FunctionFrameInfo.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/Target/MachineInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "Support/Statistic.h"


Index: llvm/lib/CodeGen/RegAllocSimple.cpp
diff -u llvm/lib/CodeGen/RegAllocSimple.cpp:1.35 llvm/lib/CodeGen/RegAllocSimple.cpp:1.36
--- llvm/lib/CodeGen/RegAllocSimple.cpp:1.35	Sat Dec 28 14:42:14 2002
+++ llvm/lib/CodeGen/RegAllocSimple.cpp	Sat Dec 28 15:08:26 2002
@@ -10,7 +10,7 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/SSARegMap.h"
-#include "llvm/CodeGen/FunctionFrameInfo.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/Target/MachineInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "Support/Statistic.h"