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

Add an arg to insertVal to allow us to prevent builtin types from being ignored

Browse Source 
when they are inserted.

Ignore constant values without names.  If they are used, they will be inlined.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@303 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2001-07-26 16:28:37 +00:00
parent a25809dda4
commit 9b50c1578d
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Bytecode/Writer/SlotCalculator.cpp
View File

@ -27,7 +27,7 @@ SlotCalculator::SlotCalculator(const Module *M, bool IgnoreNamed) {
//
for (unsigned i = 0; i < Type::FirstDerivedTyID; ++i) {
assert(Type::getPrimitiveType((Type::PrimitiveID)i));
insertVal(Type::getPrimitiveType((Type::PrimitiveID)i));
insertVal(Type::getPrimitiveType((Type::PrimitiveID)i), true);
}
if (M == 0) return; // Empty table...
@ -45,7 +45,7 @@ SlotCalculator::SlotCalculator(const Method *M, bool IgnoreNamed) {
//
for (unsigned i = 0; i < Type::FirstDerivedTyID; ++i) {
assert(Type::getPrimitiveType((Type::PrimitiveID)i));
insertVal(Type::getPrimitiveType((Type::PrimitiveID)i));
insertVal(Type::getPrimitiveType((Type::PrimitiveID)i), true);
}
if (TheModule == 0) return; // Empty table...
@ -141,17 +141,25 @@ int SlotCalculator::getValSlot(const Value *D) const {
return (int)I->second;
}
void SlotCalculator::insertVal(const Value *D) {
void SlotCalculator::insertVal(const Value *D, bool dontIgnore = false) {
if (D == 0) return;
// If this node does not contribute to a plane, or if the node has a
// name and we don't want names, then ignore the silly node...
//
if (D->getType() == Type::VoidTy || (IgnoreNamedNodes && D->hasName()))
return;
if (!dontIgnore) // Don't ignore nonignorables!
if (D->getType() == Type::VoidTy || // Ignore void type nodes
(IgnoreNamedNodes &&
(D->hasName() || (D->isConstant() && !(D->getType() == Type::TypeTy)))))
return;// If IgnoreNamed nodes, ignore if it's a constant or has a name
const Type *Typ = D->getType();
unsigned Ty = Typ->getPrimitiveID();
unsigned Ty;
// Used for debugging DefSlot=-1 assertion...
//if (Typ == Type::TypeTy)
// cerr << "Inserting type '" << D->castTypeAsserting()->getName() << "'!\n";
if (Typ->isDerivedType()) {
int DefSlot = getValSlot(Typ);
if (DefSlot == -1) { // Have we already entered this type?
@ -159,15 +167,13 @@ void SlotCalculator::insertVal(const Value *D) {
// example, if you say 'malloc uint', this defines a type 'uint*' that
// may be undefined at this point.
//
cerr << "SHOULDN'T HAPPEN Adding Type ba: " << Typ->getName() << endl;
assert(0 && "Shouldn't this be taken care of by processType!?!?!");
// Nope... add this to the Type plane now!
insertVal(Typ);
DefSlot = getValSlot(Typ);
assert(DefSlot >= 0 && "Type didn't get inserted correctly!");
cerr << "Type '" << Typ->getName() << "' unknown!\n";
assert(0 && "Shouldn't type be in constant pool!?!?!");
abort();
}
Ty = (unsigned)DefSlot;
} else {
Ty = Typ->getPrimitiveID();
}
if (Table.size() <= Ty) // Make sure we have the type plane allocated...

32
lib/VMCore/SlotCalculator.cpp
View File

@ -27,7 +27,7 @@ SlotCalculator::SlotCalculator(const Module *M, bool IgnoreNamed) {
//
for (unsigned i = 0; i < Type::FirstDerivedTyID; ++i) {
assert(Type::getPrimitiveType((Type::PrimitiveID)i));
insertVal(Type::getPrimitiveType((Type::PrimitiveID)i));
insertVal(Type::getPrimitiveType((Type::PrimitiveID)i), true);
}
if (M == 0) return; // Empty table...
@ -45,7 +45,7 @@ SlotCalculator::SlotCalculator(const Method *M, bool IgnoreNamed) {
//
for (unsigned i = 0; i < Type::FirstDerivedTyID; ++i) {
assert(Type::getPrimitiveType((Type::PrimitiveID)i));
insertVal(Type::getPrimitiveType((Type::PrimitiveID)i));
insertVal(Type::getPrimitiveType((Type::PrimitiveID)i), true);
}
if (TheModule == 0) return; // Empty table...
@ -141,17 +141,25 @@ int SlotCalculator::getValSlot(const Value *D) const {
return (int)I->second;
}
void SlotCalculator::insertVal(const Value *D) {
void SlotCalculator::insertVal(const Value *D, bool dontIgnore = false) {
if (D == 0) return;
// If this node does not contribute to a plane, or if the node has a
// name and we don't want names, then ignore the silly node...
//
if (D->getType() == Type::VoidTy || (IgnoreNamedNodes && D->hasName()))
return;
if (!dontIgnore) // Don't ignore nonignorables!
if (D->getType() == Type::VoidTy || // Ignore void type nodes
(IgnoreNamedNodes &&
(D->hasName() || (D->isConstant() && !(D->getType() == Type::TypeTy)))))
return;// If IgnoreNamed nodes, ignore if it's a constant or has a name
const Type *Typ = D->getType();
unsigned Ty = Typ->getPrimitiveID();
unsigned Ty;
// Used for debugging DefSlot=-1 assertion...
//if (Typ == Type::TypeTy)
// cerr << "Inserting type '" << D->castTypeAsserting()->getName() << "'!\n";
if (Typ->isDerivedType()) {
int DefSlot = getValSlot(Typ);
if (DefSlot == -1) { // Have we already entered this type?
@ -159,15 +167,13 @@ void SlotCalculator::insertVal(const Value *D) {
// example, if you say 'malloc uint', this defines a type 'uint*' that
// may be undefined at this point.
//
cerr << "SHOULDN'T HAPPEN Adding Type ba: " << Typ->getName() << endl;
assert(0 && "Shouldn't this be taken care of by processType!?!?!");
// Nope... add this to the Type plane now!
insertVal(Typ);
DefSlot = getValSlot(Typ);
assert(DefSlot >= 0 && "Type didn't get inserted correctly!");
cerr << "Type '" << Typ->getName() << "' unknown!\n";
assert(0 && "Shouldn't type be in constant pool!?!?!");
abort();
}
Ty = (unsigned)DefSlot;
} else {
Ty = Typ->getPrimitiveID();
}
if (Table.size() <= Ty) // Make sure we have the type plane allocated...