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

Completely rewrote the class. SymbolTable now separates Type* from Value* in preparation\

Browse Source 
for making Type not derive from Value. There are now separate interfaces \
for looking up, finding, and inserting Types and Values. There are also \
three separate iterator interfaces, one for type planes, one for the types \
(type type plane), and one for values within a type plane. See the \
documentation in the Header file.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13752 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-05-25 08:52:42 +00:00
parent 567bc2cc1e
commit b870c5f7c5
1 changed files with 243 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

354
lib/VMCore/SymbolTable.cpp
View File

@ -2,8 +2,9 @@
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file was developed by the LLVM research group and is distributed under // This file was developed by the LLVM research group and revised by Reid
// the University of Illinois Open Source License. See LICENSE.TXT for details. // Spencer. It is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
@ -16,6 +17,7 @@
#include "llvm/Module.h" #include "llvm/Module.h"
#include "Support/StringExtras.h" #include "Support/StringExtras.h"
#include <algorithm> #include <algorithm>
using namespace llvm; using namespace llvm;
#define DEBUG_SYMBOL_TABLE 0 #define DEBUG_SYMBOL_TABLE 0
@ -23,27 +25,22 @@ using namespace llvm;
SymbolTable::~SymbolTable() { SymbolTable::~SymbolTable() {
// Drop all abstract type references in the type plane... // Drop all abstract type references in the type plane...
iterator TyPlane = find(Type::TypeTy); for (type_iterator TI = tmap.begin(), TE = tmap.end(); TI != TE; ++TI) {
if (TyPlane != end()) { if (TI->second->isAbstract()) // If abstract, drop the reference...
VarMap &TyP = TyPlane->second; cast<DerivedType>(TI->second)->removeAbstractTypeUser(this);
for (VarMap::iterator I = TyP.begin(), E = TyP.end(); I != E; ++I) {
const Type *Ty = cast<Type>(I->second);
if (Ty->isAbstract()) // If abstract, drop the reference...
cast<DerivedType>(Ty)->removeAbstractTypeUser(this);
}
} }
// TODO: FIXME: BIG ONE: This doesn't unreference abstract types for the planes // TODO: FIXME: BIG ONE: This doesn't unreference abstract types for the
// that could still have entries! // planes that could still have entries!
#ifndef NDEBUG // Only do this in -g mode... #ifndef NDEBUG // Only do this in -g mode...
bool LeftoverValues = true; bool LeftoverValues = true;
for (iterator i = begin(); i != end(); ++i) { for (plane_iterator PI = pmap.begin(); PI != pmap.end(); ++PI) {
for (type_iterator I = i->second.begin(); I != i->second.end(); ++I) for (value_iterator VI = PI->second.begin(); VI != PI->second.end(); ++VI)
if (!isa<Constant>(I->second) && !isa<Type>(I->second)) { if (!isa<Constant>(VI->second) ) {
std::cerr << "Value still in symbol table! Type = '" std::cerr << "Value still in symbol table! Type = '"
<< i->first->getDescription() << "' Name = '" << PI->first->getDescription() << "' Name = '"
<< I->first << "'\n"; << VI->first << "'\n";
LeftoverValues = false; LeftoverValues = false;
} }
} }
@ -57,47 +54,58 @@ SymbolTable::~SymbolTable() {
// the specified type. // the specified type.
// //
std::string SymbolTable::getUniqueName(const Type *Ty, std::string SymbolTable::getUniqueName(const Type *Ty,
const std::string &BaseName) { const std::string &BaseName) const {
iterator I = find(Ty); // Find the plane
if (I == end()) return BaseName; plane_const_iterator PI = pmap.find(Ty);
if (PI == pmap.end()) return BaseName;
std::string TryName = BaseName; std::string TryName = BaseName;
type_iterator End = I->second.end(); const ValueMap& vmap = PI->second;
value_const_iterator End = vmap.end();
while (I->second.find(TryName) != End) // Loop until we find a free // See if the name exists
while (vmap.find(TryName) != End) // Loop until we find a free
TryName = BaseName + utostr(++LastUnique); // name in the symbol table TryName = BaseName + utostr(++LastUnique); // name in the symbol table
return TryName; return TryName;
} }
// lookup a value - Returns null on failure...
// lookup - Returns null on failure...
Value *SymbolTable::lookup(const Type *Ty, const std::string &Name) const { Value *SymbolTable::lookup(const Type *Ty, const std::string &Name) const {
const_iterator I = find(Ty); plane_const_iterator PI = pmap.find(Ty);
if (I != end()) { // We have symbols in that plane... if (PI != pmap.end()) { // We have symbols in that plane...
type_const_iterator J = I->second.find(Name); value_const_iterator VI = PI->second.find(Name);
if (J != I->second.end()) // and the name is in our hash table... if (VI != PI->second.end()) // and the name is in our hash table...
return J->second; return VI->second;
} }
return 0; return 0;
} }
// lookup a type by name - returns null on failure
Type* SymbolTable::lookupType( const std::string& Name ) const {
type_const_iterator TI = tmap.find( Name );
if ( TI != tmap.end() )
return TI->second;
return 0;
}
// Remove a value
void SymbolTable::remove(Value *N) { void SymbolTable::remove(Value *N) {
assert(N->hasName() && "Value doesn't have name!"); assert(N->hasName() && "Value doesn't have name!");
if (InternallyInconsistent) return; if (InternallyInconsistent) return;
iterator I = find(N->getType()); plane_iterator PI = pmap.find(N->getType());
assert(I != end() && assert(PI != pmap.end() &&
"Trying to remove a type that doesn't have a plane yet!"); "Trying to remove a value that doesn't have a type plane yet!");
removeEntry(I, I->second.find(N->getName())); removeEntry(PI, PI->second.find(N->getName()));
} }
// removeEntry - Remove a value from the symbol table... // removeEntry - Remove a value from the symbol table...
// Value *SymbolTable::removeEntry(plane_iterator Plane, value_iterator Entry) {
Value *SymbolTable::removeEntry(iterator Plane, type_iterator Entry) {
if (InternallyInconsistent) return 0; if (InternallyInconsistent) return 0;
assert(Plane != super::end() && assert(Plane != pmap.end() &&
Entry != Plane->second.end() && "Invalid entry to remove!"); Entry != Plane->second.end() && "Invalid entry to remove!");
Value *Result = Entry->second; Value *Result = Entry->second;
@ -123,34 +131,60 @@ Value *SymbolTable::removeEntry(iterator Plane, type_iterator Entry) {
cast<DerivedType>(Plane->first)->removeAbstractTypeUser(this); cast<DerivedType>(Plane->first)->removeAbstractTypeUser(this);
} }
erase(Plane); pmap.erase(Plane);
} }
return Result;
}
// remove - Remove a type
void SymbolTable::remove(Type* Ty ) {
type_iterator TI = this->type_begin();
type_iterator TE = this->type_end();
// Search for the entry
while ( TI != TE && TI->second != Ty )
++TI;
if ( TI != TE )
this->removeEntry( TI );
}
// removeEntry - Remove a type from the symbol table...
Type* SymbolTable::removeEntry(type_iterator Entry) {
if (InternallyInconsistent) return 0;
assert( Entry != tmap.end() && "Invalid entry to remove!");
Type* Result = Entry->second;
#if DEBUG_SYMBOL_TABLE
dump();
std::cerr << " Removing Value: " << Result->getName() << "\n";
#endif
tmap.erase(Entry);
// If we are removing an abstract type, remove the symbol table from it's use // If we are removing an abstract type, remove the symbol table from it's use
// list... // list...
if (Ty == Type::TypeTy) { if (Result->isAbstract()) {
const Type *T = cast<Type>(Result);
if (T->isAbstract()) {
#if DEBUG_ABSTYPE #if DEBUG_ABSTYPE
std::cerr << "Removing abs type from symtab" << T->getDescription()<<"\n"; std::cerr << "Removing abstract type from symtab" << Result->getDescription()<<"\n";
#endif #endif
cast<DerivedType>(T)->removeAbstractTypeUser(this); cast<DerivedType>(Result)->removeAbstractTypeUser(this);
}
} }
return Result; return Result;
} }
// insertEntry - Insert a value into the symbol table with the specified
// name... // insertEntry - Insert a value into the symbol table with the specified name.
//
void SymbolTable::insertEntry(const std::string &Name, const Type *VTy, void SymbolTable::insertEntry(const std::string &Name, const Type *VTy,
Value *V) { Value *V) {
// Check to see if there is a naming conflict. If so, rename this value! // Check to see if there is a naming conflict. If so, rename this value!
if (lookup(VTy, Name)) { if (lookup(VTy, Name)) {
std::string UniqueName = getUniqueName(VTy, Name); std::string UniqueName = getUniqueName(VTy, Name);
assert(InternallyInconsistent == false && "Infinite loop inserting entry!"); assert(InternallyInconsistent == false && "Infinite loop inserting value!");
InternallyInconsistent = true; InternallyInconsistent = true;
V->setName(UniqueName, this); V->setName(UniqueName, this);
InternallyInconsistent = false; InternallyInconsistent = false;
@ -163,11 +197,11 @@ void SymbolTable::insertEntry(const std::string &Name, const Type *VTy,
<< VTy->getDescription() << "\n"; << VTy->getDescription() << "\n";
#endif #endif
iterator I = find(VTy); plane_iterator PI = pmap.find(VTy);
if (I == end()) { // Not in collection yet... insert dummy entry if (PI == pmap.end()) { // Not in collection yet... insert dummy entry
// Insert a new empty element. I points to the new elements. // Insert a new empty element. I points to the new elements.
I = super::insert(make_pair(VTy, VarMap())).first; PI = pmap.insert(make_pair(VTy, ValueMap())).first;
assert(I != end() && "How did insert fail?"); assert(PI != pmap.end() && "How did insert fail?");
// Check to see if the type is abstract. If so, it might be refined in the // Check to see if the type is abstract. If so, it might be refined in the
// future, which would cause the plane of the old type to get merged into // future, which would cause the plane of the old type to get merged into
@ -182,31 +216,126 @@ void SymbolTable::insertEntry(const std::string &Name, const Type *VTy,
} }
} }
I->second.insert(make_pair(Name, V)); PI->second.insert(make_pair(Name, V));
}
// insertEntry - Insert a value into the symbol table with the specified
// name...
//
void SymbolTable::insertEntry(const std::string& Name, Type* T) {
// Check to see if there is a naming conflict. If so, rename this type!
std::string UniqueName = Name;
if (lookupType(Name))
UniqueName = getUniqueName(T, Name);
#if DEBUG_SYMBOL_TABLE
dump();
std::cerr << " Inserting type: " << UniqueName << ": "
<< T->getDescription() << "\n";
#endif
// Insert the tmap entry
tmap.insert(make_pair(UniqueName, T));
// If we are adding an abstract type, add the symbol table to it's use list. // If we are adding an abstract type, add the symbol table to it's use list.
if (VTy == Type::TypeTy) { if (T->isAbstract()) {
const Type *T = cast<Type>(V); cast<DerivedType>(T)->addAbstractTypeUser(this);
if (T->isAbstract()) {
cast<DerivedType>(T)->addAbstractTypeUser(this);
#if DEBUG_ABSTYPE #if DEBUG_ABSTYPE
std::cerr << "Added abstract type to ST: " << T->getDescription() << "\n"; std::cerr << "Added abstract type to ST: " << T->getDescription() << "\n";
#endif #endif
}
} }
} }
// Determine how many entries for a given type.
unsigned SymbolTable::type_size(const Type *Ty) const {
plane_const_iterator PI = pmap.find(Ty);
if ( PI == pmap.end() ) return 0;
return PI->second.size();
}
// Get the name of a value
std::string SymbolTable::get_name( const Value* V ) const {
value_const_iterator VI = this->value_begin( V->getType() );
value_const_iterator VE = this->value_end( V->getType() );
// Search for the entry
while ( VI != VE && VI->second != V )
++VI;
if ( VI != VE )
return VI->first;
return "";
}
// Get the name of a type
std::string SymbolTable::get_name( const Type* T ) const {
if (tmap.empty()) return ""; // No types at all.
type_const_iterator TI = tmap.begin();
type_const_iterator TE = tmap.end();
// Search for the entry
while (TI != TE && TI->second != T )
++TI;
if (TI != TE) // Must have found an entry!
return TI->first;
return ""; // Must not have found anything...
}
// Strip the symbol table of its names.
bool SymbolTable::strip( void ) {
bool RemovedSymbol = false;
for (plane_iterator I = pmap.begin(); I != pmap.end();) {
// Removing items from the plane can cause the plane itself to get deleted.
// If this happens, make sure we incremented our plane iterator already!
ValueMap &Plane = (I++)->second;
value_iterator B = Plane.begin(), Bend = Plane.end();
while (B != Bend) { // Found nonempty type plane!
Value *V = B->second;
if (isa<Constant>(V)) {
remove(V);
RemovedSymbol = true;
} else {
if (!isa<GlobalValue>(V) || cast<GlobalValue>(V)->hasInternalLinkage()){
// Set name to "", removing from symbol table!
V->setName("", this);
RemovedSymbol = true;
}
}
++B;
}
}
for (type_iterator TI = tmap.begin(); TI != tmap.end(); ) {
Type* T = (TI++)->second;
remove(T);
RemovedSymbol = true;
}
return RemovedSymbol;
}
// This function is called when one of the types in the type plane are refined // This function is called when one of the types in the type plane are refined
void SymbolTable::refineAbstractType(const DerivedType *OldType, void SymbolTable::refineAbstractType(const DerivedType *OldType,
const Type *NewType) { const Type *NewType) {
// Search to see if we have any values of the type oldtype. If so, we need to
// Search to see if we have any values of the type Oldtype. If so, we need to
// move them into the newtype plane... // move them into the newtype plane...
iterator TPI = find(OldType); plane_iterator PI = pmap.find(OldType);
if (TPI != end()) { if (PI != pmap.end()) {
// Get a handle to the new type plane... // Get a handle to the new type plane...
iterator NewTypeIt = find(NewType); plane_iterator NewTypeIt = pmap.find(NewType);
if (NewTypeIt == super::end()) { // If no plane exists, add one if (NewTypeIt == pmap.end()) { // If no plane exists, add one
NewTypeIt = super::insert(make_pair(NewType, VarMap())).first; NewTypeIt = pmap.insert(make_pair(NewType, ValueMap())).first;
if (NewType->isAbstract()) { if (NewType->isAbstract()) {
cast<DerivedType>(NewType)->addAbstractTypeUser(this); cast<DerivedType>(NewType)->addAbstractTypeUser(this);
@ -217,22 +346,22 @@ void SymbolTable::refineAbstractType(const DerivedType *OldType,
} }
} }
VarMap &NewPlane = NewTypeIt->second; ValueMap &NewPlane = NewTypeIt->second;
VarMap &OldPlane = TPI->second; ValueMap &OldPlane = PI->second;
while (!OldPlane.empty()) { while (!OldPlane.empty()) {
std::pair<const std::string, Value*> V = *OldPlane.begin(); std::pair<const std::string, Value*> V = *OldPlane.begin();
// Check to see if there is already a value in the symbol table that this // Check to see if there is already a value in the symbol table that this
// would collide with. // would collide with.
type_iterator TI = NewPlane.find(V.first); value_iterator VI = NewPlane.find(V.first);
if (TI != NewPlane.end() && TI->second == V.second) { if (VI != NewPlane.end() && VI->second == V.second) {
// No action // No action
} else if (TI != NewPlane.end()) { } else if (VI != NewPlane.end()) {
// The only thing we are allowing for now is two external global values // The only thing we are allowing for now is two external global values
// folded into one. // folded into one.
// //
GlobalValue *ExistGV = dyn_cast<GlobalValue>(TI->second); GlobalValue *ExistGV = dyn_cast<GlobalValue>(VI->second);
GlobalValue *NewGV = dyn_cast<GlobalValue>(V.second); GlobalValue *NewGV = dyn_cast<GlobalValue>(V.second);
if (ExistGV && NewGV) { if (ExistGV && NewGV) {
@ -294,71 +423,74 @@ void SymbolTable::refineAbstractType(const DerivedType *OldType,
OldType->removeAbstractTypeUser(this); OldType->removeAbstractTypeUser(this);
// Remove the plane that is no longer used // Remove the plane that is no longer used
erase(TPI); pmap.erase(PI);
} }
TPI = find(Type::TypeTy); // Loop over all of the types in the symbol table, replacing any references
if (TPI != end()) { // to OldType with references to NewType. Note that there may be multiple
// Loop over all of the types in the symbol table, replacing any references // occurrences, and although we only need to remove one at a time, it's
// to OldType with references to NewType. Note that there may be multiple // faster to remove them all in one pass.
// occurrences, and although we only need to remove one at a time, it's //
// faster to remove them all in one pass. for (type_iterator I = type_begin(), E = type_end(); I != E; ++I) {
// if (I->second == (Type*)OldType) { // FIXME when Types aren't const.
VarMap &TyPlane = TPI->second;
for (VarMap::iterator I = TyPlane.begin(), E = TyPlane.end(); I != E; ++I)
if (I->second == (Value*)OldType) { // FIXME when Types aren't const.
#if DEBUG_ABSTYPE #if DEBUG_ABSTYPE
std::cerr << "Removing type " << OldType->getDescription() << "\n"; std::cerr << "Removing type " << OldType->getDescription() << "\n";
#endif #endif
OldType->removeAbstractTypeUser(this); OldType->removeAbstractTypeUser(this);
I->second = (Value*)NewType; // TODO FIXME when types aren't const I->second = (Type*)NewType; // TODO FIXME when types aren't const
if (NewType->isAbstract()) { if (NewType->isAbstract()) {
#if DEBUG_ABSTYPE #if DEBUG_ABSTYPE
std::cerr << "Added type " << NewType->getDescription() << "\n"; std::cerr << "Added type " << NewType->getDescription() << "\n";
#endif #endif
cast<DerivedType>(NewType)->addAbstractTypeUser(this); cast<DerivedType>(NewType)->addAbstractTypeUser(this);
}
} }
}
} }
} }
// Handle situation where type becomes Concreate from Abstract
void SymbolTable::typeBecameConcrete(const DerivedType *AbsTy) { void SymbolTable::typeBecameConcrete(const DerivedType *AbsTy) {
iterator TPI = find(AbsTy); plane_iterator PI = pmap.find(AbsTy);
// If there are any values in the symbol table of this type, then the type // If there are any values in the symbol table of this type, then the type
// plan is a use of the abstract type which must be dropped. // plane is a use of the abstract type which must be dropped.
if (TPI != end()) if (PI != pmap.end())
AbsTy->removeAbstractTypeUser(this); AbsTy->removeAbstractTypeUser(this);
TPI = find(Type::TypeTy); // Loop over all of the types in the symbol table, dropping any abstract
if (TPI != end()) { // type user entries for AbsTy which occur because there are names for the
// Loop over all of the types in the symbol table, dropping any abstract // type.
// type user entries for AbsTy which occur because there are names for the for (type_iterator TI = type_begin(), TE = type_end(); TI != TE; ++TI)
// type. if (TI->second == (Type*)AbsTy) // FIXME when Types aren't const.
// AbsTy->removeAbstractTypeUser(this);
VarMap &TyPlane = TPI->second;
for (VarMap::iterator I = TyPlane.begin(), E = TyPlane.end(); I != E; ++I)
if (I->second == (Value*)AbsTy) // FIXME when Types aren't const.
AbsTy->removeAbstractTypeUser(this);
}
} }
static void DumpVal(const std::pair<const std::string, Value *> &V) { static void DumpVal(const std::pair<const std::string, Value *> &V) {
std::cout << " '" << V.first << "' = "; std::cerr << " '" << V.first << "' = ";
V.second->dump(); V.second->dump();
std::cout << "\n"; std::cerr << "\n";
} }
static void DumpPlane(const std::pair<const Type *, static void DumpPlane(const std::pair<const Type *,
std::map<const std::string, Value *> >&P){ std::map<const std::string, Value *> >&P){
std::cout << " Plane: ";
P.first->dump(); P.first->dump();
std::cout << "\n"; std::cerr << "\n";
for_each(P.second.begin(), P.second.end(), DumpVal); for_each(P.second.begin(), P.second.end(), DumpVal);
} }
void SymbolTable::dump() const { static void DumpTypes(const std::pair<const std::string, Type*>& T ) {
std::cout << "Symbol table dump:\n"; std::cerr << " '" << T.first << "' = ";
for_each(begin(), end(), DumpPlane); T.second->dump();
std::cerr << "\n";
} }
void SymbolTable::dump() const {
std::cerr << "Symbol table dump:\n Plane:";
for_each(pmap.begin(), pmap.end(), DumpPlane);
std::cerr << " Types: ";
for_each(tmap.begin(), tmap.end(), DumpTypes);
}
// vim: sw=2 ai