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

As it turns out, we don't need a fully generic mapping copy ctor, we just need

Browse Source 
something that maps through a std::map.  Since this simplified the client and
implementation code, do so now.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4250 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-10-21 15:04:18 +00:00
parent 448f4949dc
commit 99a22847ba
4 changed files with 70 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
include/llvm/Analysis/DSGraph.h
View File

@ -368,10 +368,18 @@ class DSCallSite {
DSNodeHandle Callee; // The function node called
std::vector<DSNodeHandle> CallArgs; // The pointer arguments
static DSNode *mapLookup(const DSNode *Node,
const std::map<const DSNode*, DSNode*> &NodeMap) {
if (Node == 0) return 0;
std::map<const DSNode*, DSNode*>::const_iterator I = NodeMap.find(Node);
assert(I != NodeMap.end() && "Not not in mapping!");
return I->second;
}
DSCallSite(); // DO NOT IMPLEMENT
public:
/// Note - This ctor destroys the argument vector passed in. On exit, the
/// argument vector is empty.
/// Constructor. Note - This ctor destroys the argument vector passed in. On
/// exit, the argument vector is empty.
///
DSCallSite(CallInst &inst, const DSNodeHandle &rv, const DSNodeHandle &callee,
std::vector<DSNodeHandle> &Args)
@ -379,17 +387,30 @@ public:
Args.swap(CallArgs);
}
/// Copy constructor with helper for cloning nodes. The helper should be a
/// model of unary_function<const DSNodeHandle*, DSNodeHandle>, i.e., it
/// should take a pointer to DSNodeHandle and return a fresh DSNodeHandle.
/// If no helper is specified, this defaults to a simple copy constructor.
///
template<typename CopyFunctor>
DSCallSite(const DSCallSite &FromCall, CopyFunctor nodeCopier);
DSCallSite(const DSCallSite &DSCS)
DSCallSite(const DSCallSite &DSCS) // Simple copy ctor
: Inst(DSCS.Inst), RetVal(DSCS.RetVal),
Callee(DSCS.Callee), CallArgs(DSCS.CallArgs) {}
/// Mapping copy constructor - This constructor takes a preexisting call site
/// to copy plus a map that specifies how the links should be transformed.
/// This is useful when moving a call site from one graph to another.
///
DSCallSite(const DSCallSite &FromCall,
const std::map<const DSNode*, DSNode*> &NodeMap) {
Inst = FromCall.Inst;
RetVal.setOffset(FromCall.RetVal.getOffset());
RetVal.setNode(mapLookup(FromCall.RetVal.getNode(), NodeMap));
Callee.setOffset(FromCall.Callee.getOffset());
Callee.setNode(mapLookup(FromCall.Callee.getNode(), NodeMap));
CallArgs.reserve(FromCall.CallArgs.size());
for (unsigned i = 0, e = FromCall.CallArgs.size(); i != e; ++i) {
const DSNodeHandle &OldNH = FromCall.CallArgs[i];
CallArgs.push_back(DSNodeHandle(mapLookup(OldNH.getNode(), NodeMap),
OldNH.getOffset()));
}
}
// Accessor functions...
Function &getCaller() const;
CallInst &getCallInst() const { return *Inst; }

41
include/llvm/Analysis/DataStructure/DSGraph.h
View File

@ -368,10 +368,18 @@ class DSCallSite {
DSNodeHandle Callee; // The function node called
std::vector<DSNodeHandle> CallArgs; // The pointer arguments
static DSNode *mapLookup(const DSNode *Node,
const std::map<const DSNode*, DSNode*> &NodeMap) {
if (Node == 0) return 0;
std::map<const DSNode*, DSNode*>::const_iterator I = NodeMap.find(Node);
assert(I != NodeMap.end() && "Not not in mapping!");
return I->second;
}
DSCallSite(); // DO NOT IMPLEMENT
public:
/// Note - This ctor destroys the argument vector passed in. On exit, the
/// argument vector is empty.
/// Constructor. Note - This ctor destroys the argument vector passed in. On
/// exit, the argument vector is empty.
///
DSCallSite(CallInst &inst, const DSNodeHandle &rv, const DSNodeHandle &callee,
std::vector<DSNodeHandle> &Args)
@ -379,17 +387,30 @@ public:
Args.swap(CallArgs);
}
/// Copy constructor with helper for cloning nodes. The helper should be a
/// model of unary_function<const DSNodeHandle*, DSNodeHandle>, i.e., it
/// should take a pointer to DSNodeHandle and return a fresh DSNodeHandle.
/// If no helper is specified, this defaults to a simple copy constructor.
///
template<typename CopyFunctor>
DSCallSite(const DSCallSite &FromCall, CopyFunctor nodeCopier);
DSCallSite(const DSCallSite &DSCS)
DSCallSite(const DSCallSite &DSCS) // Simple copy ctor
: Inst(DSCS.Inst), RetVal(DSCS.RetVal),
Callee(DSCS.Callee), CallArgs(DSCS.CallArgs) {}
/// Mapping copy constructor - This constructor takes a preexisting call site
/// to copy plus a map that specifies how the links should be transformed.
/// This is useful when moving a call site from one graph to another.
///
DSCallSite(const DSCallSite &FromCall,
const std::map<const DSNode*, DSNode*> &NodeMap) {
Inst = FromCall.Inst;
RetVal.setOffset(FromCall.RetVal.getOffset());
RetVal.setNode(mapLookup(FromCall.RetVal.getNode(), NodeMap));
Callee.setOffset(FromCall.Callee.getOffset());
Callee.setNode(mapLookup(FromCall.Callee.getNode(), NodeMap));
CallArgs.reserve(FromCall.CallArgs.size());
for (unsigned i = 0, e = FromCall.CallArgs.size(); i != e; ++i) {
const DSNodeHandle &OldNH = FromCall.CallArgs[i];
CallArgs.push_back(DSNodeHandle(mapLookup(OldNH.getNode(), NodeMap),
OldNH.getOffset()));
}
}
// Accessor functions...
Function &getCaller() const;
CallInst &getCallInst() const { return *Inst; }

20
lib/Analysis/DataStructure/DataStructure.cpp
View File

@ -361,18 +361,6 @@ Function &DSCallSite::getCaller() const {
return *Inst->getParent()->getParent();
}
template <typename CopyFunctor>
DSCallSite::DSCallSite(const DSCallSite &FromCall, CopyFunctor nodeCopier)
: Inst(FromCall.Inst) {
RetVal = nodeCopier(&FromCall.RetVal);
Callee = nodeCopier(&FromCall.Callee);
CallArgs.reserve(FromCall.CallArgs.size());
for (unsigned j = 0, ej = FromCall.CallArgs.size(); j != ej; ++j)
CallArgs.push_back(nodeCopier(&FromCall.CallArgs[j]));
}
//===----------------------------------------------------------------------===//
// DSGraph Implementation
@ -402,11 +390,6 @@ DSGraph::~DSGraph() {
void DSGraph::dump() const { print(std::cerr); }
static DSNodeHandle copyHelper(const DSNodeHandle* fromNode,
std::map<const DSNode*, DSNode*> *NodeMap) {
return DSNodeHandle((*NodeMap)[fromNode->getNode()], fromNode->getOffset());
}
// Helper function used to clone a function list.
//
static void CopyFunctionCallsList(const vector<DSCallSite>& fromCalls,
@ -415,8 +398,7 @@ static void CopyFunctionCallsList(const vector<DSCallSite>& fromCalls,
unsigned FC = toCalls.size(); // FirstCall
toCalls.reserve(FC+fromCalls.size());
for (unsigned i = 0, ei = fromCalls.size(); i != ei; ++i)
toCalls.push_back(DSCallSite(fromCalls[i],
std::bind2nd(std::ptr_fun(&copyHelper), &NodeMap)));
toCalls.push_back(DSCallSite(fromCalls[i], NodeMap));
}
/// remapLinks - Change all of the Links in the current node according to the

24
lib/Analysis/DataStructure/TopDownClosure.cpp
View File

@ -57,8 +57,8 @@ void TDDataStructures::ResolveCallSite(DSGraph &Graph,
// TD ...Merge the formal arg scalar with the actual arg node
DSNodeHandle &NodeForFormal = Graph.getNodeForValue(AI);
if (NodeForFormal.getNode())
NodeForFormal.mergeWith(CallSite.getPtrArg(i));
assert(NodeForFormal.getNode() && "Pointer argument has no dest node!");
NodeForFormal.mergeWith(CallSite.getPtrArg(i));
}
// Merge returned node in the caller with the "return" node in callee
@ -67,12 +67,6 @@ void TDDataStructures::ResolveCallSite(DSGraph &Graph,
}
static DSNodeHandle copyHelper(const DSNodeHandle* fromNode,
std::map<const DSNode*, DSNode*> *NodeMap) {
return DSNodeHandle((*NodeMap)[fromNode->getNode()], fromNode->getOffset());
}
DSGraph &TDDataStructures::calculateGraph(Function &F) {
// Make sure this graph has not already been calculated, or that we don't get
// into an infinite loop with mutually recursive functions.
@ -103,12 +97,9 @@ DSGraph &TDDataStructures::calculateGraph(Function &F) {
DEBUG(std::cerr << "\t [TD] Inlining caller #" << c << " '"
<< Caller.getName() << "' into callee: " << F.getName() << "\n");
if (&Caller == &F) {
// Self-recursive call: this can happen after a cycle of calls is inlined.
ResolveCallSite(*Graph, CallSite);
} else {
// Recursively compute the graph for the Caller. That should
// be fully resolved except if there is mutual recursion...
if (&Caller != &F) {
// Recursively compute the graph for the Caller. It should be fully
// resolved except if there is mutual recursion...
//
DSGraph &CG = calculateGraph(Caller); // Graph to inline
@ -133,10 +124,9 @@ DSGraph &TDDataStructures::calculateGraph(Function &F) {
// Make a temporary copy of the call site, and transform the argument node
// pointers.
DSCallSite TmpCallSite(CallSite, std::bind2nd(std::ptr_fun(&copyHelper),
&OldNodeMap));
ResolveCallSite(*Graph, CallSite);
//
}
ResolveCallSite(*Graph, CallSite);
}
// Recompute the Incomplete markers and eliminate unreachable nodes.