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

Bugfixes for dealing with partially compactified functions

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10920 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2004-01-20 00:54:06 +00:00
parent 54111c49bf
commit 52f86d6247
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Bytecode/Reader/Reader.cpp
View File

@ -120,17 +120,29 @@ Value *BytecodeParser::getValue(unsigned type, unsigned oNum, bool Create) {
return CompactionTable[type][Num];
Num -= CompactionTable[type].size();
} else {
// If the type plane was compactified, figure out the global type ID.
unsigned GlobalTyID = type;
if (CompactionTable.size() > Type::TypeTyID &&
!CompactionTable[Type::TypeTyID].empty() &&
type >= Type::FirstDerivedTyID) {
std::vector<Value*> &TypePlane = CompactionTable[Type::TypeTyID];
const Type *Ty = cast<Type>(TypePlane[type-Type::FirstDerivedTyID]);
TypeValuesListTy::iterator I =
find(ModuleTypeValues.begin(), ModuleTypeValues.end(), Ty);
assert(I != ModuleTypeValues.end());
GlobalTyID = Type::FirstDerivedTyID + (&*I - &ModuleTypeValues[0]);
}
if (hasImplicitNull(type, hasExplicitPrimitiveZeros)) {
if (hasImplicitNull(GlobalTyID, hasExplicitPrimitiveZeros)) {
if (Num == 0)
return Constant::getNullValue(getType(type));
--Num;
}
if (type < ModuleValues.size() && ModuleValues[type]) {
if (Num < ModuleValues[type]->size())
return ModuleValues[type]->getOperand(Num);
Num -= ModuleValues[type]->size();
if (GlobalTyID < ModuleValues.size() && ModuleValues[GlobalTyID]) {
if (Num < ModuleValues[GlobalTyID]->size())
return ModuleValues[GlobalTyID]->getOperand(Num);
Num -= ModuleValues[GlobalTyID]->size();
}
}
@ -290,7 +302,8 @@ void BytecodeParser::ParseSymbolTable(const unsigned char *&Buf,
} else {
V = getValue(Typ, slot, false); // Find mapping...
}
if (V == 0) throw std::string("Failed value look-up.");
if (V == 0)
throw std::string("Failed value look-up.");
BCR_TRACE(4, "Map: '" << Name << "' to #" << slot << ":" << *V;
if (!isa<Instruction>(V)) std::cerr << "\n");