For PR411:

This patch replaces the SymbolTable class with ValueSymbolTable which does
not support types planes. This means that all symbol names in LLVM must now
be unique. The patch addresses the necessary changes to deal with this and
removes code no longer needed as a result. This completes the bulk of the
changes for this PR. Some cleanup patches will follow.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33918 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer
2007-02-05 20:47:22 +00:00
parent 15468bfc22
commit ef9b9a7939
74 changed files with 1569 additions and 2340 deletions

View File

@ -270,19 +270,15 @@ public:
*os << " } END BLOCK: CompactionTable\n";
}
virtual void handleSymbolTableBegin(Function* CF, SymbolTable* ST) {
virtual void handleTypeSymbolTableBegin(TypeSymbolTable* ST) {
bca.numSymTab++;
if (os)
*os << " BLOCK: SymbolTable {\n";
*os << " BLOCK: TypeSymbolTable {\n";
}
virtual void handleSymbolTablePlane(unsigned Ty, unsigned NumEntries,
const Type* Typ) {
if (os) {
*os << " Plane: Ty=" << Ty << " Size=" << NumEntries << " Type: ";
WriteTypeSymbolic(*os,Typ,M);
*os << "\n";
}
virtual void handleValueSymbolTableBegin(Function* CF, ValueSymbolTable* ST) {
bca.numSymTab++;
if (os)
*os << " BLOCK: ValueSymbolTable {\n";
}
virtual void handleSymbolTableType(unsigned i, unsigned TypSlot,
@ -292,18 +288,23 @@ public:
<< " Name: " << name << "\n";
}
virtual void handleSymbolTableValue(unsigned i, unsigned ValSlot,
const std::string& name ) {
virtual void handleSymbolTableValue(unsigned TySlot, unsigned ValSlot,
const std::string& name) {
if (os)
*os << " Value " << i << " Slot=" << ValSlot
*os << " Value " << TySlot << " Slot=" << ValSlot
<< " Name: " << name << "\n";
if (ValSlot > bca.maxValueSlot)
bca.maxValueSlot = ValSlot;
}
virtual void handleSymbolTableEnd() {
virtual void handleValueSymbolTableEnd() {
if (os)
*os << " } END BLOCK: SymbolTable\n";
*os << " } END BLOCK: ValueSymbolTable\n";
}
virtual void handleTypeSymbolTableEnd() {
if (os)
*os << " } END BLOCK: TypeSymbolTable\n";
}
virtual void handleFunctionBegin(Function* Func, unsigned Size) {
@ -358,15 +359,15 @@ public:
}
virtual bool handleInstruction( unsigned Opcode, const Type* iType,
std::vector<unsigned>& Operands, unsigned Size){
std::vector<unsigned>& Operands,
Instruction *Inst,
unsigned Size){
if (os) {
*os << " INST: OpCode="
<< Instruction::getOpcodeName(Opcode) << " Type=\"";
WriteTypeSymbolic(*os,iType,M);
*os << "\"";
<< Instruction::getOpcodeName(Opcode);
for ( unsigned i = 0; i < Operands.size(); ++i )
*os << " Op(" << i << ")=Slot(" << Operands[i] << ")";
*os << "\n";
*os << " Op(" << Operands[i] << ")";
*os << *Inst;
}
bca.numInstructions++;