6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-17 21:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Convert typerec to be a structure instead of a pair

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4226 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-10-18 18:22:46 +00:00
parent 137d399fae
commit a3f8586d9d
5 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,23 @@ class DSNode {
/// different types can be represented by this single DSNode. This vector is
/// kept sorted.
///
typedef std::pair<const Type *, unsigned> TypeRec;
struct TypeRec {
const Type *Ty;
unsigned Offset;
TypeRec() : Ty(0), Offset(0) {}
TypeRec(const Type *T, unsigned O) : Ty(T), Offset(O) {}
bool operator<(const TypeRec &TR) const {
// Sort first by offset!
return Offset < TR.Offset || (Offset == TR.Offset && Ty < TR.Ty);
}
bool operator==(const TypeRec &TR) const {
return Ty == TR.Ty && Offset == TR.Offset;
}
bool operator!=(const TypeRec &TR) const { return !operator==(TR); }
};
std::vector<TypeRec> TypeEntries;
/// Globals - The list of global values that are merged into this node.

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

@ -120,7 +120,23 @@ class DSNode {
/// different types can be represented by this single DSNode. This vector is
/// kept sorted.
///
typedef std::pair<const Type *, unsigned> TypeRec;
struct TypeRec {
const Type *Ty;
unsigned Offset;
TypeRec() : Ty(0), Offset(0) {}
TypeRec(const Type *T, unsigned O) : Ty(T), Offset(O) {}
bool operator<(const TypeRec &TR) const {
// Sort first by offset!
return Offset < TR.Offset || (Offset == TR.Offset && Ty < TR.Ty);
}
bool operator==(const TypeRec &TR) const {
return Ty == TR.Ty && Offset == TR.Offset;
}
bool operator!=(const TypeRec &TR) const { return !operator==(TR); }
};
std::vector<TypeRec> TypeEntries;
/// Globals - The list of global values that are merged into this node.

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

@ -61,7 +61,7 @@ DSNode::DSNode(enum NodeTy NT, const Type *T) : NodeType(NT) {
}
}
TypeEntries.push_back(std::make_pair(T, 0));
TypeEntries.push_back(TypeRec(T, 0));
}
// DSNode copy constructor... do not copy over the referrers list!
@ -323,9 +323,9 @@ void DSNode::mergeWith(const DSNodeHandle &NH, unsigned Offset) {
// If this merging into node has more than just void nodes in it, merge!
assert(!N->TypeEntries.empty() && "TypeEntries is empty for a node?");
if (N->TypeEntries.size() != 1 || N->TypeEntries[0].first != Type::VoidTy) {
if (N->TypeEntries.size() != 1 || N->TypeEntries[0].Ty != Type::VoidTy) {
// If the current node just has a Void entry in it, remove it.
if (TypeEntries.size() == 1 && TypeEntries[0].first == Type::VoidTy)
if (TypeEntries.size() == 1 && TypeEntries[0].Ty == Type::VoidTy)
TypeEntries.clear();
// Adjust all of the type entries we are merging in by the offset... and add
@ -334,7 +334,7 @@ void DSNode::mergeWith(const DSNodeHandle &NH, unsigned Offset) {
if (NOffset != 0) { // This case is common enough to optimize for
// Offset all of the TypeEntries in N with their new offset
for (unsigned i = 0, e = N->TypeEntries.size(); i != e; ++i)
N->TypeEntries[i].second += NOffset;
N->TypeEntries[i].Offset += NOffset;
}
MergeSortedVectors(TypeEntries, N->TypeEntries);

1
lib/Analysis/DataStructure/Local.cpp
View File

@ -413,4 +413,3 @@ bool LocalDataStructures::run(Module &M) {
DSInfo.insert(std::make_pair(I, new DSGraph(*I)));
return false;
}

6
lib/Analysis/DataStructure/Printer.cpp
View File

@ -28,9 +28,9 @@ static string getCaption(const DSNode *N, const DSGraph *G) {
Module *M = G && &G->getFunction() ? G->getFunction().getParent() : 0;
for (unsigned i = 0, e = N->getTypeEntries().size(); i != e; ++i) {
WriteTypeSymbolic(OS, N->getTypeEntries()[i].first, M);
if (N->getTypeEntries()[i].second)
OS << "@" << N->getTypeEntries()[i].second;
WriteTypeSymbolic(OS, N->getTypeEntries()[i].Ty, M);
if (N->getTypeEntries()[i].Offset)
OS << "@" << N->getTypeEntries()[i].Offset;
OS << "\n";
}