[llvm-commits] CVS: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp X86AsmPrinter.cpp X86AsmPrinter.h X86ISelLowering.cpp X86IntelAsmPrinter.cpp X86MachineFunctionInfo.h X86RegisterInfo.cpp
Chris Lattner
sabre at nondot.org
Tue Apr 17 10:22:23 PDT 2007
Changes in directory llvm/lib/Target/X86:
X86ATTAsmPrinter.cpp updated: 1.99 -> 1.100
X86AsmPrinter.cpp updated: 1.238 -> 1.239
X86AsmPrinter.h updated: 1.43 -> 1.44
X86ISelLowering.cpp updated: 1.391 -> 1.392
X86IntelAsmPrinter.cpp updated: 1.69 -> 1.70
X86MachineFunctionInfo.h updated: 1.4 -> 1.5
X86RegisterInfo.cpp updated: 1.210 -> 1.211
---
Log message:
rename X86FunctionInfo to X86MachineFunctionInfo to match the header file
it is defined in.
---
Diffs of the changes: (+23 -21)
X86ATTAsmPrinter.cpp | 2 +-
X86AsmPrinter.cpp | 8 ++++----
X86AsmPrinter.h | 2 +-
X86ISelLowering.cpp | 12 +++++++-----
X86IntelAsmPrinter.cpp | 2 +-
X86MachineFunctionInfo.h | 16 ++++++++--------
X86RegisterInfo.cpp | 2 +-
7 files changed, 23 insertions(+), 21 deletions(-)
Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.99 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.100
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.99 Sat Mar 24 21:01:03 2007
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp Tue Apr 17 12:21:52 2007
@@ -92,7 +92,7 @@
// Populate function information map. Actually, We don't want to populate
// non-stdcall or non-fastcall functions' information right now.
if (CC == CallingConv::X86_StdCall || CC == CallingConv::X86_FastCall)
- FunctionInfoMap[F] = *MF.getInfo<X86FunctionInfo>();
+ FunctionInfoMap[F] = *MF.getInfo<X86MachineFunctionInfo>();
X86SharedAsmPrinter::decorateName(CurrentFnName, F);
Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.238 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.239
--- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.238 Sat Mar 31 08:11:52 2007
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp Tue Apr 17 12:21:52 2007
@@ -32,9 +32,9 @@
#include "llvm/Target/TargetOptions.h"
using namespace llvm;
-static X86FunctionInfo calculateFunctionInfo(const Function *F,
- const TargetData *TD) {
- X86FunctionInfo Info;
+static X86MachineFunctionInfo calculateFunctionInfo(const Function *F,
+ const TargetData *TD) {
+ X86MachineFunctionInfo Info;
uint64_t Size = 0;
switch (F->getCallingConv()) {
@@ -77,7 +77,7 @@
FMFInfoMap::const_iterator info_item = FunctionInfoMap.find(F);
- const X86FunctionInfo *Info;
+ const X86MachineFunctionInfo *Info;
if (info_item == FunctionInfoMap.end()) {
// Calculate apropriate function info and populate map
FunctionInfoMap[F] = calculateFunctionInfo(F, TM.getTargetData());
Index: llvm/lib/Target/X86/X86AsmPrinter.h
diff -u llvm/lib/Target/X86/X86AsmPrinter.h:1.43 llvm/lib/Target/X86/X86AsmPrinter.h:1.44
--- llvm/lib/Target/X86/X86AsmPrinter.h:1.43 Fri Jan 26 15:22:28 2007
+++ llvm/lib/Target/X86/X86AsmPrinter.h Tue Apr 17 12:21:52 2007
@@ -48,7 +48,7 @@
//
// This structure is using e.g. for name decoration for stdcall & fastcall'ed
// function, since we have to use arguments' size for decoration.
- typedef std::map<const Function*, X86FunctionInfo> FMFInfoMap;
+ typedef std::map<const Function*, X86MachineFunctionInfo> FMFInfoMap;
FMFInfoMap FunctionInfoMap;
void decorateName(std::string& Name, const GlobalValue* GV);
Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.391 llvm/lib/Target/X86/X86ISelLowering.cpp:1.392
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.391 Tue Apr 17 04:20:00 2007
+++ llvm/lib/Target/X86/X86ISelLowering.cpp Tue Apr 17 12:21:52 2007
@@ -729,7 +729,8 @@
RegSaveFrameIndex = 0xAAAAAAA; // X86-64 only.
ReturnAddrIndex = 0; // No return address slot generated yet.
- MF.getInfo<X86FunctionInfo>()->setBytesToPopOnReturn(BytesToPopOnReturn);
+ MF.getInfo<X86MachineFunctionInfo>()
+ ->setBytesToPopOnReturn(BytesToPopOnReturn);
// Return the new list of results.
return DAG.getNode(ISD::MERGE_VALUES, Op.Val->getVTList(),
@@ -973,7 +974,8 @@
BytesToPopOnReturn = StackSize; // Callee pops all stack arguments.
BytesCallerReserves = 0;
- MF.getInfo<X86FunctionInfo>()->setBytesToPopOnReturn(BytesToPopOnReturn);
+ MF.getInfo<X86MachineFunctionInfo>()
+ ->setBytesToPopOnReturn(BytesToPopOnReturn);
// Return the new list of results.
return DAG.getNode(ISD::MERGE_VALUES, Op.Val->getVTList(),
@@ -3441,7 +3443,7 @@
if (Fn->hasExternalLinkage() &&
Subtarget->isTargetCygMing() &&
Fn->getName() == "main")
- MF.getInfo<X86FunctionInfo>()->setForceFramePointer(true);
+ MF.getInfo<X86MachineFunctionInfo>()->setForceFramePointer(true);
unsigned CC = cast<ConstantSDNode>(Op.getOperand(1))->getValue();
if (Subtarget->is64Bit())
@@ -3457,10 +3459,10 @@
case CallingConv::C:
return LowerCCCArguments(Op, DAG);
case CallingConv::X86_StdCall:
- MF.getInfo<X86FunctionInfo>()->setDecorationStyle(StdCall);
+ MF.getInfo<X86MachineFunctionInfo>()->setDecorationStyle(StdCall);
return LowerCCCArguments(Op, DAG, true);
case CallingConv::X86_FastCall:
- MF.getInfo<X86FunctionInfo>()->setDecorationStyle(FastCall);
+ MF.getInfo<X86MachineFunctionInfo>()->setDecorationStyle(FastCall);
return LowerFastCCArguments(Op, DAG);
}
}
Index: llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.69 llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.70
--- llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.69 Tue Jan 30 14:08:38 2007
+++ llvm/lib/Target/X86/X86IntelAsmPrinter.cpp Tue Apr 17 12:21:52 2007
@@ -51,7 +51,7 @@
// Populate function information map. Actually, We don't want to populate
// non-stdcall or non-fastcall functions' information right now.
if (CC == CallingConv::X86_StdCall || CC == CallingConv::X86_FastCall)
- FunctionInfoMap[F] = *MF.getInfo<X86FunctionInfo>();
+ FunctionInfoMap[F] = *MF.getInfo<X86MachineFunctionInfo>();
X86SharedAsmPrinter::decorateName(CurrentFnName, F);
Index: llvm/lib/Target/X86/X86MachineFunctionInfo.h
diff -u llvm/lib/Target/X86/X86MachineFunctionInfo.h:1.4 llvm/lib/Target/X86/X86MachineFunctionInfo.h:1.5
--- llvm/lib/Target/X86/X86MachineFunctionInfo.h:1.4 Mon Sep 25 22:57:53 2006
+++ llvm/lib/Target/X86/X86MachineFunctionInfo.h Tue Apr 17 12:21:52 2007
@@ -24,9 +24,9 @@
FastCall
};
-/// X86FunctionInfo - This class is derived from MachineFunction private
+/// X86MachineFunctionInfo - This class is derived from MachineFunction private
/// X86 target-specific information for each MachineFunction.
-class X86FunctionInfo : public MachineFunctionInfo {
+class X86MachineFunctionInfo : public MachineFunctionInfo {
/// ForceFramePointer - True if the function is required to use of frame
/// pointer for reasons other than it containing dynamic allocation or
/// that FP eliminatation is turned off. For example, Cygwin main function
@@ -42,13 +42,13 @@
NameDecorationStyle DecorationStyle;
public:
- X86FunctionInfo() : ForceFramePointer(false),
- BytesToPopOnReturn(0),
- DecorationStyle(None) {}
+ X86MachineFunctionInfo() : ForceFramePointer(false),
+ BytesToPopOnReturn(0),
+ DecorationStyle(None) {}
- X86FunctionInfo(MachineFunction &MF) : ForceFramePointer(false),
- BytesToPopOnReturn(0),
- DecorationStyle(None) {}
+ X86MachineFunctionInfo(MachineFunction &MF) : ForceFramePointer(false),
+ BytesToPopOnReturn(0),
+ DecorationStyle(None) {}
bool getForceFramePointer() const { return ForceFramePointer;}
void setForceFramePointer(bool forceFP) { ForceFramePointer = forceFP; }
Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.210 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.211
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.210 Tue Apr 17 04:20:00 2007
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp Tue Apr 17 12:21:52 2007
@@ -927,7 +927,7 @@
bool X86RegisterInfo::hasFP(const MachineFunction &MF) const {
return (NoFramePointerElim ||
MF.getFrameInfo()->hasVarSizedObjects() ||
- MF.getInfo<X86FunctionInfo>()->getForceFramePointer());
+ MF.getInfo<X86MachineFunctionInfo>()->getForceFramePointer());
}
void X86RegisterInfo::
More information about the llvm-commits
mailing list