6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-07 14:33:15 +00:00
Code Issues Projects Releases Wiki Activity

Minor code cleanups. The only bugfix is to the UR_DEBUG stuff which didn't

Browse Source 
compile when enabled.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10657 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-12-31 02:18:11 +00:00
parent 35fce0bc5a
commit c7d3f6b6bf
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/AsmParser/llvmAsmParser.y
View File

@ -592,36 +592,41 @@ static bool TypeContains(const Type *Ty, const Type *E) {
return find(df_begin(Ty), df_end(Ty), E) != df_end(Ty); return find(df_begin(Ty), df_end(Ty), E) != df_end(Ty);
} }
// UpRefs - A list of the outstanding upreferences that need to be resolved.
static std::vector<std::pair<unsigned, OpaqueType *> > UpRefs; static std::vector<std::pair<unsigned, OpaqueType *> > UpRefs;
/// HandleUpRefs - Every time we finish a new layer of types, this function is
/// called. It loops through the UpRefs vector, which is a list of the
/// currently active types. For each type, if the up reference is contained in
/// the newly completed type, we decrement the level count. When the level
/// count reaches zero, the upreferenced type is the type that is passed in:
/// thus we can complete the cycle.
///
static PATypeHolder HandleUpRefs(const Type *ty) { static PATypeHolder HandleUpRefs(const Type *ty) {
PATypeHolder Ty(ty); PATypeHolder Ty(ty);
UR_OUT("Type '" << ty->getDescription() << UR_OUT("Type '" << Ty->getDescription() <<
"' newly formed. Resolving upreferences.\n" << "' newly formed. Resolving upreferences.\n" <<
UpRefs.size() << " upreferences active!\n"); UpRefs.size() << " upreferences active!\n");
for (unsigned i = 0; i < UpRefs.size(); ) { for (unsigned i = 0; i != UpRefs.size(); ++i) {
UR_OUT(" UR#" << i << " - TypeContains(" << Ty->getDescription() << ", " UR_OUT(" UR#" << i << " - TypeContains(" << Ty->getDescription() << ", "
<< UpRefs[i].second->getDescription() << ") = " << UpRefs[i].second->getDescription() << ") = "
<< (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << endl); << (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << "\n");
if (TypeContains(Ty, UpRefs[i].second)) { if (TypeContains(Ty, UpRefs[i].second)) {
unsigned Level = --UpRefs[i].first; // Decrement level of upreference unsigned Level = --UpRefs[i].first; // Decrement level of upreference
UR_OUT(" Uplevel Ref Level = " << Level << endl); UR_OUT(" Uplevel Ref Level = " << Level << "\n");
if (Level == 0) { // Upreference should be resolved! if (Level == 0) { // Upreference should be resolved!
UR_OUT(" * Resolving upreference for " UR_OUT(" * Resolving upreference for "
<< UpRefs[i].second->getDescription() << endl; << UpRefs[i].second->getDescription() << "\n";
std::string OldName = UpRefs[i].second->getDescription()); std::string OldName = UpRefs[i].second->getDescription());
UpRefs[i].second->refineAbstractTypeTo(Ty); UpRefs[i].second->refineAbstractTypeTo(Ty);
UpRefs.erase(UpRefs.begin()+i); // Remove from upreference list...
UR_OUT(" * Type '" << OldName << "' refined upreference to: " UR_OUT(" * Type '" << OldName << "' refined upreference to: "
<< (const void*)Ty << ", " << Ty->getDescription() << endl); << (const void*)Ty << ", " << Ty->getDescription() << "\n");
continue; UpRefs.erase(UpRefs.begin()+i); // Remove from upreference list...
--i; // Do not skip the next element...
} }
} }
++i; // Otherwise, no resolve, move on...
} }
// FIXME: TODO: this should return the updated type
return Ty; return Ty;
} }
@ -893,7 +898,7 @@ TypesV : Types | VOID { $$ = new PATypeHolder($1); };
UpRTypesV : UpRTypes | VOID { $$ = new PATypeHolder($1); }; UpRTypesV : UpRTypes | VOID { $$ = new PATypeHolder($1); };
Types : UpRTypes { Types : UpRTypes {
if (UpRefs.size()) if (!UpRefs.empty())
ThrowException("Invalid upreference in type: " + (*$1)->getDescription()); ThrowException("Invalid upreference in type: " + (*$1)->getDescription());
$$ = $1; $$ = $1;
}; };
@ -916,7 +921,7 @@ UpRTypes : SymbolicValueRef { // Named types are also simple types...
// Include derived types in the Types production. // Include derived types in the Types production.
// //
UpRTypes : '\\' EUINT64VAL { // Type UpReference UpRTypes : '\\' EUINT64VAL { // Type UpReference
if ($2 > (uint64_t)INT64_MAX) ThrowException("Value out of range!"); if ($2 > (uint64_t)~0U) ThrowException("Value out of range!");
OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder
UpRefs.push_back(std::make_pair((unsigned)$2, OT)); // Add to vector... UpRefs.push_back(std::make_pair((unsigned)$2, OT)); // Add to vector...
$$ = new PATypeHolder(OT); $$ = new PATypeHolder(OT);
@ -931,7 +936,7 @@ UpRTypes : '\\' EUINT64VAL { // Type UpReference
$$ = new PATypeHolder(HandleUpRefs(FunctionType::get(*$1,Params,isVarArg))); $$ = new PATypeHolder(HandleUpRefs(FunctionType::get(*$1,Params,isVarArg)));
delete $3; // Delete the argument list delete $3; // Delete the argument list
delete $1; // Delete the old type handle delete $1; // Delete the return type handle
} }
| '[' EUINT64VAL 'x' UpRTypes ']' { // Sized array type? | '[' EUINT64VAL 'x' UpRTypes ']' { // Sized array type?
$$ = new PATypeHolder(HandleUpRefs(ArrayType::get(*$4, (unsigned)$2))); $$ = new PATypeHolder(HandleUpRefs(ArrayType::get(*$4, (unsigned)$2)));